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

REVISED STRUCTURE OF NVM_CFG

This commit is contained in:
Yunhorn 2024-02-06 16:33:03 +08:00
parent ba95895db9
commit 361e4216e9
3 changed files with 63 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Core/Inc/yunhorn_sts_sensors.h
View File

@ -40,6 +40,26 @@ extern "C" {
* Sensor data parameters
*/
enum YUNHORN_REGION {
REGION__AS923,
REGION__AU915,
REGION__CN470,
REGION__CN779,
REGION__EU433,
REGION__EU868,
REGION__KR920,
REGION__IN865,
REGION__US915,
REGION__RU864
};
enum YUNHORN_CHANNEL_PLAN_GROUP {
CHANNEL_PLAN_GROUP0,
CHANNEL_PLAN_AS923_1,
CHANNEL_PLAN_AS923_2,
CHANNEL_PLAN_AS923_3,
CHANNEL_PLAN_AS923_4,
CHANNEL_PLAN_AS923_1_JP,
};
enum cfg_cmd_order{
CFG_CMD1=0, //'Y'
@ -531,18 +551,44 @@ enum nvm_order {
NVM_WORK_MODE,
NVM_SERVICE_MASK,
NVM_RESERVE01, //10
NVM_LEN, //11, 32=0x20
NVM_LEN, //11, 32=0x20, 0-31
NVM_CFG_START, //12, p[0] bytes for configs,
//13, p[1]
//14, p[2]
// ...
//15, p[3]
//16, p[4]
//17, p[5]
//18, p[6]
//19, p[7]
//20, p[8]
//21, p[9]
//22, p[10]
//23, p[11]
//24, p[12]
//25, p[13]
//26, p[14]
//27, p[15]
//28, p[16]
//29, p[17]
NVM_LORA_CLASS_ABC=30, //30, p[18]
NVM_LORA_REGION, //31, p[19]
NVM_LORA_REGION_SUB, //32, p[20]
NVM_LORA_UPLINK_PORT, //33, p[21] lora_cfg
NVM_LORA_HEART_BEAT_PORT, //34, p[22]
NVM_LORA_DR_OR_ADR_ENABLE, //35, p[23]
NVM_LORA_ACTIVATION_TYPE, //36, P[24]
NVM_LORA_TX_POWER, //37, P[25]
//38, P[26]
//39, P[27]
NVM_FALL_DETECTION_ACC_THRESHOLD=40, //40
NVM_FALL_DETECTION_DEPTH_THRESHOLD, //41
NVM_FALL_DETECTION_RESERVE, //42
NVM_OCCUPANCY_OVERTIME_THRESHOLD, //43
NVM_AC_CODE_START=44 //STORED, NO UPLOAD
//63, 20 bytes for AC code
NVM_FALL_DETECTION_ACC_THRESHOLD=40, //40, p[28]
NVM_FALL_DETECTION_DEPTH_THRESHOLD, //41, p[29]
NVM_FALL_DETECTION_RESERVE, //42, p[30]
NVM_OCCUPANCY_OVERTIME_THRESHOLD, //43, p[31]
NVM_AC_CODE_START=44, //44 STORED, NO UPLOAD
NVM_AC_CODE_END=63 //63, 20 bytes for AC code
};
typedef struct sts_cfg_nvm {

18
LoRaWAN/App/lora_app.c
View File

@ -103,15 +103,15 @@ volatile sts_cfg_nvm_t sts_cfg_nvm = {
0x05, //output time const 0x05=[5]*0.1=0.5
0x02, //downsampling factor [2]=2
0x03, //power saving mode ACTIVE [3] = 3U
0xFF, //reserve
0xFF, //reserve
0xFF, //reserve
0xFF, //reserve
0xFF, //reserve
0xFF, //reserve
0xFF, //reserve
0xFF, //reserve
0xFF, //reserve
0xff, //reserve
CLASS_A, //NVM_LORA_Class, A/B/C/D, 0/1/2/3/4
REGION__AS923, //REGION
CHANNEL_PLAN_AS923_1, //CHANNEL PLAN GROUP 1/2/3/4/5
LORAWAN_USER_APP_PORT, //APP UPLINK PORT
LORAWAN_USER_HTBT_PORT, //APP HEART-BEAT PORT, UPLINK PORT +1
LORAMAC_HANDLER_ADR_ON<<4|LORAWAN_DEFAULT_DATA_RATE,
ACTIVATION_TYPE_OTAA, //JOIN TYPE OTAA=2,ABP=1, NOT_DEFINE=0
LORAWAN_DEFAULT_TX_POWER, //TX POWER
0xFF, //reserve
0xFF, //reserve
}, // ******************* above 28 bytes28 bytes

1
LoRaWAN/Target/lorawan_conf.h
View File

@ -99,7 +99,6 @@ extern "C" {
/*#define REGION_IN865*/
/*#define REGION_US915*/
/*#define REGION_RU864*/
/*!
* @brief Default channel plan for region AS923
* @note Possible selections: