1.S550适配
This commit is contained in:
parent
4dd6c4e3b3
commit
0924de5678
|
@ -60,6 +60,8 @@
|
||||||
#include "PrjCfg_HUNTING_S530.h"
|
#include "PrjCfg_HUNTING_S530.h"
|
||||||
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
||||||
#include "PrjCfg_HUNTING_68CS.h"
|
#include "PrjCfg_HUNTING_68CS.h"
|
||||||
|
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_)
|
||||||
|
#include "PrjCfg_HUNTING_S550.h"
|
||||||
#else //Unknown MODEL
|
#else //Unknown MODEL
|
||||||
#warning Unknown MODEL?
|
#warning Unknown MODEL?
|
||||||
#warning Please assign your "PrjCfg_MODEL.h" in "PrjCfg.h"
|
#warning Please assign your "PrjCfg_MODEL.h" in "PrjCfg.h"
|
||||||
|
|
|
@ -1834,7 +1834,7 @@ void SysResetFlag(void)
|
||||||
sf_base64_decode(OTA_FTP_PASSWORD, (char *)tmpStr);
|
sf_base64_decode(OTA_FTP_PASSWORD, (char *)tmpStr);
|
||||||
snprintf((char *)puiPara->OtaFtpPassWord, sizeof(puiPara->OtaFtpPassWord), (char *)tmpStr);
|
snprintf((char *)puiPara->OtaFtpPassWord, sizeof(puiPara->OtaFtpPassWord), (char *)tmpStr);
|
||||||
|
|
||||||
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_)
|
||||||
puiPara->GpsNumber = DEFAULT_GPS_NUMBER;
|
puiPara->GpsNumber = DEFAULT_GPS_NUMBER;
|
||||||
puiPara->TimeSend1Switch = DEFAULT_TIMESEND1_SWITCH;
|
puiPara->TimeSend1Switch = DEFAULT_TIMESEND1_SWITCH;
|
||||||
puiPara->TimeSend2Switch = DEFAULT_TIMESEND2_SWITCH;
|
puiPara->TimeSend2Switch = DEFAULT_TIMESEND2_SWITCH;
|
||||||
|
|
|
@ -405,7 +405,7 @@ typedef struct _UIMenuUIMenuStoreInfo {
|
||||||
SF_PARA_TIME_S PirDelayTime;
|
SF_PARA_TIME_S PirDelayTime;
|
||||||
SF_PARA_TIME_S DailyReportTime;
|
SF_PARA_TIME_S DailyReportTime;
|
||||||
SF_PARA_TIME_S DailyReportTime2;
|
SF_PARA_TIME_S DailyReportTime2;
|
||||||
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
SF_PARA_TIME_S TimeSend1;
|
SF_PARA_TIME_S TimeSend1;
|
||||||
SF_PARA_TIME_S TimeSend2;
|
SF_PARA_TIME_S TimeSend2;
|
||||||
SF_PARA_TIME_S TimeSend3;
|
SF_PARA_TIME_S TimeSend3;
|
||||||
|
@ -475,7 +475,7 @@ typedef struct _UIMenuUIMenuStoreInfo {
|
||||||
CHAR GpsAntiTheftSwitch;
|
CHAR GpsAntiTheftSwitch;
|
||||||
CHAR BatteryLogSwitch;
|
CHAR BatteryLogSwitch;
|
||||||
|
|
||||||
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
////////////S530////////
|
////////////S530////////
|
||||||
CHAR GpsNumber;
|
CHAR GpsNumber;
|
||||||
CHAR TimeSend1Switch;/*OFF/ON*/
|
CHAR TimeSend1Switch;/*OFF/ON*/
|
||||||
|
@ -1892,7 +1892,7 @@ typedef enum
|
||||||
SF_PIR_SENSITIVITY_LOW,
|
SF_PIR_SENSITIVITY_LOW,
|
||||||
SF_PIR_SENSITIVITY_MAX,
|
SF_PIR_SENSITIVITY_MAX,
|
||||||
} SF_PIR_SENSITIVITY;
|
} SF_PIR_SENSITIVITY;
|
||||||
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#elif (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
|
|
|
@ -39,7 +39,7 @@ static PHOTO_SIZE_PARAM g_PhotoCapSizeTable[PHOTO_SIZE_ID_MAX + 2] = {
|
||||||
{3264, 2448, IMAGERATIO_4_3, "8M"}, // 8M
|
{3264, 2448, IMAGERATIO_4_3, "8M"}, // 8M
|
||||||
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
||||||
{2960, 1666, IMAGERATIO_16_9, "5M"}, // 5M
|
{2960, 1666, IMAGERATIO_16_9, "5M"}, // 5M
|
||||||
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#elif (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
{2592, 1944, IMAGERATIO_4_3, "5M"}, // 5M
|
{2592, 1944, IMAGERATIO_4_3, "5M"}, // 5M
|
||||||
#endif
|
#endif
|
||||||
{2048, 1536, IMAGERATIO_4_3, "3M"}, // 3M
|
{2048, 1536, IMAGERATIO_4_3, "3M"}, // 3M
|
||||||
|
@ -55,7 +55,7 @@ static PHOTO_SIZE_PARAM g_PhotoCapSizeTable[PHOTO_SIZE_ID_MAX + 2] = {
|
||||||
static PHOTO_SIZE_PARAM g_ScreenNailSizeTable[SCREEN_PHOTO_SIZE_ID_MAX + 2] = {
|
static PHOTO_SIZE_PARAM g_ScreenNailSizeTable[SCREEN_PHOTO_SIZE_ID_MAX + 2] = {
|
||||||
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
||||||
{1024, 768, IMAGERATIO_4_3, "0.78M"}, // 0.78M
|
{1024, 768, IMAGERATIO_4_3, "0.78M"}, // 0.78M
|
||||||
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#elif (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
{640, 480, IMAGERATIO_4_3, "VGA"}, // VGA
|
{640, 480, IMAGERATIO_4_3, "VGA"}, // VGA
|
||||||
{1024, 768, IMAGERATIO_4_3, "XGA"}, // 0.78M
|
{1024, 768, IMAGERATIO_4_3, "XGA"}, // 0.78M
|
||||||
{1920, 1440, IMAGERATIO_4_3, "2.76M"}, // 2.76M
|
{1920, 1440, IMAGERATIO_4_3, "2.76M"}, // 2.76M
|
||||||
|
|
|
@ -3423,20 +3423,26 @@ void sf_network_switch_thread()
|
||||||
{
|
{
|
||||||
sf_sys_status_led_set(SF_SIM_SWITCH_VERIZON_PROFILE);
|
sf_sys_status_led_set(SF_SIM_SWITCH_VERIZON_PROFILE);
|
||||||
sleep(3);
|
sleep(3);
|
||||||
|
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_))
|
||||||
sf_led_set(SF_LED_SIG3, SF_LED_STATE_OFF);
|
sf_led_set(SF_LED_SIG3, SF_LED_STATE_OFF);
|
||||||
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
else if(profileId == 1)
|
else if(profileId == 1)
|
||||||
{
|
{
|
||||||
sf_sys_status_led_set(SF_SIM_SWITCH_ATT_PROFILE);
|
sf_sys_status_led_set(SF_SIM_SWITCH_ATT_PROFILE);
|
||||||
sleep(3);
|
sleep(3);
|
||||||
|
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_))
|
||||||
sf_led_set(SF_LED_SIG2, SF_LED_STATE_OFF);
|
sf_led_set(SF_LED_SIG2, SF_LED_STATE_OFF);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sf_sys_status_led_set(SF_SIM_SWITCH_OTHER_PROFILE);
|
sf_sys_status_led_set(SF_SIM_SWITCH_OTHER_PROFILE);
|
||||||
sleep(3);
|
sleep(3);
|
||||||
|
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_))
|
||||||
sf_led_set(SF_LED_SIG4, SF_LED_STATE_OFF);
|
sf_led_set(SF_LED_SIG4, SF_LED_STATE_OFF);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
//LOG_DM_RS("Reboot Camera...!\n");
|
//LOG_DM_RS("Reboot Camera...!\n");
|
||||||
|
|
|
@ -397,7 +397,7 @@ UINT32 sf_battery_adc_value_get_once(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HW_S530
|
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
|
|
||||||
/*************************************************
|
/*************************************************
|
||||||
Function: sf_battery_level_update
|
Function: sf_battery_level_update
|
||||||
|
|
|
@ -401,6 +401,7 @@ void* sf_led_thread(void *arg)
|
||||||
{
|
{
|
||||||
if(isUsbIn)
|
if(isUsbIn)
|
||||||
{
|
{
|
||||||
|
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_))
|
||||||
if((SF_LED_BUSY == i) || (SF_LED_STATUS_G == i))
|
if((SF_LED_BUSY == i) || (SF_LED_STATUS_G == i))
|
||||||
{
|
{
|
||||||
sf_led_on(LedInfo[i].ledId);
|
sf_led_on(LedInfo[i].ledId);
|
||||||
|
@ -409,7 +410,9 @@ void* sf_led_thread(void *arg)
|
||||||
{
|
{
|
||||||
sf_led_off(LedInfo[i].ledId);
|
sf_led_off(LedInfo[i].ledId);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_))
|
||||||
else if(FormatSdFlag)
|
else if(FormatSdFlag)
|
||||||
{
|
{
|
||||||
if (FormatSdFlag == 1)
|
if (FormatSdFlag == 1)
|
||||||
|
@ -455,6 +458,7 @@ void* sf_led_thread(void *arg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
else if(isGoToPir)
|
else if(isGoToPir)
|
||||||
{
|
{
|
||||||
if(i < SF_LED_BUSY)
|
if(i < SF_LED_BUSY)
|
||||||
|
@ -894,6 +898,7 @@ void sf_sys_status_led_set(LedSysState_t ledSysStateId)
|
||||||
case SF_LED_SYS_STATE_PIR_NOT_DETECT:
|
case SF_LED_SYS_STATE_PIR_NOT_DETECT:
|
||||||
sf_led_set(SF_LED_BUSY, SF_LED_STATE_ON);
|
sf_led_set(SF_LED_BUSY, SF_LED_STATE_ON);
|
||||||
break;
|
break;
|
||||||
|
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_))
|
||||||
case SF_LED_SYS_STATE_BAT_0_SLOW:
|
case SF_LED_SYS_STATE_BAT_0_SLOW:
|
||||||
sf_led_set(SF_LED_BAT1, SF_LED_STATE_SLOW_FLASHING);
|
sf_led_set(SF_LED_BAT1, SF_LED_STATE_SLOW_FLASHING);
|
||||||
sf_led_set(SF_LED_BAT2, SF_LED_STATE_OFF);
|
sf_led_set(SF_LED_BAT2, SF_LED_STATE_OFF);
|
||||||
|
@ -921,7 +926,7 @@ void sf_sys_status_led_set(LedSysState_t ledSysStateId)
|
||||||
//sf_set_4g_status(SF_4G_FAIL);
|
//sf_set_4g_status(SF_4G_FAIL);
|
||||||
sf_led_set(SF_LED_SIG4, SF_LED_STATE_SLOW_FLASHING);
|
sf_led_set(SF_LED_SIG4, SF_LED_STATE_SLOW_FLASHING);
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
//#endif
|
//#endif
|
||||||
|
|
||||||
//#ifndef SF_I2C_ADDR
|
//#ifndef SF_I2C_ADDR
|
||||||
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
#define MCU_I2C_SLAVE_ADDR (0x20>>1)
|
#define MCU_I2C_SLAVE_ADDR (0x20>>1)
|
||||||
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
||||||
#define MCU_I2C_SLAVE_ADDR (0xA0>>1)
|
#define MCU_I2C_SLAVE_ADDR (0xA0>>1)
|
||||||
|
|
|
@ -67,7 +67,7 @@ static UINT8 McuProductInfo = 0;
|
||||||
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
||||||
static UINT8 drNoResetTimeSync = FALSE; //0:reset; 1:no reset;
|
static UINT8 drNoResetTimeSync = FALSE; //0:reset; 1:no reset;
|
||||||
|
|
||||||
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#elif (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
//static UINT8 isSignalReady = 0;
|
//static UINT8 isSignalReady = 0;
|
||||||
//static UINT32 GPRS_ERRNO = 0;
|
//static UINT32 GPRS_ERRNO = 0;
|
||||||
|
|
||||||
|
@ -458,7 +458,7 @@ UINT8 sf_mcu_power_on_para_get(MCUParam_t attrId)
|
||||||
dataTemp2 = mcuData[i++];
|
dataTemp2 = mcuData[i++];
|
||||||
IRSHTTER = (dataTemp2 << 8) | dataTemp1;
|
IRSHTTER = (dataTemp2 << 8) | dataTemp1;
|
||||||
|
|
||||||
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
if(startMode == PWR_ON_TIME_SYNC)
|
if(startMode == PWR_ON_TIME_SYNC)
|
||||||
{
|
{
|
||||||
startMode = PWR_ON_DAILY_REPORT;
|
startMode = PWR_ON_DAILY_REPORT;
|
||||||
|
@ -1371,7 +1371,7 @@ UINT8 sf_mcu_reg_set(MCUParam_t attrId, UINT8 val)
|
||||||
return SUCCESS;
|
return SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#elif (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
//#if 0
|
//#if 0
|
||||||
/*************************************************
|
/*************************************************
|
||||||
Function: sf_mcu_analog_pir_sen_convert
|
Function: sf_mcu_analog_pir_sen_convert
|
||||||
|
|
|
@ -70,6 +70,8 @@
|
||||||
#include "PrjCfg_HUNTING_68CS.h"
|
#include "PrjCfg_HUNTING_68CS.h"
|
||||||
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
||||||
#include "PrjCfg_HUNTING_S530.h"
|
#include "PrjCfg_HUNTING_S530.h"
|
||||||
|
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_)
|
||||||
|
#include "PrjCfg_HUNTING_S550.h"
|
||||||
#else
|
#else
|
||||||
#include "PrjCfg_DVCam.h"
|
#include "PrjCfg_DVCam.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1246,7 +1246,7 @@ void SysResetFlag(void)
|
||||||
sf_base64_decode(OTA_FTP_PASSWORD, (char *)tmpStr);
|
sf_base64_decode(OTA_FTP_PASSWORD, (char *)tmpStr);
|
||||||
snprintf((char *)puiPara->OtaFtpPassWord, sizeof(puiPara->OtaFtpPassWord), (char *)tmpStr);
|
snprintf((char *)puiPara->OtaFtpPassWord, sizeof(puiPara->OtaFtpPassWord), (char *)tmpStr);
|
||||||
|
|
||||||
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_)
|
||||||
puiPara->GpsNumber = DEFAULT_GPS_NUMBER;
|
puiPara->GpsNumber = DEFAULT_GPS_NUMBER;
|
||||||
puiPara->TimeSend1Switch = DEFAULT_TIMESEND1_SWITCH;
|
puiPara->TimeSend1Switch = DEFAULT_TIMESEND1_SWITCH;
|
||||||
puiPara->TimeSend2Switch = DEFAULT_TIMESEND2_SWITCH;
|
puiPara->TimeSend2Switch = DEFAULT_TIMESEND2_SWITCH;
|
||||||
|
|
|
@ -405,7 +405,7 @@ typedef struct _UIMenuUIMenuStoreInfo {
|
||||||
SF_PARA_TIME_S PirDelayTime;
|
SF_PARA_TIME_S PirDelayTime;
|
||||||
SF_PARA_TIME_S DailyReportTime;
|
SF_PARA_TIME_S DailyReportTime;
|
||||||
SF_PARA_TIME_S DailyReportTime2;
|
SF_PARA_TIME_S DailyReportTime2;
|
||||||
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
SF_PARA_TIME_S TimeSend1;
|
SF_PARA_TIME_S TimeSend1;
|
||||||
SF_PARA_TIME_S TimeSend2;
|
SF_PARA_TIME_S TimeSend2;
|
||||||
SF_PARA_TIME_S TimeSend3;
|
SF_PARA_TIME_S TimeSend3;
|
||||||
|
@ -475,7 +475,7 @@ typedef struct _UIMenuUIMenuStoreInfo {
|
||||||
CHAR GpsAntiTheftSwitch;
|
CHAR GpsAntiTheftSwitch;
|
||||||
CHAR BatteryLogSwitch;
|
CHAR BatteryLogSwitch;
|
||||||
|
|
||||||
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
////////////S530////////
|
////////////S530////////
|
||||||
CHAR GpsNumber;
|
CHAR GpsNumber;
|
||||||
CHAR TimeSend1Switch;/*OFF/ON*/
|
CHAR TimeSend1Switch;/*OFF/ON*/
|
||||||
|
@ -1892,7 +1892,7 @@ typedef enum
|
||||||
SF_PIR_SENSITIVITY_LOW,
|
SF_PIR_SENSITIVITY_LOW,
|
||||||
SF_PIR_SENSITIVITY_MAX,
|
SF_PIR_SENSITIVITY_MAX,
|
||||||
} SF_PIR_SENSITIVITY;
|
} SF_PIR_SENSITIVITY;
|
||||||
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#elif (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
|
|
|
@ -41,7 +41,7 @@ static PHOTO_SIZE_PARAM g_PhotoCapSizeTable[PHOTO_SIZE_ID_MAX + 2] = {
|
||||||
|
|
||||||
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
||||||
{2960, 1666, IMAGERATIO_16_9, "5M"}, // 5M
|
{2960, 1666, IMAGERATIO_16_9, "5M"}, // 5M
|
||||||
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#elif (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
{2592, 1944, IMAGERATIO_4_3, "5M"}, // 5M
|
{2592, 1944, IMAGERATIO_4_3, "5M"}, // 5M
|
||||||
#endif
|
#endif
|
||||||
{2048, 1536, IMAGERATIO_4_3, "3M"}, // 3M
|
{2048, 1536, IMAGERATIO_4_3, "3M"}, // 3M
|
||||||
|
@ -57,7 +57,7 @@ static PHOTO_SIZE_PARAM g_PhotoCapSizeTable[PHOTO_SIZE_ID_MAX + 2] = {
|
||||||
static PHOTO_SIZE_PARAM g_ScreenNailSizeTable[SCREEN_PHOTO_SIZE_ID_MAX + 2] = {
|
static PHOTO_SIZE_PARAM g_ScreenNailSizeTable[SCREEN_PHOTO_SIZE_ID_MAX + 2] = {
|
||||||
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
||||||
{1024, 768, IMAGERATIO_4_3, "0.78M"}, // 0.78M
|
{1024, 768, IMAGERATIO_4_3, "0.78M"}, // 0.78M
|
||||||
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#elif (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
{640, 480, IMAGERATIO_4_3, "VGA"}, // VGA
|
{640, 480, IMAGERATIO_4_3, "VGA"}, // VGA
|
||||||
{1024, 768, IMAGERATIO_4_3, "XGA"}, // 0.78M
|
{1024, 768, IMAGERATIO_4_3, "XGA"}, // 0.78M
|
||||||
{1920, 1440, IMAGERATIO_4_3, "2.76M"}, // 2.76M
|
{1920, 1440, IMAGERATIO_4_3, "2.76M"}, // 2.76M
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
//#endif
|
//#endif
|
||||||
|
|
||||||
//#ifndef SF_I2C_ADDR
|
//#ifndef SF_I2C_ADDR
|
||||||
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
#define MCU_I2C_SLAVE_ADDR (0x20>>1)
|
#define MCU_I2C_SLAVE_ADDR (0x20>>1)
|
||||||
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
||||||
#define MCU_I2C_SLAVE_ADDR (0xA0>>1)
|
#define MCU_I2C_SLAVE_ADDR (0xA0>>1)
|
||||||
|
|
|
@ -436,7 +436,7 @@ UINT32 sf_battery_adc_value_get_once(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HW_S530
|
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
|
|
||||||
/*************************************************
|
/*************************************************
|
||||||
Function: sf_battery_level_update
|
Function: sf_battery_level_update
|
||||||
|
|
|
@ -445,7 +445,7 @@ void sf_sys_status_led_set(LedSysState_t ledSysStateId)
|
||||||
sf_led_set(SF_LED_BUSY, SF_LED_STATE_ON);
|
sf_led_set(SF_LED_BUSY, SF_LED_STATE_ON);
|
||||||
//sf_set_runningLed(0);
|
//sf_set_runningLed(0);
|
||||||
break;
|
break;
|
||||||
|
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_))
|
||||||
case SF_LED_SYS_STATE_WIFI_DISCONNECT:
|
case SF_LED_SYS_STATE_WIFI_DISCONNECT:
|
||||||
sf_led_set(SF_LED_WIFI, SF_LED_STATE_SLOW_FLASHING);
|
sf_led_set(SF_LED_WIFI, SF_LED_STATE_SLOW_FLASHING);
|
||||||
break;
|
break;
|
||||||
|
@ -575,6 +575,7 @@ void sf_sys_status_led_set(LedSysState_t ledSysStateId)
|
||||||
sf_led_set(SF_LED_STATUS_R, SF_LED_STATE_ON);
|
sf_led_set(SF_LED_STATUS_R, SF_LED_STATE_ON);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
#endif
|
||||||
case SF_LED_SYS_STATE_RESET:
|
case SF_LED_SYS_STATE_RESET:
|
||||||
sf_set_runningLed(0);
|
sf_set_runningLed(0);
|
||||||
sf_led_set(SF_LED_ALL, SF_LED_STATE_ON);
|
sf_led_set(SF_LED_ALL, SF_LED_STATE_ON);
|
||||||
|
@ -584,7 +585,9 @@ void sf_sys_status_led_set(LedSysState_t ledSysStateId)
|
||||||
sf_set_runningLed(0);
|
sf_set_runningLed(0);
|
||||||
sf_led_set(SF_LED_ALL, SF_LED_STATE_OFF);
|
sf_led_set(SF_LED_ALL, SF_LED_STATE_OFF);
|
||||||
sf_led_set(SF_LED_BUSY, SF_LED_STATE_ON);
|
sf_led_set(SF_LED_BUSY, SF_LED_STATE_ON);
|
||||||
|
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_))
|
||||||
sf_led_set(SF_LED_STATUS_G, SF_LED_STATE_ON);
|
sf_led_set(SF_LED_STATUS_G, SF_LED_STATE_ON);
|
||||||
|
#endif
|
||||||
isUsbIn = TRUE;
|
isUsbIn = TRUE;
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
@ -619,13 +622,14 @@ void sf_sys_status_led_set(LedSysState_t ledSysStateId)
|
||||||
case SF_LED_SYS_STATE_PIR_NOT_DETECT:
|
case SF_LED_SYS_STATE_PIR_NOT_DETECT:
|
||||||
sf_led_set(SF_LED_BUSY, SF_LED_STATE_ON);
|
sf_led_set(SF_LED_BUSY, SF_LED_STATE_ON);
|
||||||
break;
|
break;
|
||||||
|
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_))
|
||||||
case SF_LED_SYS_STATE_BAT_0_SLOW:
|
case SF_LED_SYS_STATE_BAT_0_SLOW:
|
||||||
sf_led_set(SF_LED_BAT1, SF_LED_STATE_SLOW_FLASHING);
|
sf_led_set(SF_LED_BAT1, SF_LED_STATE_SLOW_FLASHING);
|
||||||
sf_led_set(SF_LED_BAT2, SF_LED_STATE_OFF);
|
sf_led_set(SF_LED_BAT2, SF_LED_STATE_OFF);
|
||||||
sf_led_set(SF_LED_BAT3, SF_LED_STATE_OFF);
|
sf_led_set(SF_LED_BAT3, SF_LED_STATE_OFF);
|
||||||
sf_led_set(SF_LED_BAT4, SF_LED_STATE_OFF);
|
sf_led_set(SF_LED_BAT4, SF_LED_STATE_OFF);
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,7 +56,7 @@ static UINT8 McuProductInfo = 0;
|
||||||
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
||||||
static UINT8 drNoResetTimeSync = FALSE; //0:reset; 1:no reset;
|
static UINT8 drNoResetTimeSync = FALSE; //0:reset; 1:no reset;
|
||||||
|
|
||||||
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#elif (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
static UINT8 isSignalReady = 0;
|
static UINT8 isSignalReady = 0;
|
||||||
static UINT32 GPRS_ERRNO = 0;
|
static UINT32 GPRS_ERRNO = 0;
|
||||||
|
|
||||||
|
@ -1334,7 +1334,7 @@ UINT8 sf_mcu_reg_set(MCUParam_t attrId, UINT8 val)
|
||||||
}
|
}
|
||||||
//#if 1
|
//#if 1
|
||||||
|
|
||||||
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#elif (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
|
|
||||||
/*************************************************
|
/*************************************************
|
||||||
Function: sf_mcu_analog_pir_sen_convert
|
Function: sf_mcu_analog_pir_sen_convert
|
||||||
|
@ -2520,7 +2520,7 @@ int sf_mod_init(void)
|
||||||
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
|
||||||
rt = sf_init_mcu();
|
rt = sf_init_mcu();
|
||||||
|
|
||||||
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
|
#elif (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) || defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_))
|
||||||
#if HUNTING_MCU_I2C == ENABLE
|
#if HUNTING_MCU_I2C == ENABLE
|
||||||
rt = sf_init_mcu();
|
rt = sf_init_mcu();
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in New Issue
Block a user