From 0924de567819da37ab185e51ca427a44a93e3557 Mon Sep 17 00:00:00 2001 From: payton Date: Thu, 14 Sep 2023 11:28:44 +0800 Subject: [PATCH] =?UTF-8?q?1.S550=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/application/source/cardv/SrcCode/PrjCfg.h | 2 ++ .../cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c | 2 +- .../cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h | 6 +++--- .../SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c | 4 ++-- .../source/sf_app/code/source/4gMng/sf_4g_lpa.c | 6 ++++++ .../source/sf_app/code/source/battery/sf_battery.c | 2 +- .../source/sf_app/code/source/devMng/sf_ledmng.c | 7 ++++++- code/driver/source/mcu/sf_mcu_dev.h | 2 +- code/lib/source/sifar/code/source/mcu/sf_mcu_client.c | 6 +++--- rtos/code/application/source/cardv/SrcCode/PrjCfg.h | 2 ++ .../cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c | 2 +- .../cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h | 6 +++--- .../SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c | 4 ++-- rtos/code/driver/na51089/include/sf_i2c_driver.h | 2 +- rtos/code/driver/na51089/source/mcu/sf_battery.c | 2 +- rtos/code/driver/na51089/source/mcu/sf_led.c | 8 ++++++-- rtos/code/driver/na51089/source/mcu/sf_mcu.c | 6 +++--- 17 files changed, 44 insertions(+), 25 deletions(-) diff --git a/code/application/source/cardv/SrcCode/PrjCfg.h b/code/application/source/cardv/SrcCode/PrjCfg.h index 33a28f89f..df3036661 100755 --- a/code/application/source/cardv/SrcCode/PrjCfg.h +++ b/code/application/source/cardv/SrcCode/PrjCfg.h @@ -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" diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c index b8b92dd8c..4f7795366 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c @@ -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; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h index 95dd0cfec..d8572625a 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h @@ -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 { diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c index d4bd3636a..ca0d76a20 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c @@ -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 diff --git a/code/application/source/sf_app/code/source/4gMng/sf_4g_lpa.c b/code/application/source/sf_app/code/source/4gMng/sf_4g_lpa.c index 9f99652a9..fec90dc9c 100755 --- a/code/application/source/sf_app/code/source/4gMng/sf_4g_lpa.c +++ b/code/application/source/sf_app/code/source/4gMng/sf_4g_lpa.c @@ -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"); diff --git a/code/application/source/sf_app/code/source/battery/sf_battery.c b/code/application/source/sf_app/code/source/battery/sf_battery.c index 0302e2229..937f2aa15 100755 --- a/code/application/source/sf_app/code/source/battery/sf_battery.c +++ b/code/application/source/sf_app/code/source/battery/sf_battery.c @@ -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 diff --git a/code/application/source/sf_app/code/source/devMng/sf_ledmng.c b/code/application/source/sf_app/code/source/devMng/sf_ledmng.c index 0d59e9f13..e6780f679 100755 --- a/code/application/source/sf_app/code/source/devMng/sf_ledmng.c +++ b/code/application/source/sf_app/code/source/devMng/sf_ledmng.c @@ -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; } diff --git a/code/driver/source/mcu/sf_mcu_dev.h b/code/driver/source/mcu/sf_mcu_dev.h index 937e81cfd..bd795c3d2 100755 --- a/code/driver/source/mcu/sf_mcu_dev.h +++ b/code/driver/source/mcu/sf_mcu_dev.h @@ -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) diff --git a/code/lib/source/sifar/code/source/mcu/sf_mcu_client.c b/code/lib/source/sifar/code/source/mcu/sf_mcu_client.c index d97e7ef9f..537fd7482 100644 --- a/code/lib/source/sifar/code/source/mcu/sf_mcu_client.c +++ b/code/lib/source/sifar/code/source/mcu/sf_mcu_client.c @@ -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 diff --git a/rtos/code/application/source/cardv/SrcCode/PrjCfg.h b/rtos/code/application/source/cardv/SrcCode/PrjCfg.h index 49fc6891e..912dd85c8 100755 --- a/rtos/code/application/source/cardv/SrcCode/PrjCfg.h +++ b/rtos/code/application/source/cardv/SrcCode/PrjCfg.h @@ -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 diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c index 47efe151b..13857e244 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c @@ -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; diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h index d638f78b1..6fb5dc6cc 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h @@ -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 { diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c index e5388cbeb..9fd02c665 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIPhotoMapping.c @@ -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 diff --git a/rtos/code/driver/na51089/include/sf_i2c_driver.h b/rtos/code/driver/na51089/include/sf_i2c_driver.h index 8d0bccd00..4b26a7246 100644 --- a/rtos/code/driver/na51089/include/sf_i2c_driver.h +++ b/rtos/code/driver/na51089/include/sf_i2c_driver.h @@ -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) diff --git a/rtos/code/driver/na51089/source/mcu/sf_battery.c b/rtos/code/driver/na51089/source/mcu/sf_battery.c index 68c0861ba..32628d96a 100755 --- a/rtos/code/driver/na51089/source/mcu/sf_battery.c +++ b/rtos/code/driver/na51089/source/mcu/sf_battery.c @@ -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 diff --git a/rtos/code/driver/na51089/source/mcu/sf_led.c b/rtos/code/driver/na51089/source/mcu/sf_led.c index 7024bba66..f6645341d 100755 --- a/rtos/code/driver/na51089/source/mcu/sf_led.c +++ b/rtos/code/driver/na51089/source/mcu/sf_led.c @@ -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; } diff --git a/rtos/code/driver/na51089/source/mcu/sf_mcu.c b/rtos/code/driver/na51089/source/mcu/sf_mcu.c index be290a099..3e027429a 100755 --- a/rtos/code/driver/na51089/source/mcu/sf_mcu.c +++ b/rtos/code/driver/na51089/source/mcu/sf_mcu.c @@ -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