diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 1d2a9bb..98893dd 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -1271,9 +1271,12 @@ static void SendTxData(void) heart_beat_timer=0; sensor_data_ready = 0; - AppData.Port = (uint8_t)YUNHORN_STS_T6_LORA_APP_HTBT_PORT; //LORAWAN_USER_APP_PORT+1; - AppData.Buffer[i++] = (uint8_t)(AppLedStateOn|0x80)&0x0ff; + AppData.Port = (uint8_t)YUNHORN_STS_T6_LORA_APP_HTBT_PORT; //LORAWAN_USER_APP_PORT+1; + AppData.Buffer[i++] = (uint8_t)(AppLedStateOn|0x80)&0x0ff; AppData.Buffer[i++] = (uint8_t)(99*batteryLevel/254)&0xff; +#if defined(STS_T6) + AppData.Buffer[i++] = (uint8_t)((int16_t)(sensor_data.temperature) & 0xFF); +#endif } else if ((sensor_data_ready != 0)) { sensor_data_ready = 0; @@ -2162,6 +2165,7 @@ void OnRestoreSTSCFGContextProcess(void) sts_color_occupy_vacant = sts_cfg_nvm.color_occupy_vacant; APP_LOG(TS_OFF, VLEVEL_M, "\r\n Color Occupy =%02x, VACANT =%02x \r\n",((sts_color_occupy_vacant>>4)&0x0f), sts_color_occupy_vacant&0x0f ); + sts_tof_init_status = -1; // to enfore config update/init ppc_cfg_parameter_update(); #ifdef YUNHORN_STS_O6_ENABLED diff --git a/STM32CubeIDE/Release/makefile b/STM32CubeIDE/Release/makefile index d6824bb..29cf096 100644 --- a/STM32CubeIDE/Release/makefile +++ b/STM32CubeIDE/Release/makefile @@ -20,6 +20,7 @@ RM := rm -rf -include Application/User/STS/TOF/vl53l1x_uld/subdir.mk -include Application/User/STS/TOF/Target/subdir.mk -include Application/User/STS/TOF/App/subdir.mk +-include Application/User/STS/RC/subdir.mk -include Application/User/STS/Core/Src/subdir.mk -include Application/User/LoRaWAN/Target/subdir.mk -include Application/User/LoRaWAN/App/subdir.mk diff --git a/STM32CubeIDE/Release/sources.mk b/STM32CubeIDE/Release/sources.mk index 9f845fe..05a9096 100644 --- a/STM32CubeIDE/Release/sources.mk +++ b/STM32CubeIDE/Release/sources.mk @@ -26,6 +26,7 @@ Application/User/Core \ Application/User/LoRaWAN/App \ Application/User/LoRaWAN/Target \ Application/User/STS/Core/Src \ +Application/User/STS/RC \ Application/User/STS/TOF/App \ Application/User/STS/TOF/Target \ Application/User/STS/TOF/vl53l1x_uld \