payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.S550适配

Browse Source
This commit is contained in:
payton 2023-09-14 11:28:44 +08:00
parent 4dd6c4e3b3
commit 0924de5678
17 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/application/source/cardv/SrcCode/PrjCfg.h
View File

@ -60,6 +60,8 @@
#include "PrjCfg_HUNTING_S530.h"
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
#include "PrjCfg_HUNTING_68CS.h"
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_)
#include "PrjCfg_HUNTING_S550.h"
#else //Unknown MODEL
#warning Unknown MODEL?
#warning Please assign your "PrjCfg_MODEL.h" in "PrjCfg.h"

2
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c
View File

@ -1834,7 +1834,7 @@ void SysResetFlag(void)
sf_base64_decode(OTA_FTP_PASSWORD, (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->TimeSend1Switch = DEFAULT_TIMESEND1_SWITCH;
puiPara->TimeSend2Switch = DEFAULT_TIMESEND2_SWITCH;

6
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h
View File

@ -405,7 +405,7 @@ typedef struct _UIMenuUIMenuStoreInfo {
SF_PARA_TIME_S PirDelayTime;
SF_PARA_TIME_S DailyReportTime;
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 TimeSend2;
SF_PARA_TIME_S TimeSend3;
@ -475,7 +475,7 @@ typedef struct _UIMenuUIMenuStoreInfo {
CHAR GpsAntiTheftSwitch;
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////////
CHAR GpsNumber;
CHAR TimeSend1Switch;/*OFF/ON*/
@ -1892,7 +1892,7 @@ typedef enum
SF_PIR_SENSITIVITY_LOW,
SF_PIR_SENSITIVITY_MAX,
} 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
{

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c
View File

@ -39,7 +39,7 @@ static PHOTO_SIZE_PARAM g_PhotoCapSizeTable[PHOTO_SIZE_ID_MAX + 2] = {
{3264, 2448, IMAGERATIO_4_3, "8M"}, // 8M
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
{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
#endif
{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] = {
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
{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
{1024, 768, IMAGERATIO_4_3, "XGA"}, // 0.78M
{1920, 1440, IMAGERATIO_4_3, "2.76M"}, // 2.76M

6
code/application/source/sf_app/code/source/4gMng/sf_4g_lpa.c
View File

@ -3423,20 +3423,26 @@ void sf_network_switch_thread()
{
sf_sys_status_led_set(SF_SIM_SWITCH_VERIZON_PROFILE);
sleep(3);
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_))
sf_led_set(SF_LED_SIG3, SF_LED_STATE_OFF);
#endif
}
else if(profileId == 1)
{
sf_sys_status_led_set(SF_SIM_SWITCH_ATT_PROFILE);
sleep(3);
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_))
sf_led_set(SF_LED_SIG2, SF_LED_STATE_OFF);
#endif
}
else
{
sf_sys_status_led_set(SF_SIM_SWITCH_OTHER_PROFILE);
sleep(3);
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_))
sf_led_set(SF_LED_SIG4, SF_LED_STATE_OFF);
#endif
}
//LOG_DM_RS("Reboot Camera...!\n");

2
code/application/source/sf_app/code/source/battery/sf_battery.c
View File

@ -397,7 +397,7 @@ UINT32 sf_battery_adc_value_get_once(void)
}
#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

7
code/application/source/sf_app/code/source/devMng/sf_ledmng.c
View File

@ -401,6 +401,7 @@ void* sf_led_thread(void *arg)
{
if(isUsbIn)
{
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_))
if((SF_LED_BUSY == i) || (SF_LED_STATUS_G == i))
{
sf_led_on(LedInfo[i].ledId);
@ -409,7 +410,9 @@ void* sf_led_thread(void *arg)
{
sf_led_off(LedInfo[i].ledId);
}
#endif
}
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_))
else if(FormatSdFlag)
{
if (FormatSdFlag == 1)
@ -455,6 +458,7 @@ void* sf_led_thread(void *arg)
}
}
}
#endif
else if(isGoToPir)
{
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:
sf_led_set(SF_LED_BUSY, SF_LED_STATE_ON);
break;
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_))
case SF_LED_SYS_STATE_BAT_0_SLOW:
sf_led_set(SF_LED_BAT1, SF_LED_STATE_SLOW_FLASHING);
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_led_set(SF_LED_SIG4, SF_LED_STATE_SLOW_FLASHING);
break;
#endif
default:
break;
}

2
code/driver/source/mcu/sf_mcu_dev.h
View File

@ -31,7 +31,7 @@
//#endif
//#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)
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
#define MCU_I2C_SLAVE_ADDR (0xA0>>1)

6
code/lib/source/sifar/code/source/mcu/sf_mcu_client.c
View File

@ -67,7 +67,7 @@ static UINT8 McuProductInfo = 0;
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
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 UINT32 GPRS_ERRNO = 0;
@ -458,7 +458,7 @@ UINT8 sf_mcu_power_on_para_get(MCUParam_t attrId)
dataTemp2 = mcuData[i++];
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)
{
startMode = PWR_ON_DAILY_REPORT;
@ -1371,7 +1371,7 @@ UINT8 sf_mcu_reg_set(MCUParam_t attrId, UINT8 val)
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
/*************************************************
Function: sf_mcu_analog_pir_sen_convert

2
rtos/code/application/source/cardv/SrcCode/PrjCfg.h
View File

@ -70,6 +70,8 @@
#include "PrjCfg_HUNTING_68CS.h"
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
#include "PrjCfg_HUNTING_S530.h"
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S550_)
#include "PrjCfg_HUNTING_S550.h"
#else
#include "PrjCfg_DVCam.h"
#endif

2
rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c
View File

@ -1246,7 +1246,7 @@ void SysResetFlag(void)
sf_base64_decode(OTA_FTP_PASSWORD, (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->TimeSend1Switch = DEFAULT_TIMESEND1_SWITCH;
puiPara->TimeSend2Switch = DEFAULT_TIMESEND2_SWITCH;

6
rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h
View File

@ -405,7 +405,7 @@ typedef struct _UIMenuUIMenuStoreInfo {
SF_PARA_TIME_S PirDelayTime;
SF_PARA_TIME_S DailyReportTime;
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 TimeSend2;
SF_PARA_TIME_S TimeSend3;
@ -475,7 +475,7 @@ typedef struct _UIMenuUIMenuStoreInfo {
CHAR GpsAntiTheftSwitch;
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////////
CHAR GpsNumber;
CHAR TimeSend1Switch;/*OFF/ON*/
@ -1892,7 +1892,7 @@ typedef enum
SF_PIR_SENSITIVITY_LOW,
SF_PIR_SENSITIVITY_MAX,
} 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
{

4
rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c
View File

@ -41,7 +41,7 @@ static PHOTO_SIZE_PARAM g_PhotoCapSizeTable[PHOTO_SIZE_ID_MAX + 2] = {
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
{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
#endif
{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] = {
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
{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
{1024, 768, IMAGERATIO_4_3, "XGA"}, // 0.78M
{1920, 1440, IMAGERATIO_4_3, "2.76M"}, // 2.76M

2
rtos/code/driver/na51089/include/sf_i2c_driver.h
View File

@ -18,7 +18,7 @@
//#endif
//#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)
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
#define MCU_I2C_SLAVE_ADDR (0xA0>>1)

2
rtos/code/driver/na51089/source/mcu/sf_battery.c
View File

@ -436,7 +436,7 @@ UINT32 sf_battery_adc_value_get_once(void)
}
#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

8
rtos/code/driver/na51089/source/mcu/sf_led.c
View File

@ -445,7 +445,7 @@ void sf_sys_status_led_set(LedSysState_t ledSysStateId)
sf_led_set(SF_LED_BUSY, SF_LED_STATE_ON);
//sf_set_runningLed(0);
break;
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_))
case SF_LED_SYS_STATE_WIFI_DISCONNECT:
sf_led_set(SF_LED_WIFI, SF_LED_STATE_SLOW_FLASHING);
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);
break;
#endif
case SF_LED_SYS_STATE_RESET:
sf_set_runningLed(0);
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_led_set(SF_LED_ALL, SF_LED_STATE_OFF);
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);
#endif
isUsbIn = TRUE;
break;
#endif
@ -619,13 +622,14 @@ void sf_sys_status_led_set(LedSysState_t ledSysStateId)
case SF_LED_SYS_STATE_PIR_NOT_DETECT:
sf_led_set(SF_LED_BUSY, SF_LED_STATE_ON);
break;
#if (defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_))
case SF_LED_SYS_STATE_BAT_0_SLOW:
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_BAT3, SF_LED_STATE_OFF);
sf_led_set(SF_LED_BAT4, SF_LED_STATE_OFF);
break;
#endif
default:
break;
}

6
rtos/code/driver/na51089/source/mcu/sf_mcu.c
View File

@ -56,7 +56,7 @@ static UINT8 McuProductInfo = 0;
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
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 UINT32 GPRS_ERRNO = 0;
@ -1334,7 +1334,7 @@ UINT8 sf_mcu_reg_set(MCUParam_t attrId, UINT8 val)
}
//#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
@ -2520,7 +2520,7 @@ int sf_mod_init(void)
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
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
rt = sf_init_mcu();
#else