sundp
/
STS_R1D
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enabled power on, good so far

This commit is contained in:
Yunhorn 2024-04-16 14:55:29 +08:00
parent 6f5b4e53a0
commit 775586af6d
9 changed files with 27823 additions and 28462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Core/Inc/sys_conf.h
View File

@ -47,12 +47,12 @@ extern "C" {
/**
* @brief Verbose level for all trace logs
*/
#define VERBOSE_LEVEL VLEVEL_M
#define VERBOSE_LEVEL VLEVEL_OFF
/**
* @brief Enable trace logs
*/
#define APP_LOG_ENABLED 1
#define APP_LOG_ENABLED 0
/**
* @brief Activate monitoring (probes) of some internal RF signals for debug purpose
@ -75,7 +75,7 @@ extern "C" {
* @brief Enable/Disable MCU Debugger pins (dbg serial wires)
* @note by HW serial wires are ON by default, need to put them OFF to save power
*/
#define DEBUGGER_ENABLED 1
#define DEBUGGER_ENABLED 0
/**
* @brief Disable Low Power mode

2
Core/Inc/yunhorn_sts_prd_conf.h
View File

@ -110,7 +110,7 @@
#define MajorVer 24U
#define MinorVer 03U
#define SubMinorVer 07U
#define SubMinorVer 16U
#define FirmwareVersion 3U
#define YUNHORN_STS_MAX_NVM_CFG_SIZE 64U
#define YUNHORN_STS_AC_CODE_SIZE 20U

6
Core/Src/gpio.c
View File

@ -67,9 +67,9 @@ void MX_GPIO_Init(void)
|LED3_Pin, GPIO_PIN_RESET);
#endif
/*Configure GPIO pin Output Level */
//#if defined(TOF_2)
// HAL_GPIO_WritePin(TOF_C_XSHUT_GPIO_Port, TOF_C_XSHUT_Pin, GPIO_PIN_SET);
//#endif
#if defined(TOF_2)
HAL_GPIO_WritePin(TOF_L_XSHUT_GPIO_Port, TOF_L_XSHUT_Pin, GPIO_PIN_SET);
#endif
#if defined(STM32WL55xx)
/*Configure GPIO pins : PBPin PBPin PBPin */
GPIO_InitStruct.Pin = LED1_Pin|LED2_Pin|LED3_Pin;

3
Core/Src/stm32_lpm_if.c
View File

@ -94,13 +94,12 @@ void PWR_EnterOffMode(void)
void PWR_ExitOffMode(void)
{
/* USER CODE BEGIN ExitOffMode_1 */
#if 1
POWER_ON;
HAL_ResumeTick();
//__HAL_PWR_CLEAR_FLAG(PWR_FLAG_SB);
//HAL_GPIO_WritePin(GPIOB, GPIO_PIN_2, GPIO_PIN_SET); /* LED ON */
return;
#endif
/* USER CODE END ExitOffMode_1 */
}

14
LoRaWAN/App/lora_app.c
View File

@ -849,20 +849,28 @@ static void SendTxData(void)
{
sensor_data_ready =0;
upload_message_timer =0;
#ifdef STS_R5
#ifdef ROCTEC_R5
AppData.Buffer[i++] = (uint8_t)(r0_data.distance1_mm >>8)&0xff; //#05
AppData.Buffer[i++] = (uint8_t)(r0_data.distance1_mm)&0xff; //#06
#elif defined(STS_O5)
AppData.Buffer[i++] = (uint8_t)(oo_data.state_sensor1_on_off)&0xff;
#elif defined(YUNHORN_STS_R0_ENABLED)
#elif defined(STS_R1D)
AppData.Buffer[i++] = (uint8_t)(0x04)&0xff; //#length of following bytes
AppData.Buffer[i++] = (uint8_t)(r0_data.distance_mm >>8)&0xff; //#05
AppData.Buffer[i++] = (uint8_t)(r0_data.distance_mm)&0xff; //#06
AppData.Buffer[i++] = (uint8_t)(r0_data.distance1_mm >>8)&0xff; //#07
AppData.Buffer[i++] = (uint8_t)(r0_data.distance1_mm)&0xff; //#08
#endif
#if defined(STS_R5)
AppData.Buffer[i++] = (uint8_t)(0x02)&0xff; //#length of following bytes
AppData.Buffer[i++] = (uint8_t)(r0_data.distance1_mm >>8)&0xff; //#05
AppData.Buffer[i++] = (uint8_t)(r0_data.distance1_mm)&0xff; //#06
#endif
#ifdef TOF_3
AppData.Buffer[i++] = (uint8_t)(0x02)&0xff; //#length of following bytes
AppData.Buffer[i++] = (uint8_t)(r0_data.distance2_mm >>8)&0xff; //#09
AppData.Buffer[i++] = (uint8_t)(r0_data.distance2_mm)&0xff; //#10
#endif
@ -871,7 +879,7 @@ static void SendTxData(void)
#endif
// AppData.Buffer[i++] = (uint8_t)(r0_data.battery_mV >>8)&0xff; //#12
// AppData.Buffer[i++] = (uint8_t)(r0_data.battery_mV)&0xff; //#13
#endif
}

66
STM32CubeIDE/Release/Application/User/LoRaWAN/App/lora_app.cyclo
View File

@ -1,35 +1,35 @@
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:929:13:OnTxTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1057:13:OnSysTimeUpdate 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1105:13:OnTxFrameCtrlChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1116:13:OnPingSlotPeriodicityChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1064:13:OnClassChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:913:13:OnTxTimerEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1071:13:OnMacProcessNotify 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1083:13:OnTxPeriodicityChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1287:13:OnYunhornSTSHeartBeatPeriodicityChanged 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:983:13:OnJoinRequest 4
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1253:13:OnRestoreContextRequest 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1141:13:StopJoin 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:783:13:SendTxData 10
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1022:13:OnBeaconStatusChange 4
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1220:13:OnNvmDataChange 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:952:13:OnTxData 4
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1349:13:OnYunhornSTSHeartBeatTimerEvent 5
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1180:13:OnStopJoinTimerEvent 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1127:13:OnSystemReset 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1238:13:OnStoreContextRequest 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1198:13:StoreContext 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:943:13:OnJoinTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:936:13:OnRxTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1030:13:OnBeaconStatusChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1065:13:OnSysTimeUpdate 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1072:13:OnClassChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1113:13:OnTxFrameCtrlChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1124:13:OnPingSlotPeriodicityChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:921:13:OnTxTimerEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1079:13:OnMacProcessNotify 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1091:13:OnTxPeriodicityChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1295:13:OnYunhornSTSHeartBeatPeriodicityChanged 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:991:13:OnJoinRequest 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1261:13:OnRestoreContextRequest 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1149:13:StopJoin 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1206:13:StoreContext 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:783:13:SendTxData 8
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:960:13:OnTxData 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1357:13:OnYunhornSTSHeartBeatTimerEvent 5
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1188:13:OnStopJoinTimerEvent 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1135:13:OnSystemReset 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1246:13:OnStoreContextRequest 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:951:13:OnJoinTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1228:13:OnNvmDataChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:937:13:OnTxTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:944:13:OnRxTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:631:6:HAL_GPIO_EXTI_Callback 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1862:6:STS_SENSOR_Upload_Message 8
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1849:6:STS_SENSOR_Upload_Config_Invalid_Message 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1910:6:OnStoreSTSCFGContextRequest 6
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1959:6:OnRestoreSTSCFGContextRequest 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2022:6:OnRestoreSTSCFGContextProcess 8
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1971:6:STS_REBOOT_CONFIG_Init 6
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1870:6:STS_SENSOR_Upload_Message 6
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1857:6:STS_SENSOR_Upload_Config_Invalid_Message 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1918:6:OnStoreSTSCFGContextRequest 6
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1967:6:OnRestoreSTSCFGContextRequest 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2030:6:OnRestoreSTSCFGContextProcess 8
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1979:6:STS_REBOOT_CONFIG_Init 6
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:484:6:LoRaWAN_Init 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2090:6:STS_SENSOR_Distance_Test_Process 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2107:6:STS_SENSOR_Function_Test_Process 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1365:6:USER_APP_AUTO_RESPONDER_Parse 47
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:680:13:OnRxData 17
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2098:6:STS_SENSOR_Distance_Test_Process 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2115:6:STS_SENSOR_Function_Test_Process 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1373:6:USER_APP_AUTO_RESPONDER_Parse 47
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:680:13:OnRxData 15

4
STM32CubeIDE/Release/Application/User/TOF/App/app_tof_vl53l0x_range.cyclo
View File

@ -1,6 +1,6 @@
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/TOF/App/app_tof_vl53l0x_range.c:117:6:HandleError 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/TOF/App/app_tof_vl53l0x_range.c:132:5:sts_tof_vl53l0x_DetectSensors 7
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/TOF/App/app_tof_vl53l0x_range.c:218:6:sts_tof_vl53l0x_SetupSingleShot 16
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/TOF/App/app_tof_vl53l0x_range.c:218:6:sts_tof_vl53l0x_SetupSingleShot 4
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/TOF/App/app_tof_vl53l0x_range.c:331:6:sts_tof_vl53l0x_Sensor_SetNewRange 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/TOF/App/app_tof_vl53l0x_range.c:348:6:STS_TOF250_Range_Process 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/TOF/App/app_tof_vl53l0x_range.c:370:6:STS_TOF_VL53L0X_Range_Process 11
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/TOF/App/app_tof_vl53l0x_range.c:370:6:STS_TOF_VL53L0X_Range_Process 10

56182
STM32CubeIDE/Release/STS_RR_R125.list
View File

File diff suppressed because it is too large Load Diff

2
TOF/App/app_tof.c
View File

@ -104,7 +104,7 @@ void MX_TOF_Process(void)
#ifdef STS_USE_TOF_VL53L0X
STS_SENSOR_Power_ON(1);
HAL_Delay(1);
HAL_Delay(100);
#if defined(TOF_1)||defined(TOF_2)
STS_TOF_VL53L0X_Range_Process();
#endif