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

revised for initial config print out

This commit is contained in:
Yunhorn 2024-02-07 16:50:56 +08:00
parent cf22bc3499
commit ad5a4ace3a
3 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/Inc/yunhorn_sts_sensors.h
View File

@ -39,7 +39,7 @@ extern "C" {
/** /**
* Sensor data parameters * Sensor data parameters
*/ */
enum YUNHORN_REGION { enum YUNHORN_REGION {
REGION__AS923, REGION__AS923,
REGION__AU915, REGION__AU915,

39
LoRaWAN/App/lora_app.c
View File

@ -45,7 +45,31 @@
#include "X-WL55_WLE5_53L0X.h" #include "X-WL55_WLE5_53L0X.h"
#include "mlx90640_lcd_display.h" #include "mlx90640_lcd_display.h"
/* USER CODE END Includes */ /* 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 ---------------------------------------------------------*/ /* External variables ---------------------------------------------------------*/
/* USER CODE BEGIN EV */ /* USER CODE BEGIN EV */
extern volatile uint8_t sts_service_mask; 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]; 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_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_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]; 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; defaultclass = LORAWAN_DEFAULT_CLASS;
if (defaultclass != deviceClass){ if (defaultclass != deviceClass){
OnClassChange(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 // 2) LoRa Region and Sub Channel Plan Group

4
STM32CubeIDE/.settings/language.settings.xml
View File

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1478721304516500601" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1231826695271025643" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1478721304516500601" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1231826695271025643" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>