diff --git a/Core/Inc/yunhorn_sts_sensors.h b/Core/Inc/yunhorn_sts_sensors.h
index cc55119..ded590e 100644
--- a/Core/Inc/yunhorn_sts_sensors.h
+++ b/Core/Inc/yunhorn_sts_sensors.h
@@ -39,7 +39,7 @@ extern "C" {
/**
* Sensor data parameters
*/
-
+
enum YUNHORN_REGION {
REGION__AS923,
REGION__AU915,
diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c
index c9e84d5..9d698e4 100644
--- a/LoRaWAN/App/lora_app.c
+++ b/LoRaWAN/App/lora_app.c
@@ -45,7 +45,31 @@
#include "X-WL55_WLE5_53L0X.h"
#include "mlx90640_lcd_display.h"
/* USER CODE END Includes */
-
+char *regionCode2Name[10]={
+ "AS923",
+ "AU915",
+ "CN470",
+ "CN779",
+ "EU433",
+ "EU868",
+ "KR920",
+ "IN865",
+ "US915",
+ "RU864",
+};
+char *channelPlanCode2Name[6]={
+ "CHANNEL_PLAN_GROUP0",
+ "CHANNEL_PLAN_AS923_1",
+ "CHANNEL_PLAN_AS923_2",
+ "CHANNEL_PLAN_AS923_3",
+ "CHANNEL_PLAN_AS923_4",
+ "CHANNEL_PLAN_AS923_1_JP",
+};
+char *activationType2Name[3]={
+ "TypeNone",
+ "ABP",
+ "OTAA",
+};
/* External variables ---------------------------------------------------------*/
/* USER CODE BEGIN EV */
extern volatile uint8_t sts_service_mask;
@@ -2181,6 +2205,17 @@ void STS_REBOOT_GET_NVM_CONFIG(void)
sts_cfg_nvm.p[j] = (uint8_t)nvm_stored_value[NVM_CFG_START+j];
}
+ APP_LOG(TS_OFF, VLEVEL_H, "\r\n---------YUNHORN SmarToilets STS Sensor Initial Config -------\r\n");
+ APP_LOG(TS_OFF, VLEVEL_H, "\r\n- Uplink Interval = %2d Unit= %c \r\n", nvm_stored_value[NVM_PERIODICITY], nvm_stored_value[NVM_UNIT]);
+ APP_LOG(TS_OFF, VLEVEL_H, "\r\n- Sampling/HeartBeat Interval = %2d Unit = %c \r\n", nvm_stored_value[NVM_SAMPLING], nvm_stored_value[NVM_S_UNIT]);
+ APP_LOG(TS_OFF, VLEVEL_H, "\r\n- Sensor Work mode = %d Service Level = %d\r\n", nvm_stored_value[NVM_WORK_MODE], nvm_stored_value[NVM_SERVICE_MASK]);
+ APP_LOG(TS_OFF, VLEVEL_H, "\r\n- LoRaWAN Class= %c REGION= %s CHANNEL PLAN GROUP= %s \r\n", "ABC"[nvm_stored_value[NVM_LORA_CLASS_ABC]],regionCode2Name[nvm_stored_value[NVM_LORA_REGION]], channelPlanCode2Name[nvm_stored_value[NVM_LORA_REGION_SUB]]);
+ APP_LOG(TS_OFF, VLEVEL_H, "\r\n- UPLINK PORT = %03d HEART-BEAT PORT = %03d \r\n", nvm_stored_value[NVM_LORA_UPLINK_PORT],nvm_stored_value[NVM_LORA_HEART_BEAT_PORT]);
+ APP_LOG(TS_OFF, VLEVEL_H, "\r\n- ADR= %1d DR= %1d ACTIVATION TYPE = %4s\r\n", nvm_stored_value[NVM_LORA_DR_OR_ADR_ENABLE]>>4, nvm_stored_value[NVM_LORA_DR_OR_ADR_ENABLE]&0x0F, activationType2Name[nvm_stored_value[NVM_LORA_ACTIVATION_TYPE]]);
+ APP_LOG(TS_OFF, VLEVEL_H, "\r\n- TX POWER =%2d\r\n", nvm_stored_value[NVM_LORA_TX_POWER]);
+ APP_LOG(TS_OFF, VLEVEL_H, "\r\n- MTM1= %3d MTM2= %d \r\n", nvm_stored_value[NVM_MTM1],nvm_stored_value[NVM_MTM2]);
+ APP_LOG(TS_OFF, VLEVEL_H, "\r\n---------YUNHORN SmarToilets STS Sensor Initial Config -------\r\n");
+
sts_cfg_nvm.fall_detection_acc_threshold = (uint8_t)nvm_stored_value[NVM_FALL_DETECTION_ACC_THRESHOLD];
sts_cfg_nvm.fall_detection_depth_threshold = (uint8_t)nvm_stored_value[NVM_FALL_DETECTION_DEPTH_THRESHOLD];
sts_cfg_nvm.fall_detection_reserve = (uint8_t)nvm_stored_value[NVM_FALL_DETECTION_RESERVE];
@@ -2272,7 +2307,7 @@ void OnRestoreSTSCFGContextProcess(void)
defaultclass = LORAWAN_DEFAULT_CLASS;
if (defaultclass != deviceClass){
OnClassChange(deviceClass);
- APP_LOG(TS_OFF,VLEVEL_L,"\r\nSwitch LoRaWAN Class to %c \r\n", "ABC"[deviceClass]);
+ APP_LOG(TS_OFF,VLEVEL_H,"\r\nSwitch LoRaWAN Class to %c \r\n", "ABC"[deviceClass]);
}
// 2) LoRa Region and Sub Channel Plan Group
diff --git a/STM32CubeIDE/.settings/language.settings.xml b/STM32CubeIDE/.settings/language.settings.xml
index 1b77e84..a3a8531 100644
--- a/STM32CubeIDE/.settings/language.settings.xml
+++ b/STM32CubeIDE/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+