diff --git a/Core/Inc/yunhorn_sts_prd_conf.h b/Core/Inc/yunhorn_sts_prd_conf.h index a6b2682..6a99346 100644 --- a/Core/Inc/yunhorn_sts_prd_conf.h +++ b/Core/Inc/yunhorn_sts_prd_conf.h @@ -223,12 +223,16 @@ #define YUNHORN_STS_M7_LORA_APP_DATA_PORT 20U #define YUNHORN_STS_M7_LORA_APP_HTBT_PORT 21U #define YUNHORN_STS_M7_USER_APP_CTRL_PORT 2U -#define sts_mtmcode1 0U -#define sts_mtmcode2 9U -#define sts_version 1U -#define sts_senddataport YUNHORN_STS_M7_LORA_APP_DATA_PORT -#define sts_sendhtbtport YUNHORN_STS_M7_LORA_APP_HTBT_PORT -#define sts_appctrlport YUNHORN_STS_M7_USER_APP_CTRL_PORT +#define YUNHORN_STS_M7_USER_APP_CTRL_REPLY_PORT 1U +#define sts_mtmcode1 0U +#define sts_mtmcode2 9U +#define sts_hardware_ver 0U +#define sts_version 1U +#define sts_senddataport YUNHORN_STS_M7_LORA_APP_DATA_PORT +#define sts_sendhtbtport YUNHORN_STS_M7_LORA_APP_HTBT_PORT +#define sts_appctrlport YUNHORN_STS_M7_USER_APP_CTRL_PORT +#define sts_appctrl_reply_port YUNHORN_STS_M7_USER_APP_CTRL_REPLY_PORT + #define NVM_CFG_PARAMETER_SIZE YUNHORN_STS_M7_NVM_CFG_SIZE #define CFG_CMD_PARAMETER_SIZE YUNHORN_STS_M7_CFG_CMD_SIZE #define MEMS_POWER_Pin GPIO_PIN_4 diff --git a/Core/Inc/yunhorn_sts_sensors.h b/Core/Inc/yunhorn_sts_sensors.h index 96d3110..1954d13 100644 --- a/Core/Inc/yunhorn_sts_sensors.h +++ b/Core/Inc/yunhorn_sts_sensors.h @@ -371,6 +371,7 @@ enum { NVM_MTM1=0, NVM_MTM2, NVM_VER, + NVM_HWV, NVM_PERIODICITY_H, NVM_PERIODICITY_L, NVM_UNIT, @@ -381,6 +382,7 @@ typedef struct sts_cfg_nvm { uint8_t mtmcode1; uint8_t mtmcode2; uint8_t version; + uint8_t hardware_ver; uint8_t periodicity_h; //count of duty cycle duration high {0,9} uint8_t periodicity_l; //count of duty cycle duration low {0,9} uint8_t unit; // time unit of duty cycle duration, in 'S', 'M','H' seconds, minutes, hours diff --git a/Core/Src/main.c b/Core/Src/main.c index a2d7dc2..5db85df 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -95,7 +95,7 @@ int main(void) MX_LoRaWAN_Init(); /* USER CODE BEGIN 2 */ - + /* USER CODE END 2 */ /* Infinite loop */ diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 7ff6fab..17138d7 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -45,7 +45,7 @@ /* USER CODE BEGIN EV */ volatile uint8_t mems_int1_detected = 0; volatile uint8_t periodicity_level=0; -volatile sts_cfg_nvm_t sts_cfg_nvm={sts_mtmcode1,sts_mtmcode2, sts_version,0x01,0x05,'S',0x03,0x08,0x04,0x02}; +volatile sts_cfg_nvm_t sts_cfg_nvm={sts_mtmcode1,sts_mtmcode2, sts_version, sts_hardware_ver, 0x01,0x05,'S',0x03,0x08,0x04,0x02}; #ifdef YUNHORN_STS_M7_ENABLED extern volatile uint8_t sensor_data_ready; extern volatile STS_M7_SensorDataTypeDef sts_m7_sensorData; @@ -354,8 +354,8 @@ void LoRaWAN_Init(void) /* USER CODE END LoRaWAN_Init_LV */ /* USER CODE BEGIN LoRaWAN_Init_1 */ - APP_LOG(TS_OFF, VLEVEL_M, "\r\n\n\n##### YUNHORN_STS_FW:%d HW:%d.%d.%d SW:%d.%d.%d####\r\n\n\n", - FirmwareVersion, sts_mtmcode1,sts_mtmcode2,sts_version, MajorVer, MinorVer, SubMinorVer); + APP_LOG(TS_OFF, VLEVEL_M, "\r\n\n\n##### YUNHORN_STS_FW:%d SWV%d HWV:%d MTM:%d.%d R:%d.%d.%d####\r\n\n\n", + FirmwareVersion, sts_version, sts_hardware_ver, sts_mtmcode1,sts_mtmcode2, MajorVer, MinorVer, SubMinorVer); /* Get LoRaWAN APP version*/ APP_LOG(TS_OFF, VLEVEL_M, "APPLICATION_VERSION: V%X.%X.%X\r\n", (uint8_t)(APP_VERSION_MAIN), @@ -604,7 +604,7 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, size_t tlv_buf_size) case 'Z': //"YZ" if ((char)tlv_buf[CFG_CMD3] == 'H') { //BOARD SOFT RESET, REVIVE "YZH" //BOARD REVIVE - STS_SENSOR_Upload_Message(LORAWAN_USER_APP_PORT, 20, "!YunHorn STS Revive!"); + STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, 20, "!YunHorn STS Revive!"); HAL_Delay(5000); OnSystemReset(); @@ -622,7 +622,7 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, size_t tlv_buf_size) outbuf[i++] = (uint8_t) sts_mtmcode2; outbuf[i++] = (uint8_t) sts_version; outbuf[i++] = (uint8_t) (0x41+ deviceClass); //translate to 'A','B','C' - STS_SENSOR_Upload_Message(LORAWAN_USER_APP_PORT, i, outbuf); + STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, i, outbuf); } break; @@ -637,7 +637,7 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, size_t tlv_buf_size) outbuf[i++] = (uint8_t) MajorVer; outbuf[i++] = (uint8_t) MinorVer; outbuf[i++] = (uint8_t) SubMinorVer; - STS_SENSOR_Upload_Message(LORAWAN_USER_APP_PORT, i, outbuf); + STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, i, outbuf); APP_LOG(TS_OFF, VLEVEL_L, "###### YUNHORN Report Version [ %10x ] \r\n", outbuf); } else @@ -658,7 +658,7 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, size_t tlv_buf_size) for (uint8_t j=1; j <= cfg_in_nvm[NVM_LEN]; j++) { outbuf[i++] = (uint8_t) (cfg_in_nvm[NVM_LEN+j]); } - STS_SENSOR_Upload_Message(LORAWAN_USER_APP_PORT, i, outbuf); + STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, i, outbuf); APP_LOG(TS_OFF, VLEVEL_L, "###### YUNHORN Report Config in NVM [ %10x ] \r\n", outbuf); } @@ -672,7 +672,7 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, size_t tlv_buf_size) outbuf[i++] = (uint8_t) tlv_buf[CFG_CMD1]; outbuf[i++] = (uint8_t) tlv_buf[CFG_CMD2]; outbuf[i++] = (uint8_t) tlv_buf[CFG_CMD3]; - STS_SENSOR_Upload_Message(LORAWAN_USER_APP_PORT, i, outbuf); + STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, i, outbuf); } else { STS_SENSOR_Upload_Config_Invalid_Message(); } @@ -685,7 +685,7 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, size_t tlv_buf_size) outbuf[i++] = (uint8_t) tlv_buf[CFG_CMD1]; outbuf[i++] = (uint8_t) tlv_buf[CFG_CMD2]; outbuf[i++] = (uint8_t) tlv_buf[CFG_CMD3]; - STS_SENSOR_Upload_Message(LORAWAN_USER_APP_PORT, i, outbuf); + STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, i, outbuf); } else { STS_SENSOR_Upload_Config_Invalid_Message(); } @@ -698,7 +698,7 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, size_t tlv_buf_size) outbuf[i++] = (uint8_t) tlv_buf[CFG_CMD1]; outbuf[i++] = (uint8_t) tlv_buf[CFG_CMD2]; outbuf[i++] = (uint8_t) tlv_buf[CFG_CMD3]; - STS_SENSOR_Upload_Message(LORAWAN_USER_APP_PORT, i, outbuf); + STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, i, outbuf); } else { STS_SENSOR_Upload_Config_Invalid_Message(); } @@ -728,11 +728,12 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, size_t tlv_buf_size) outbuf[i++] = (uint8_t) tlv_buf[CFG_CMD4]; outbuf[i++] = (uint8_t) tlv_buf[CFG_CMD5]; - STS_SENSOR_Upload_Message(LORAWAN_USER_APP_PORT, i, outbuf); + STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, i, outbuf); // Save config to NVM sts_cfg_nvm.mtmcode1 = sts_mtmcode1; sts_cfg_nvm.mtmcode2 = sts_mtmcode2; sts_cfg_nvm.version = sts_version; + sts_cfg_nvm.hardware_ver = sts_hardware_ver; sts_cfg_nvm.periodicity_h = tlv_buf[CFG_CMD3]; sts_cfg_nvm.periodicity_l = tlv_buf[CFG_CMD4]; sts_cfg_nvm.unit = periodicity_unit; @@ -782,6 +783,7 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, size_t tlv_buf_size) outbuf[i++] = sts_mtmcode1; outbuf[i++] = sts_mtmcode2; outbuf[i++] = sts_version; + outbuf[i++] = sts_hardware_ver; outbuf[i++] = (uint8_t) act_threshold; outbuf[i++] = (uint8_t) inact_threshold; outbuf[i++] = (uint8_t) inact_duration; @@ -790,6 +792,7 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, size_t tlv_buf_size) sts_cfg_nvm.mtmcode1 = sts_mtmcode1; sts_cfg_nvm.mtmcode2 = sts_mtmcode2; sts_cfg_nvm.version = sts_version; + sts_cfg_nvm.hardware_ver = sts_hardware_ver; sts_cfg_nvm.length = NVM_CFG_PARAMETER_SIZE; sts_cfg_nvm.p[0] = (uint8_t) act_threshold; @@ -806,7 +809,7 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, size_t tlv_buf_size) } #endif // Step 3: Upload status update message - STS_SENSOR_Upload_Message(LORAWAN_USER_APP_PORT, i, outbuf); + STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, i, outbuf); #if defined(YUNHORN_STS_R1_ENABLED) || defined(YUNHORN_STS_R2_ENABLED)|| defined(YUNHORN_STS_R3_ENABLED) || defined(YUNHORN_STS_R5_ENABLED) #endif @@ -836,7 +839,7 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, size_t tlv_buf_size) void STS_SENSOR_Upload_Config_Invalid_Message(void) { - STS_SENSOR_Upload_Message(LORAWAN_USER_APP_PORT, 5, "PVXXX"); + STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, 5, "PVXXX"); } void STS_SENSOR_Upload_Message(uint8_t appDataPort, uint8_t appBufferSize, char *appDataBuffer) @@ -847,7 +850,7 @@ void STS_SENSOR_Upload_Message(uint8_t appDataPort, uint8_t appBufferSize, char for (uint8_t i=0;i> 8); //04 Freq Max 256 Hz Given sample rate & FFT Length 512 - AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_x_freq); //05 Freq Max 256 Hz Given sample rate & FFT Length 512 + AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_x_freq >> 8); //08 Freq Max 256 Hz Given sample rate & FFT Length 512 + AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_x_freq); //09 Freq Max 256 Hz Given sample rate & FFT Length 512 - AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_y_freq >> 8); //06 Freq Max 256 Hz Given sample rate & FFT Length 512 - AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_y_freq); //07 Freq Max 256 Hz Given sample rate & FFT Length 512 + AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_y_freq >> 8); //10 Freq Max 256 Hz Given sample rate & FFT Length 512 + AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_y_freq); //11 Freq Max 256 Hz Given sample rate & FFT Length 512 - AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_z_freq >> 8); //08 Freq Max 256 Hz Given sample rate & FFT Length 512 - AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_z_freq); //09 Freq Max 256 Hz Given sample rate & FFT Length 512 + AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_z_freq >> 8); //12 Freq Max 256 Hz Given sample rate & FFT Length 512 + AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_z_freq); //13 Freq Max 256 Hz Given sample rate & FFT Length 512 - AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_x_rms >> 8 ); //10 Freq Max 256 Hz Given sample rate & FFT Length 512 - AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_x_rms); //11 + AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_x_rms >> 8 ); //14 Freq Max 256 Hz Given sample rate & FFT Length 512 + AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_x_rms); //15 - AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_y_rms >> 8); //12 - AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_y_rms); //13 + AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_y_rms >> 8); //16 + AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_y_rms); //17 - AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_z_rms >>8 ); //14 - AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_z_rms); //15 + AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_z_rms >>8 ); //18 + AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.vb_z_rms); //19 + - AppData.Buffer[i++] = (uint8_t)(99*batteryLevel/254); //16 /* 99% (very low) to 254 (fully charged) */ APP_LOG(TS_OFF, VLEVEL_H, "###### Duration:%02d seconds | FREQ_X:%d Hz | FREQ_Y:%d Hz | FREQ_Z:%d Hz |\r\n###### | RMS_X:%d | RMS_Y:%d | RMS_Z:%d | BATTERY_B:%02d%% |\r\n", AppData.Buffer[3], @@ -986,7 +992,7 @@ static void SendTxData(void) else { } - + AppData.Buffer[5] = (uint8_t)(i-6); //size of appData AppData.BufferSize = i; if ((JoinLedTimer.IsRunning) && (LmHandlerJoinStatus() == LORAMAC_HANDLER_SET)) @@ -1353,6 +1359,7 @@ void OnStoreSTSCFGContextRequest(void) nvm_store_value[i++] = sts_mtmcode1; nvm_store_value[i++] = sts_mtmcode2; nvm_store_value[i++] = sts_cfg_nvm.version; + nvm_store_value[i++] = sts_hardware_ver; nvm_store_value[i++] = sts_cfg_nvm.periodicity_h; nvm_store_value[i++] = sts_cfg_nvm.periodicity_l; nvm_store_value[i++] = sts_cfg_nvm.unit; @@ -1433,6 +1440,7 @@ void STS_REBOOT_CONFIG_Init(void) sts_cfg_nvm.mtmcode1 = (uint8_t)nvm_stored_value[NVM_MTM1]; sts_cfg_nvm.mtmcode2 = (uint8_t)nvm_stored_value[NVM_MTM2]; sts_cfg_nvm.version = (uint8_t)nvm_stored_value[NVM_VER]; + sts_cfg_nvm.hardware_ver = (uint8_t)nvm_stored_value[NVM_HWV]; sts_cfg_nvm.periodicity_h = (uint8_t)(nvm_stored_value[NVM_PERIODICITY_H]); sts_cfg_nvm.periodicity_l = (uint8_t)(nvm_stored_value[NVM_PERIODICITY_L]); sts_cfg_nvm.unit = (uint8_t)(nvm_stored_value[NVM_UNIT]); @@ -1488,7 +1496,7 @@ void OnRestoreSTSCFGContextProcess(void) void STS_SENSOR_Function_Test_Process(void) { char outbuf[32] =""; uint8_t i=0, count=10; - int16_t self_test_result[9]={0,0,0, 0,0,0, 0,0,0}; + int16_t self_test_result[9]={0,0,0,0, 0,0,0, 0,0}; #ifdef YUNHORN_STS_M7_ENABLED STS_MOTION_SENSOR_Function_Test_Process(&self_test_result[0], count); @@ -1497,6 +1505,9 @@ void STS_SENSOR_Function_Test_Process(void) outbuf[i++] = (uint8_t) sts_mtmcode1; outbuf[i++] = (uint8_t) sts_mtmcode2; outbuf[i++] = (uint8_t) sts_version; + outbuf[i++] = (uint8_t) sts_hardware_ver; + outbuf[i++] = (uint8_t) (99*((GetBatteryLevel()/254)&0xff)); + outbuf[i++] = (uint8_t) (self_test_result[0]>>8)&0xff; outbuf[i++] = (uint8_t) (self_test_result[0])&0xff; @@ -1525,7 +1536,7 @@ void STS_SENSOR_Function_Test_Process(void) outbuf[i++] = (uint8_t) (self_test_result[8])&0xff; - STS_SENSOR_Upload_Message(LORAWAN_USER_APP_PORT, i, outbuf); + STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, i, outbuf); #endif diff --git a/LoRaWAN/App/lora_app.h b/LoRaWAN/App/lora_app.h index 76b924d..0cdb252 100644 --- a/LoRaWAN/App/lora_app.h +++ b/LoRaWAN/App/lora_app.h @@ -57,6 +57,7 @@ extern "C" { */ #define LORAWAN_USER_APP_PORT sts_senddataport #define LORAWAN_USER_APP_CTRL_PORT sts_appctrlport +#define LORAWAN_USER_APP_CTRL_REPLY_PORT sts_appctrl_reply_port /*! * LoRaWAN Switch class application port * @note do not use 224. It is reserved for certification diff --git a/MDK-ARM/STS_MM_M7.uvguix.lenovo b/MDK-ARM/STS_MM_M7.uvguix.lenovo index 0070cec..181a7e0 100644 --- a/MDK-ARM/STS_MM_M7.uvguix.lenovo +++ b/MDK-ARM/STS_MM_M7.uvguix.lenovo @@ -101,10 +101,10 @@ -1 - 118 - 1160 - 2568 - 1344 + 60 + 328 + 2707 + 1371 @@ -134,7 +134,7 @@ 16 - 8A000000A10000007B05000065010000 + FC020000AA000000330B00006E010000 @@ -150,7 +150,7 @@ 0 16 - 0300000066000000A501000011030000 + 0300000066000000A501000066030000 16 @@ -170,7 +170,7 @@ 0 16 - 0300000066000000A501000011030000 + 0300000066000000A501000066030000 16 @@ -190,7 +190,7 @@ 0 16 - 0000000001030000E3090000C5030000 + 0300000004030000E0090000AC030000 16 @@ -210,7 +210,7 @@ 0 16 - 0300000004030000E009000098030000 + 0300000004030000E0090000AC030000 16 @@ -230,7 +230,7 @@ 0 16 - 0300000004030000E009000098030000 + 0300000004030000E0090000AC030000 16 @@ -250,7 +250,7 @@ 0 16 - 0300000004030000E009000098030000 + 0300000004030000E0090000AC030000 16 @@ -270,7 +270,7 @@ 0 16 - 3E08000066000000E009000047010000 + 3E08000066000000E0090000E4020000 16 @@ -330,7 +330,7 @@ 0 16 - 0300000004030000E009000098030000 + 0300000004030000E0090000AC030000 16 @@ -350,7 +350,7 @@ 0 16 - 0300000004030000E009000098030000 + 0300000004030000E0090000AC030000 16 @@ -370,7 +370,7 @@ 0 16 - 0300000004030000E009000098030000 + 0300000004030000E0090000AC030000 16 @@ -390,7 +390,7 @@ 0 16 - 0300000004030000E009000098030000 + 0300000004030000E0090000AC030000 16 @@ -410,7 +410,7 @@ 0 16 - 0300000004030000E009000098030000 + 0300000004030000E0090000AC030000 16 @@ -430,7 +430,7 @@ 0 16 - 0300000004030000E009000098030000 + 0300000004030000E0090000AC030000 16 @@ -450,7 +450,7 @@ 0 16 - 0300000066000000A501000011030000 + 0300000066000000A501000066030000 16 @@ -470,7 +470,7 @@ 0 16 - 0300000066000000A501000011030000 + 0300000066000000A501000066030000 16 @@ -490,7 +490,7 @@ 0 16 - 00000000420300007005000090040000 + 00000000970300003B090000E5040000 16 @@ -530,7 +530,7 @@ 0 16 - 0300000045030000E0090000D9030000 + 030000009A03000086080000CC040000 16 @@ -550,7 +550,7 @@ 0 16 - AC01000063000000E309000013010000 + AF01000066000000E0090000FA000000 16 @@ -610,7 +610,7 @@ 0 16 - 3B08000063000000E3090000FD020000 + 3E08000066000000E0090000E4020000 16 @@ -630,7 +630,7 @@ 0 16 - 0000000001030000E3090000B1030000 + 0300000004030000E0090000AC030000 16 @@ -690,7 +690,7 @@ 0 16 - AC01000063000000E309000013010000 + AF01000066000000E0090000FA000000 16 @@ -730,7 +730,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -750,7 +750,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -770,7 +770,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -790,7 +790,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -810,7 +810,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -830,7 +830,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -850,7 +850,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -870,7 +870,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -890,7 +890,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -910,7 +910,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -930,7 +930,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -950,7 +950,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -970,7 +970,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -990,7 +990,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1010,7 +1010,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1030,7 +1030,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1050,7 +1050,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1070,7 +1070,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1090,7 +1090,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1110,7 +1110,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1130,7 +1130,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1150,7 +1150,7 @@ 0 16 - 0300000066000000A5010000AC030000 + 0300000066000000A501000011030000 16 @@ -1170,7 +1170,7 @@ 0 16 - 0000000042030000E3090000F2030000 + 030000009A03000086080000CC040000 16 @@ -1190,7 +1190,7 @@ 0 16 - 0300000045030000E0090000D9030000 + 030000009A03000086080000CC040000 16 @@ -1210,7 +1210,7 @@ 0 16 - 0300000004030000E009000098030000 + 0300000004030000E0090000AC030000 16 @@ -1230,7 +1230,7 @@ 0 16 - 0300000004030000E009000098030000 + 0300000004030000E0090000AC030000 16 @@ -1250,7 +1250,7 @@ 0 16 - 0300000045030000E0090000D9030000 + 030000009A03000086080000CC040000 16 @@ -1270,7 +1270,7 @@ 0 16 - 0300000045030000E0090000D9030000 + 030000009A03000086080000CC040000 16 @@ -1310,7 +1310,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1330,7 +1330,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1350,7 +1350,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1370,7 +1370,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1390,7 +1390,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1410,7 +1410,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1430,7 +1430,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1450,7 +1450,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1470,7 +1470,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1490,7 +1490,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1510,7 +1510,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1530,7 +1530,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1550,7 +1550,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1570,7 +1570,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1590,7 +1590,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1610,7 +1610,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1630,7 +1630,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1650,7 +1650,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1670,7 +1670,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1690,7 +1690,7 @@ 0 16 - 3E08000066000000E00900001C020000 + 3E08000066000000E0090000E4020000 16 @@ -1704,7 +1704,7 @@ 0 0 0 - 32767 + 966 0 8192 0 @@ -1730,7 +1730,7 @@ 0 16 - 000000009004000070050000A3040000 + 00000000E50400003B090000F8040000 16 @@ -1744,7 +1744,7 @@ 0 0 0 - 32767 + 476 0 8192 1 @@ -1764,7 +1764,7 @@ 0 0 0 - 32767 + 612 0 8192 2 @@ -1790,7 +1790,7 @@ 0 16 - 0300000004030000E009000098030000 + 0300000004030000E0090000AC030000 16 @@ -1799,14 +1799,14 @@ 3334 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFAC01000013010000E309000017010000000000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E6500200000000000008A000000A10000007B05000065010000AC0100004F000000E3090000130100000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF370800004F0000003B080000FD020000000000000200001004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000008A000000A100000032020000B20100003B0800004F000000E3090000FD02000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFA80100004F000000AC0100002A030000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000008A000000A100000032020000B2010000000000004F000000A80100002A0300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF00000000E9020000E3090000ED02000000000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000000000008A000000A100000032020000B201000000000000ED020000E3090000C503000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFF2040000ED020000F6040000C503000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000002A030000700500002E030000010000000100001004000000010000008CFCFFFFC2000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF01000077940000018000800000010000008A000000A10000007B05000065010000000000002E03000070050000900400000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF24536F757263652042726F77736572202D202A2A2A204E6F7420456E61626C6564202A2A2A00000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFAC01000013010000E309000017010000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000FC020000AA000000330B00006E010000AC0100004F000000E3090000130100000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF370800004F0000003B080000FD020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000008B090000AA000000330B0000580300003B0800004F000000E3090000FD02000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFA80100004F000000AC0100007F030000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000050010000AA000000F802000085030000000000004F000000A80100007F0300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF00000000E9020000E3090000ED02000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000000000005001000048030000330B00002004000000000000ED020000E3090000C503000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFF2040000ED020000F6040000C503000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000007F0300003B09000083030000010000000100001004000000010000008CFCFFFFC2000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF01000077940000018000800000010000005001000089030000D9090000EB04000000000000830300003B090000E50400000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF24536F757263652042726F77736572202D202A2A2A204E6F7420456E61626C6564202A2A2A00000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 3035 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000400020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000004000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000004000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000400000000000000000000000000000000000001000000010000009600000002002050000000000F4C4F524157414E5F4D41585F424154960000000000000014000F4C4F524157414E5F4D41585F424154057261775F78075644445F424154215354535F53454E534F525F4175746F5F526573706F6E6465725F50726F63657373215354535F4354524C5F434D445F4D454D535F54554E455F4D565F4144584C3334351A79756E686F726E5F7374735F6D6F74696F6E5F6164786C333435175354535F4D4F54494F4E5F53454E534F525F506F77657207436F6E6669726D275354535F4D4F54494F4E5F53454E534F525F46756E6374696F6E5F546573745F50726F636573731D4F6E526573746F7265535453434647436F6E74657874526571756573741D4F6E526573746F7265535453434647436F6E7465787450726F63657373174F6E526573746F7265436F6E74657874526571756573740F464C4153485F504147455F53495A4504504147450E464C41534853495A455F42415345184C4F524157414E5F4E564D5F424153455F41444452455353036E766D0C53746F7265436F6E74657874154F6E53746F7265436F6E7465787452657175657374154C6D48616E646C65724E766D4461746153746F72650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000004001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000000000000010000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65FF7F0000 + 3017 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000400020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000004000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000004000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000400000000000000000000000000000000000001000000010000009600000002002050000000000B7374735F6366675F6E766D960000000000000014000B7374735F6366675F6E766D154C4F524157414E5F555345525F4150505F504F5254086C6F72615F6170700F4C4F524157414E5F4D41585F424154057261775F78075644445F424154215354535F53454E534F525F4175746F5F526573706F6E6465725F50726F63657373215354535F4354524C5F434D445F4D454D535F54554E455F4D565F4144584C3334351A79756E686F726E5F7374735F6D6F74696F6E5F6164786C333435175354535F4D4F54494F4E5F53454E534F525F506F77657207436F6E6669726D275354535F4D4F54494F4E5F53454E534F525F46756E6374696F6E5F546573745F50726F636573731D4F6E526573746F7265535453434647436F6E74657874526571756573741D4F6E526573746F7265535453434647436F6E7465787450726F63657373174F6E526573746F7265436F6E74657874526571756573740F464C4153485F504147455F53495A4504504147450E464C41534853495A455F42415345184C4F524157414E5F4E564D5F424153455F41444452455353036E766D0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000004001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1822,7 +1822,7 @@ Build 982 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000B5354535F4D4D5F574C4535960000000000000001000B5354535F4D4D5F574C4535000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64FF7F0000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000B5354535F4D4D5F574C4535960000000000000001000B5354535F4D4D5F574C4535000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000000000000100000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000000000000100000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000000000000100000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F720100000000000000000000000100000001000000000000000000000001000000000000000000054465627567FF7F0000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 diff --git a/MDK-ARM/STS_MM_M7.uvoptx b/MDK-ARM/STS_MM_M7.uvoptx index 7915105..5d3072a 100644 --- a/MDK-ARM/STS_MM_M7.uvoptx +++ b/MDK-ARM/STS_MM_M7.uvoptx @@ -77,7 +77,7 @@ 0 1 - 0 + 18 0 1 @@ -433,7 +433,7 @@ Application/User/LoRaWAN/App - 0 + 1 0 0 0