rebase before ABP test
This commit is contained in:
parent
4260c6c04e
commit
85d93aea20
|
@ -1443,6 +1443,8 @@ static void OnYunhornSTSHeartBeatTimerEvent(void *context)
|
|||
appHeartBeatDataPort = YUNHORN_STS_R1_LORA_APP_HTBT_PORT;
|
||||
#elif defined(STS_R1D)
|
||||
appHeartBeatDataPort = YUNHORN_STS_R1D_LORA_APP_HTBT_PORT;
|
||||
#elif defined(STS_R2)||defined(STS_R2x)
|
||||
appHeartBeatDataPort = YUNHORN_STS_R2_LORA_APP_HTBT_PORT;
|
||||
#elif defined(STS_R5)||defined(STS_R5x)
|
||||
appHeartBeatDataPort = YUNHORN_STS_R5_LORA_APP_HTBT_PORT;
|
||||
#elif defined(STS_R4)
|
||||
|
|
|
@ -100,7 +100,7 @@
|
|||
</toolChain>
|
||||
</folderInfo>
|
||||
<sourceEntries>
|
||||
<entry excluding="Application/User/Core/stm32wlxx_nucleo_bus.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
|
||||
<entry excluding="Application/User/STS/RC|Application/User/STS/TOF/vl53l1x_uld|Application/User/STS/TOF/App/app_tof_peoplecount.c|Application/User/Core/stm32wlxx_nucleo_bus.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
|
||||
</sourceEntries>
|
||||
</configuration>
|
||||
</storageModule>
|
||||
|
@ -217,7 +217,7 @@
|
|||
</toolChain>
|
||||
</folderInfo>
|
||||
<sourceEntries>
|
||||
<entry excluding="Application/User/Core/stm32wlxx_nucleo_bus.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
|
||||
<entry excluding="Application/User/STS/RC|Application/User/STS/TOF/vl53l1x_uld|Application/User/STS/TOF/App/app_tof_peoplecount.c|Application/User/Core/stm32wlxx_nucleo_bus.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
|
||||
</sourceEntries>
|
||||
</configuration>
|
||||
</storageModule>
|
||||
|
|
Binary file not shown.
|
@ -96,7 +96,8 @@
|
|||
#define YUNHORN_STS_PRD_STRING "STS_R1"
|
||||
#define sts_mtmcode1 0U
|
||||
#define sts_mtmcode2 57U
|
||||
|
||||
#define sts_senddataport (YUNHORN_STS_R1_LORA_APP_DATA_PORT)
|
||||
#define sts_sendhtbtport (YUNHORN_STS_R1_LORA_APP_HTBT_PORT)
|
||||
#endif
|
||||
|
||||
#ifdef YUNHORN_STS_R1D_ENABLED
|
||||
|
@ -115,7 +116,8 @@
|
|||
#define YUNHORN_STS_PRD_STRING "STS_R2"
|
||||
#define sts_mtmcode1 0U
|
||||
#define sts_mtmcode2 52U
|
||||
|
||||
#define sts_senddataport (YUNHORN_STS_R2_LORA_APP_DATA_PORT)
|
||||
#define sts_sendhtbtport (YUNHORN_STS_R2_LORA_APP_HTBT_PORT)
|
||||
#endif
|
||||
|
||||
#ifdef YUNHORN_STS_R3_ENABLED
|
||||
|
@ -152,7 +154,8 @@
|
|||
#define YUNHORN_STS_PRD_STRING "STS_P2"
|
||||
#define sts_mtmcode1 0U
|
||||
#define sts_mtmcode2 106U
|
||||
|
||||
#define sts_senddataport (YUNHORN_STS_P2_LORA_APP_DATA_PORT)
|
||||
#define sts_sendhtbtport (YUNHORN_STS_P2_LORA_APP_HTBT_PORT)
|
||||
#endif
|
||||
|
||||
#ifdef STS_T6
|
||||
|
@ -161,6 +164,8 @@
|
|||
#define YUNHORN_STS_PRD_STRING "STS_T6"
|
||||
#define sts_mtmcode1 0U
|
||||
#define sts_mtmcode2 14U
|
||||
#define sts_senddataport (YUNHORN_STS_T6_LORA_APP_DATA_PORT)
|
||||
#define sts_sendhtbtport (YUNHORN_STS_T6_LORA_APP_HTBT_PORT)
|
||||
|
||||
#endif
|
||||
|
||||
|
@ -180,7 +185,8 @@
|
|||
#define YUNHORN_STS_PRD_STRING "STS_M1"
|
||||
#define sts_mtmcode1 0U
|
||||
#define sts_mtmcode2 6U
|
||||
|
||||
#define sts_senddataport (YUNHORN_STS_M1_LORA_APP_DATA_PORT)
|
||||
#define sts_sendhtbtport (YUNHORN_STS_M1_LORA_APP_HTBT_PORT)
|
||||
#endif
|
||||
//#define YUNHORN_STS_M1_LORA_APP_DATA_PORT 6U
|
||||
//#define YUNHORN_STS_M1_LORA_APP_HTBT_PORT 6U
|
||||
|
@ -209,8 +215,8 @@
|
|||
|
||||
/* General Settings */
|
||||
#define MajorVer 25U
|
||||
#define MinorVer 3U
|
||||
#define SubMinorVer 10U
|
||||
#define MinorVer 7U
|
||||
#define SubMinorVer 21U
|
||||
#define FirmwareVersion 3U
|
||||
#define YUNHORN_STS_MAX_NVM_CFG_SIZE 64U
|
||||
#define YUNHORN_STS_AC_CODE_SIZE 20U
|
||||
|
|
Loading…
Reference in New Issue