From a4646cce18d7442301d9506dea8e80cf3a187934 Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Fri, 21 Jun 2024 12:00:44 +0800 Subject: [PATCH] -----good STS WS at 1kg ---- --- Core/Inc/sts_weight_scale.h | 66 +- Core/Src/sts_weight_scale.c | 80 +- STM32CubeIDE/.project | 10 +- STM32CubeIDE/.settings/language.settings.xml | 4 +- .../.settings/stm32cubeide.project.prefs | 4 +- .../Release/Application/User/Core/subdir.mk | 18 +- ...3.bin => STS_W1_WEIGHT_SCALE_20240621.bin} | Bin 255448 -> 255448 bytes ...3.hex => STS_W1_WEIGHT_SCALE_20240621.hex} | 766 +++++++++--------- STM32CubeIDE/Release/objects.list | 2 +- STM32CubeIDE/STM32WL55JCIX_FLASH.ld | 10 +- 10 files changed, 476 insertions(+), 484 deletions(-) rename STM32CubeIDE/Release/{WL55JC_AS923.bin => STS_W1_WEIGHT_SCALE_20240621.bin} (96%) rename STM32CubeIDE/Release/{WL55JC_AS923.hex => STS_W1_WEIGHT_SCALE_20240621.hex} (90%) diff --git a/Core/Inc/sts_weight_scale.h b/Core/Inc/sts_weight_scale.h index e606992..1b475d0 100644 --- a/Core/Inc/sts_weight_scale.h +++ b/Core/Inc/sts_weight_scale.h @@ -1,51 +1,37 @@ -/* - * sts_weight_scale.h - * - * Created on: Jun 19, 2024 - * Author: lenovo - */ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file yunhorn_sts_weight_scale.h * + * @author Yunhorn (r) Technology Limited Application Team * + * @brief Yunhorn (r) SmarToilets (r) Product configuration file. * + ****************************************************************************** + * @attention + * + * Copyright (c) 2024 Yunhorn Technology Limited. + * Copyright (c) 2024 Shenzhen Yunhorn Technology Co., Ltd. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ -#ifndef APPLICATION_USER_CORE_STS_WEIGHT_SCALE_H_ -#define APPLICATION_USER_CORE_STS_WEIGHT_SCALE_H_ + +#ifndef YUNHORN_STS_WEIGHT_SCALE_H_ +#define YUNHORN_STS_WEIGHT_SCALE_H_ #include "main.h" #include "sys_app.h" -//#define HX711_SCK PBout(0)// PB0 -//#define HX711_DOUT PBin(1)// PB1 -//#define PBout(n) BIT_ADDR(GPIOA_ODR_Addr,n) //输出 -//#define PBin(n) BIT_ADDR(GPIOA_IDR_Addr,n) //输入 - -//#define HX711_SCK(x) HAL_GPIO_WritePin(HX711_SCK_PORT, HX711_SCK_PIN, GPIO_PIN_RESET);(0)// PB0 -//#define HX711_DOUT(x) HAL_GPIO_ReadPin(HX711_DOUT_PORT, HX711_DOUT_PIN) - - int sts_weight_scale(void); void HX711_Init(void); void Init_HX711pin(void); uint32_t HX711_Read(void); -void Get_Maopi(void); -void Get_Weight(void); -#if 0 +void Get_GrossWeight(void); +void Get_NetWeight(void); -#endif - -//V1.2修改说明 -//修正了中断中调用出现死循环的错误 -//防止延时不准确,采用do while结构! - -//V1.3修改说明 -//增加了对UCOSII延时的支持. -//如果使用ucosII,delay_init会自动设置SYSTICK的值,使之与ucos的TICKS_PER_SEC对应. -//delay_ms和delay_us也进行了针对ucos的改造. -//delay_us可以在ucos下使用,而且准确度很高,更重要的是没有占用额外的定时器. -//delay_ms在ucos下,可以当成OSTimeDly来用,在未启动ucos时,它采用delay_us实现,从而准确延时 -//可以用来初始化外设,在启动了ucos之后delay_ms根据延时的长短,选择OSTimeDly实现或者delay_us实现. - -//V1.4修改说明 20110929 -//修改了使用ucos,但是ucos未启动的时候,delay_ms中中断无法响应的bug. -//V1.5修改说明 20120902 -//在delay_us加入ucos上锁，防止由于ucos打断delay_us的执行，可能导致的延时不准。 -////////////////////////////////////////////////////////////////////////////////// void delay_init(void); void delay_ms(uint16_t nms); void delay_us(uint32_t nus); @@ -54,4 +40,4 @@ void delay_us(uint32_t nus); -#endif /* APPLICATION_USER_CORE_STS_WEIGHT_SCALE_H_ */ +#endif /* YUNHORN_STS_WEIGHT_SCALE_H_ */ diff --git a/Core/Src/sts_weight_scale.c b/Core/Src/sts_weight_scale.c index 1e67b0f..1028d8a 100644 --- a/Core/Src/sts_weight_scale.c +++ b/Core/Src/sts_weight_scale.c @@ -1,36 +1,46 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file yunhorn_sts_weight_scale.c * + * @author Yunhorn (r) Technology Limited Application Team * + * @brief Yunhorn (r) SmarToilets (r) Product configuration file. * + ****************************************************************************** + * @attention + * + * Copyright (c) 2024 Yunhorn Technology Limited. + * Copyright (c) 2024 Shenzhen Yunhorn Technology Co., Ltd. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ #include "sts_weight_scale.h" uint32_t HX711_Buffer; -uint32_t Weight_Maopi; -int32_t Weight_Shiwu; +uint32_t gross_weight; +int32_t net_weight; uint8_t Flag_Error; int sts_weight_scale(void) { - //Init_HX711pin(); - - //delay_init(); HX711_Init(); - - //NVIC_Configuration(); //设置NVIC中断分组2:2位抢占优先级，2位响应优先级 - //uart_init(9600); //串口初始化为9600 - - Get_Maopi(); //称毛皮重量 + Get_GrossWeight(); HAL_Delay(2000); - Get_Maopi(); //重新获取毛皮重量 + Get_GrossWeight(); while(1) { - Get_Weight(); + Get_NetWeight(); - //printf("净重量 = %d g\r\n",Weight_Shiwu); //打印 + APP_LOG(TS_OFF, VLEVEL_M, "Net Weight = %d g \r\n", net_weight); - APP_LOG(TS_OFF, VLEVEL_M, "Net Weight = %d g \r\n", Weight_Shiwu); - - //delay_ms(1000); HAL_Delay(2000); @@ -50,7 +60,7 @@ uint8_t Flag_Error = 0; //如果测试出来的重量偏小时，减小改数值。 //该值可以为小数 //#define GapValue 106.5 -#define GapValue 909.5 +#define GapValue 909.5 // for 1kg bar void HX711_Init(void) { @@ -72,10 +82,6 @@ void HX711_Init(void) HAL_GPIO_WritePin(HX711_SCK_PORT, HX711_SCK_PIN, GPIO_PIN_RESET); - - - - } //**************************************************** @@ -83,8 +89,8 @@ void HX711_Init(void) //**************************************************** uint32_t HX711_Read(void) //增益128 { - unsigned long count; - unsigned char i; + uint32_t count; + uint8_t i; //HX711_DOUT=1; HAL_GPIO_WritePin(HX711_DOUT_PORT, HX711_DOUT_PIN, GPIO_PIN_SET); @@ -93,7 +99,7 @@ uint32_t HX711_Read(void) //增益128 HAL_GPIO_WritePin(HX711_SCK_PORT, HX711_SCK_PIN, GPIO_PIN_RESET); count=0; - uint32_t dout=0; + //while(HX711_DOUT); while(HAL_GPIO_ReadPin(HX711_DOUT_PORT, HX711_DOUT_PIN)==GPIO_PIN_SET); @@ -109,9 +115,9 @@ uint32_t HX711_Read(void) //增益128 HAL_GPIO_WritePin(HX711_SCK_PORT, HX711_SCK_PIN, GPIO_PIN_RESET); //if(HX711_DOUT) - dout = HAL_GPIO_ReadPin(HX711_DOUT_PORT, HX711_DOUT_PIN); - if (dout==GPIO_PIN_SET) + if (HAL_GPIO_ReadPin(HX711_DOUT_PORT, HX711_DOUT_PIN)==GPIO_PIN_SET) count++; + delay_us(1); } //HX711_SCK=1; @@ -127,31 +133,31 @@ uint32_t HX711_Read(void) //增益128 } //**************************************************** -//获取毛皮重量 +//Get Gross Weight //**************************************************** -void Get_Maopi(void) +void Get_GrossWeight(void) { - Weight_Maopi = HX711_Read(); - APP_LOG(TS_OFF, VLEVEL_M, "\r\n ##### Mao Pi =%d <<<<<< \r\n",Weight_Maopi); + gross_weight = HX711_Read(); + APP_LOG(TS_OFF, VLEVEL_M, "\r\n ##### Gross Weight =%d <<<<<< \r\n",gross_weight); } //**************************************************** -//称重 +//Weight Scale //**************************************************** -void Get_Weight(void) +void Get_NetWeight(void) { HX711_Buffer = HX711_Read(); - if(HX711_Buffer > Weight_Maopi) + if(HX711_Buffer > gross_weight) { - Weight_Shiwu = HX711_Buffer; - Weight_Shiwu = Weight_Shiwu - Weight_Maopi; //获取实物的AD采样数值。 + net_weight = HX711_Buffer; + net_weight = net_weight - gross_weight; //获取实物的AD采样数值。 - Weight_Shiwu = (int32_t)((float)Weight_Shiwu/GapValue); //计算实物的实际重量 + net_weight = (int32_t)((float)net_weight/GapValue); //计算实物的实际重量 //因为不同的传感器特性曲线不一样，因此，每一个传感器需要矫正这里的GapValue这个除数。 //当发现测试出来的重量偏大时，增加该数值。 - APP_LOG(TS_OFF, VLEVEL_M, "\r\n ##### Weight_Shiwu =%d <<<<<< \r\n",Weight_Shiwu);//如果测试出来的重量偏小时，减小改数值。 + APP_LOG(TS_OFF, VLEVEL_M, "\r\n ##### Net Weight =%d \r\n", net_weight);//如果测试出来的重量偏小时，减小改数值。 } } diff --git a/STM32CubeIDE/.project b/STM32CubeIDE/.project index 4ee61ce..236cb71 100644 --- a/STM32CubeIDE/.project +++ b/STM32CubeIDE/.project @@ -427,11 +427,6 @@ 1 copy_PARENT/Core/Src/stm32wlxx_it.c - - Application/User/Core/sts_weight_scale.c - 1 - copy_PARENT/Core/Src/sts_weight_scale.c - Application/User/Core/subghz.c 1 @@ -467,6 +462,11 @@ 1 copy_PARENT/Core/Src/usart_if.c + + Application/User/Core/yunhorn_sts_weight_scale.c + 1 + copy_PARENT/Core/Src/sts_weight_scale.c + Drivers/BSP/STM32WLxx_Nucleo/stm32wlxx_nucleo.c 1 diff --git a/STM32CubeIDE/.settings/language.settings.xml b/STM32CubeIDE/.settings/language.settings.xml index 8480e85..816e149 100644 --- a/STM32CubeIDE/.settings/language.settings.xml +++ b/STM32CubeIDE/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/STM32CubeIDE/.settings/stm32cubeide.project.prefs b/STM32CubeIDE/.settings/stm32cubeide.project.prefs index f5b2341..261dff3 100644 --- a/STM32CubeIDE/.settings/stm32cubeide.project.prefs +++ b/STM32CubeIDE/.settings/stm32cubeide.project.prefs @@ -1,4 +1,4 @@ -2F62501ED4689FB349E356AB974DBE57=95112E708683D54F6AC1ADC68D917C29 -8DF89ED150041C4CBC7CB9A9CAA90856=95112E708683D54F6AC1ADC68D917C29 +2F62501ED4689FB349E356AB974DBE57=5C935C4C17B31F3FCDEC56E445F41B57 +8DF89ED150041C4CBC7CB9A9CAA90856=5C935C4C17B31F3FCDEC56E445F41B57 DC22A860405A8BF2F2C095E5B6529F12=74CD6EB106FB50B767E4FE71225C7638 eclipse.preferences.version=1 diff --git a/STM32CubeIDE/Release/Application/User/Core/subdir.mk b/STM32CubeIDE/Release/Application/User/Core/subdir.mk index 363af18..ca2980e 100644 --- a/STM32CubeIDE/Release/Application/User/Core/subdir.mk +++ b/STM32CubeIDE/Release/Application/User/Core/subdir.mk @@ -15,7 +15,6 @@ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_N D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_55JC_AS923/Core/Src/stm32_lpm_if.c \ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_55JC_AS923/Core/Src/stm32wlxx_hal_msp.c \ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_55JC_AS923/Core/Src/stm32wlxx_it.c \ -D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_55JC_AS923/Core/Src/sts_weight_scale.c \ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_55JC_AS923/Core/Src/subghz.c \ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_55JC_AS923/Core/Src/sys_app.c \ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_55JC_AS923/Core/Src/sys_debug.c \ @@ -24,7 +23,8 @@ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_N ../Application/User/Core/sysmem.c \ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_55JC_AS923/Core/Src/timer_if.c \ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_55JC_AS923/Core/Src/usart.c \ -D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_55JC_AS923/Core/Src/usart_if.c +D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_55JC_AS923/Core/Src/usart_if.c \ +D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_55JC_AS923/Core/Src/sts_weight_scale.c OBJS += \ ./Application/User/Core/adc.o \ @@ -37,7 +37,6 @@ OBJS += \ ./Application/User/Core/stm32_lpm_if.o \ ./Application/User/Core/stm32wlxx_hal_msp.o \ ./Application/User/Core/stm32wlxx_it.o \ -./Application/User/Core/sts_weight_scale.o \ ./Application/User/Core/subghz.o \ ./Application/User/Core/sys_app.o \ ./Application/User/Core/sys_debug.o \ @@ -46,7 +45,8 @@ OBJS += \ ./Application/User/Core/sysmem.o \ ./Application/User/Core/timer_if.o \ ./Application/User/Core/usart.o \ -./Application/User/Core/usart_if.o +./Application/User/Core/usart_if.o \ +./Application/User/Core/sts_weight_scale.o C_DEPS += \ ./Application/User/Core/adc.d \ @@ -59,7 +59,6 @@ C_DEPS += \ ./Application/User/Core/stm32_lpm_if.d \ ./Application/User/Core/stm32wlxx_hal_msp.d \ ./Application/User/Core/stm32wlxx_it.d \ -./Application/User/Core/sts_weight_scale.d \ ./Application/User/Core/subghz.d \ ./Application/User/Core/sys_app.d \ ./Application/User/Core/sys_debug.d \ @@ -68,7 +67,8 @@ C_DEPS += \ ./Application/User/Core/sysmem.d \ ./Application/User/Core/timer_if.d \ ./Application/User/Core/usart.d \ -./Application/User/Core/usart_if.d +./Application/User/Core/usart_if.d \ +./Application/User/Core/yunhorn_sts_weight_scale.d # Each subdirectory must supply rules for building sources it contributes @@ -92,8 +92,6 @@ Application/User/Core/stm32wlxx_hal_msp.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLE arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DYUNHORN_STS_RANDOM -DSTS_WS -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" Application/User/Core/stm32wlxx_it.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_55JC_AS923/Core/Src/stm32wlxx_it.c Application/User/Core/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DYUNHORN_STS_RANDOM -DSTS_WS -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" -Application/User/Core/sts_weight_scale.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_55JC_AS923/Core/Src/sts_weight_scale.c Application/User/Core/subdir.mk - arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DYUNHORN_STS_RANDOM -DSTS_WS -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" Application/User/Core/subghz.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_55JC_AS923/Core/Src/subghz.c Application/User/Core/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DYUNHORN_STS_RANDOM -DSTS_WS -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" Application/User/Core/sys_app.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_55JC_AS923/Core/Src/sys_app.c Application/User/Core/subdir.mk @@ -110,11 +108,13 @@ Application/User/Core/usart.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/App arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DYUNHORN_STS_RANDOM -DSTS_WS -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" Application/User/Core/usart_if.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_55JC_AS923/Core/Src/usart_if.c Application/User/Core/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DYUNHORN_STS_RANDOM -DSTS_WS -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" +Application/User/Core/sts_weight_scale.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/LoRaWAN_End_Node_55JC_AS923/Core/Src/sts_weight_scale.c Application/User/Core/subdir.mk + arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DYUNHORN_STS_RANDOM -DSTS_WS -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" clean: clean-Application-2f-User-2f-Core clean-Application-2f-User-2f-Core: - -$(RM) ./Application/User/Core/adc.cyclo ./Application/User/Core/adc.d ./Application/User/Core/adc.o ./Application/User/Core/adc.su ./Application/User/Core/adc_if.cyclo ./Application/User/Core/adc_if.d ./Application/User/Core/adc_if.o ./Application/User/Core/adc_if.su ./Application/User/Core/dma.cyclo ./Application/User/Core/dma.d ./Application/User/Core/dma.o ./Application/User/Core/dma.su ./Application/User/Core/flash_if.cyclo ./Application/User/Core/flash_if.d ./Application/User/Core/flash_if.o ./Application/User/Core/flash_if.su ./Application/User/Core/gpio.cyclo ./Application/User/Core/gpio.d ./Application/User/Core/gpio.o ./Application/User/Core/gpio.su ./Application/User/Core/main.cyclo ./Application/User/Core/main.d ./Application/User/Core/main.o ./Application/User/Core/main.su ./Application/User/Core/rtc.cyclo ./Application/User/Core/rtc.d ./Application/User/Core/rtc.o ./Application/User/Core/rtc.su ./Application/User/Core/stm32_lpm_if.cyclo ./Application/User/Core/stm32_lpm_if.d ./Application/User/Core/stm32_lpm_if.o ./Application/User/Core/stm32_lpm_if.su ./Application/User/Core/stm32wlxx_hal_msp.cyclo ./Application/User/Core/stm32wlxx_hal_msp.d ./Application/User/Core/stm32wlxx_hal_msp.o ./Application/User/Core/stm32wlxx_hal_msp.su ./Application/User/Core/stm32wlxx_it.cyclo ./Application/User/Core/stm32wlxx_it.d ./Application/User/Core/stm32wlxx_it.o ./Application/User/Core/stm32wlxx_it.su ./Application/User/Core/sts_weight_scale.cyclo ./Application/User/Core/sts_weight_scale.d ./Application/User/Core/sts_weight_scale.o ./Application/User/Core/sts_weight_scale.su ./Application/User/Core/subghz.cyclo ./Application/User/Core/subghz.d ./Application/User/Core/subghz.o ./Application/User/Core/subghz.su ./Application/User/Core/sys_app.cyclo ./Application/User/Core/sys_app.d ./Application/User/Core/sys_app.o ./Application/User/Core/sys_app.su ./Application/User/Core/sys_debug.cyclo ./Application/User/Core/sys_debug.d ./Application/User/Core/sys_debug.o ./Application/User/Core/sys_debug.su ./Application/User/Core/sys_sensors.cyclo ./Application/User/Core/sys_sensors.d ./Application/User/Core/sys_sensors.o ./Application/User/Core/sys_sensors.su ./Application/User/Core/syscalls.cyclo ./Application/User/Core/syscalls.d ./Application/User/Core/syscalls.o ./Application/User/Core/syscalls.su ./Application/User/Core/sysmem.cyclo ./Application/User/Core/sysmem.d ./Application/User/Core/sysmem.o ./Application/User/Core/sysmem.su ./Application/User/Core/timer_if.cyclo ./Application/User/Core/timer_if.d ./Application/User/Core/timer_if.o ./Application/User/Core/timer_if.su ./Application/User/Core/usart.cyclo ./Application/User/Core/usart.d ./Application/User/Core/usart.o ./Application/User/Core/usart.su ./Application/User/Core/usart_if.cyclo ./Application/User/Core/usart_if.d ./Application/User/Core/usart_if.o ./Application/User/Core/usart_if.su + -$(RM) ./Application/User/Core/adc.cyclo ./Application/User/Core/adc.d ./Application/User/Core/adc.o ./Application/User/Core/adc.su ./Application/User/Core/adc_if.cyclo ./Application/User/Core/adc_if.d ./Application/User/Core/adc_if.o ./Application/User/Core/adc_if.su ./Application/User/Core/dma.cyclo ./Application/User/Core/dma.d ./Application/User/Core/dma.o ./Application/User/Core/dma.su ./Application/User/Core/flash_if.cyclo ./Application/User/Core/flash_if.d ./Application/User/Core/flash_if.o ./Application/User/Core/flash_if.su ./Application/User/Core/gpio.cyclo ./Application/User/Core/gpio.d ./Application/User/Core/gpio.o ./Application/User/Core/gpio.su ./Application/User/Core/main.cyclo ./Application/User/Core/main.d ./Application/User/Core/main.o ./Application/User/Core/main.su ./Application/User/Core/rtc.cyclo ./Application/User/Core/rtc.d ./Application/User/Core/rtc.o ./Application/User/Core/rtc.su ./Application/User/Core/stm32_lpm_if.cyclo ./Application/User/Core/stm32_lpm_if.d ./Application/User/Core/stm32_lpm_if.o ./Application/User/Core/stm32_lpm_if.su ./Application/User/Core/stm32wlxx_hal_msp.cyclo ./Application/User/Core/stm32wlxx_hal_msp.d ./Application/User/Core/stm32wlxx_hal_msp.o ./Application/User/Core/stm32wlxx_hal_msp.su ./Application/User/Core/stm32wlxx_it.cyclo ./Application/User/Core/stm32wlxx_it.d ./Application/User/Core/stm32wlxx_it.o ./Application/User/Core/stm32wlxx_it.su ./Application/User/Core/sts_weight_scale.cyclo ./Application/User/Core/sts_weight_scale.o ./Application/User/Core/sts_weight_scale.su ./Application/User/Core/subghz.cyclo ./Application/User/Core/subghz.d ./Application/User/Core/subghz.o ./Application/User/Core/subghz.su ./Application/User/Core/sys_app.cyclo ./Application/User/Core/sys_app.d ./Application/User/Core/sys_app.o ./Application/User/Core/sys_app.su ./Application/User/Core/sys_debug.cyclo ./Application/User/Core/sys_debug.d ./Application/User/Core/sys_debug.o ./Application/User/Core/sys_debug.su ./Application/User/Core/sys_sensors.cyclo ./Application/User/Core/sys_sensors.d ./Application/User/Core/sys_sensors.o ./Application/User/Core/sys_sensors.su ./Application/User/Core/syscalls.cyclo ./Application/User/Core/syscalls.d ./Application/User/Core/syscalls.o ./Application/User/Core/syscalls.su ./Application/User/Core/sysmem.cyclo ./Application/User/Core/sysmem.d ./Application/User/Core/sysmem.o ./Application/User/Core/sysmem.su ./Application/User/Core/timer_if.cyclo ./Application/User/Core/timer_if.d ./Application/User/Core/timer_if.o ./Application/User/Core/timer_if.su ./Application/User/Core/usart.cyclo ./Application/User/Core/usart.d ./Application/User/Core/usart.o ./Application/User/Core/usart.su ./Application/User/Core/usart_if.cyclo ./Application/User/Core/usart_if.d ./Application/User/Core/usart_if.o ./Application/User/Core/usart_if.su ./Application/User/Core/yunhorn_sts_weight_scale.d .PHONY: clean-Application-2f-User-2f-Core diff --git a/STM32CubeIDE/Release/WL55JC_AS923.bin b/STM32CubeIDE/Release/STS_W1_WEIGHT_SCALE_20240621.bin similarity index 96% rename from STM32CubeIDE/Release/WL55JC_AS923.bin rename to STM32CubeIDE/Release/STS_W1_WEIGHT_SCALE_20240621.bin index 0baa1fd5a8f70b7c99c5089962ab3f9d0e7a8487..987d05199379ee31f48605d8fc102caad03b4584 100644 GIT binary patch delta 3160 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 delta 3174 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 BSmyu$ diff --git a/STM32CubeIDE/Release/WL55JC_AS923.hex b/STM32CubeIDE/Release/STS_W1_WEIGHT_SCALE_20240621.hex similarity index 90% rename from STM32CubeIDE/Release/WL55JC_AS923.hex rename to STM32CubeIDE/Release/STS_W1_WEIGHT_SCALE_20240621.hex index 45e67a1..35e26a3 100644 --- a/STM32CubeIDE/Release/WL55JC_AS923.hex +++ b/STM32CubeIDE/Release/STS_W1_WEIGHT_SCALE_20240621.hex @@ -406,7 +406,7 @@ :10193800022101A802F0D4FF08B172B6FEE71BB07D :101948005DF804FB08B501F08FFAFFF7B5FFFFF764 :1019580037FF00F09DFD0022044B114602200CF0D9 -:1019680057FF00F0B5F900F09AFDFCE759F40008BC +:1019680057FF00F075FD00F09AFDFCE759F40008F8 :1019780072B6FEE700B58DB02C22002101A80DF04B :1019880079FC1748174B03601F2383604FF0804290 :101998000023C0E90433C0E9072383614FF480734F @@ -425,172 +425,172 @@ :101A6800002800407047000008B501F013FA044B45 :101A78000120C3F88800BDE8084002F077BB00BF2A :101A88000004005801F00DBA08B501F00AFABDE8E3 -:101A9800084000F0BDBC08B501F0FCF9BDE80840FD +:101A9800084000F0BDBB08B501F0FCF9BDE80840FE :101AA8000121002002F012BB70477047FEE7FEE7F5 :101AB800FEE7FEE7FEE77047704770477047000093 :101AC800014803F01FBB00BF8C010020012002F079 :101AD800E9BA022002F0E6BA014802F051B800BFA4 -:101AE800E8010020402002F0DDBA0000014803F0C0 -:101AF800CBBE00BF48020020014803F037B900BF41 -:101B08008C010020014803F026BD00BFD001002051 -:101B1800F0B587B000244FF0B0430594DA6C42F07A -:101B28000102DA64DB6C03F001030125009320262F -:101B3800032701A94FF09040009B0395CDE901656B -:101B4800049702F07BF9402301A94FF09040CDE9BA -:101B58000134CDE9035702F071F9224631464FF0BE -:101B6800904002F091FA07B0F0BD00000D4B0E4A0C -:101B78001B68B3FBF2F3DBB258434FF0E0230022BB -:101B880058619A611A6942F001021A611A6902F0F1 -:101B98000112012AFAD01A6922F001021A61002200 -:101BA8009A6170477400002000127A00012238B54B -:101BB80040214FF0904002F067FA0120FFF7D6FF6E -:101BC800202100224FF0904002F05EFA40214FF0B1 -:101BD800904002F053FA0128F8D018240025012279 -:101BE80020214FF0904002F04FFA0120FFF7BEFF8E -:101BF800202100224FF0904002F046FA40214FF099 -:101C0800904002F03BFA6D00012804F1FF344FF0D8 -:101C1800010008BF0135FFF7A9FF14F0FF04DED16A -:101C2800012220214FF0904002F02EFA0120FFF708 -:101C38009DFF202122464FF0904002F025FA85F4BE -:101C4800000038BD07B5FFF7B1FF064B002218604A -:101C580011460090044B02200CF0DAFD03B05DF849 -:101C680004FB00BFC80100208CF40008000000003D -:101C780007B5FFF79BFF124B1860124B1B68984281 -:101C880014D9C01AFEF7B4FFFEF7DEFB0AA3D3E9A6 -:101C98000023FEF75BFDFEF7C9FE0B4B0022186020 -:101CA80011460090094B02200CF0B2FD03B05DF81C -:101CB80004FB00BFAFF3008000000000006C8C4004 -:101CC800CC010020C8010020C4010020ADF40008A8 -:101CD80007B5FFF71DFFFFF7B5FF4FF4FA6000F0F7 -:101CE80015F9FFF7AFFF084D084CFFF7C1FF2B6848 -:101CF800009300222346114602200CF089FD4FF480 -:101D0800FA6000F003F9F0E7C4010020D4F40008F9 -:101D1800054808B50823036003F03AFA18B1BDE88E -:101D28000840FFF725BE08BDD00100204FF0B043A2 -:101D380007B55A6E42F001025A665B6E002203F044 -:101D48000103019311463220019B01F011FD32205D -:101D580003B05DF804EB01F03DBD00000CB407B51D -:101D6800054A05AB102101930DF062F903B05DF847 -:101D780004EB02B0704700BFEAF4000830B585B044 -:101D8800044602A80D460CF07FFFBDF90C30064A48 -:101D980000931021029B2046FFF7E0FF2046FEF744 -:101DA800E7F9288005B030BDEAF400084FF0B042EA -:101DB80010B5936823F4004393600CF0EDFF0E4BCD -:101DC80001241C7000F0A8F80CF0B8FC0B480CF0CB -:101DD800CFFC0B4B4FF400421A6102200CF0CEFCF2 -:101DE800FFF7EAFA00F0FEF80CF0C2FD21462046A3 -:101DF800BDE810400CF0DCBDDC010020851D0008AA -:101E0800004000580CF0EABD08B5FFF7DDFA40F6CF -:101E1800B83398420CD8B0F5E16F0BD3FE23A0F588 -:101E2800E16058434FF49663B0FBF3F0C0B208BDCD -:101E3800FE20FCE70020FAE77FB5684600F0B6F818 -:101E48000198FFF779F800B207B05DF804FB0000CD -:101E5800194A38B5D2F88035591C044619D101F011 -:101E680027F8054601F030F8054401F027F82B0E55 -:101E7800E3712B0CA3712B0A6371030EE370C0F39B -:101E88000742C0F307232571C0B2A27063702070A7 -:101E980038BD190AC3718171190C1B0E4171037188 -:101EA800D2F88435C370D2F88405C0F30722C0F392 -:101EB8000743000EE9E700BF0070FF1F38B5094B64 -:101EC800D3F8803503600133054609D100F0F0FFEF -:101ED800044600F0F3FF444000F0F6FF44402C6055 -:101EE80038BD00BF0070FF1F012102200CF04ABD61 -:101EF800002102200CF046BD00207047024B1878E4 -:101F080008B100F0A7B87047DC01002082B001904A -:101F1800019802B000F03AB9F0B5224A224CD2F842 -:101F2800903043F4804389B0C2F8903000F0D2FF7B -:101F380000F0D8FF00F0DEFF01230493032306938B -:101F480000254FF0B04305950795DA6C42F0020280 -:101F5800DA64DA6C02F002020292029ADA6C42F057 -:101F68000202DA64DB6C03F0020301934FF480573A -:101F780003A92046019B03974FF4005601F05EFF2A -:101F880003A92046039601F059FF2A463946204600 -:101F980002F07AF82A463146204602F075F809B070 -:101FA800F0BD00BF000800580004004810B5044602 -:101FB800FFF724FA074BA36040F30F20FEF718FE43 -:101FC800054B064A2360064B6060C4E903230020E2 -:101FD80010BD00BF0000484200007A440D093E00D1 -:101FE800AB03050000207047014B1868704700BF1D -:101FF800E00100200320704708B501464FF47A72CB -:1020080000238002890DFEF7DDFF08BD4FF47A73C7 -:10201800A0FB0303800A40EA83507047034B98688B -:102028009A689042FBD1C043704700BF0028004027 -:1020380008B5FFF7F3FF014B186008BDE001002069 -:1020480008B5FFF7EBFF024B1B68C01A08BD00BFBD -:10205800E0010020024B187808B1FFF7DFBF704796 -:10206800E401002010B5074B074C0122DA654FF454 -:102078008071204602F040FE4FF0FF3323630020BA -:1020880010BD00BF002800408C010020024600213E -:10209800014803F048B800BF8C0100200246012126 -:1020A800014803F040B800BF8C01002010B58CB087 -:1020B8002C220021044601A80DF0DCF8FFF7D2FF1E -:1020C8000C4B0D481B681C440023089306934FF0E3 -:1020D8000053E443079301224FF4807301A902944B -:1020E8000B9302F01DFF08B1FFF742FC00200CB073 -:1020F80010BD00BFE00100208C01002038B5054666 -:10210800FFF78CFF02210446074803F013F8C4F3D5 -:1021180009024FF47A71A2FB0121920AA30A2A80CC -:1021280043EA805038BD00BF8C01002001480021DF -:1021380003F000B88C0100200148012102F0FABF29 -:102148008C010020F8B50F4D2E78CEB90E4C4FF00B -:10215800FF372763FFF70EFCFFF784FF4FF480710A -:10216800204602F0C9FD2046276302F087FF324669 -:102178002046022102F0D7FFFFF75AFF01232B70F8 -:102188000020F8BDE40100208C010020014610B5B4 -:102198004FF47A7200238002890DFEF713FF01467F -:1021A800FFF73CFF0446FFF739FF031B8B4200D3C0 -:1021B80010BD00BFF7E70CF0F7BE000010B5064CE5 -:1021C8000221204602F0B6FF0221421C2046BDE84B -:1021D800104002F0A8BF00BF8C0100201648174A23 -:1021E80008B54FF4E133C0E9002300230C22C0E90D -:1021F8000233C0E90523C0E90733C0E909330361A5 -:1022080004F027F908B1FFF7B3FB0B48002104F0ED -:1022180098FA08B1FFF7ACFB0748002104F0B1FABF -:1022280008B1FFF7A5FB044804F06BFA18B1BDE844 -:102238000840FFF79DBB08BD48020020004400404D -:1022480070B596B006461422002103A80DF012F8C6 -:102258003822002108A80DF00DF832682B4B9A425D -:1022680051D10223089308A8294B0A9302F076FC5F -:1022780008B1FFF77DFB4FF0B04300259A6D254C60 -:1022880042F400329A659A6D02F400320292029A80 -:10229800DA6C42F00102DA64DB6C03F001030193AB -:1022A800019B0C220223CDE903230323CDE9055327 -:1022B80003A907234FF09040079301F0BFFD16498B -:1022C80025621423C4E900131023C4E9023520460B -:1022D8008023C4E90435C4E9065501F0DBFA08B1E6 -:1022E800FFF746FB0B48102101F0A0FC08B1FFF7EF -:1022F8003FFB2520F46700220221A66201F038FA8C -:10230800252001F067FA16B070BD00BF00440040F8 -:1023180004000C00E80100205800024002680C4B41 -:102328009A4210B5044612D14FF0B0420C21936D79 -:1023380023F4003393654FF0904001F02BFEE06FDB -:1023480001F01AFBBDE81040252001F051BA10BD7C -:102358000044004008B50A460146024803F0F8F96F -:10236800002008BD4802002013B5114B114C18601D -:102378004FF40013009302AB13E90600204604F063 -:1023880064F92368DA69D103FCD4DA695202FCD50E -:102398009A68084842F480029A6004F09CF9064959 -:1023A8000448012204F00AF9002002B010BD00BF61 -:1023B800DC02002048020020E402002008B5074B98 -:1023C8001860FFF759F8FFF709FF054AD2F880307F -:1023D80043F00063C2F88030002008BDE00200200E -:1023E8000008005808B54FF0B04308489A6B42F40B -:1023F80000329A639A6B22F400329A63FFF78EFFD9 -:102408000F2001F0F5F9002008BD00BF48020020A8 -:1024180008B5074804F01DF808B1FFF7A9FA054800 -:1024280001F038FA18B1BDE80840FFF7A1BA08BDB5 -:1024380048020020E80100200268044B9A4203D1B8 -:10244800034B00201B681847704700BF004400403A -:10245800E002002002680B4B9A4210B504460FD1E7 -:10246800094B1B682BB1D0F8902012B907480121FD -:10247800984720460549BDE81040012204F09EB85F -:1024880010BD00BF00440040DC020020E402002030 -:1024980008B5FFF78BFCBDE8084000F041BB4FF0E2 +:101AE800DC010020402002F0DDBA0000014803F0CC +:101AF800CBBE00BF3C020020014803F037B900BF4D +:101B08008C010020014803F026BD00BFC40100205D +:101B1800054808B50823036003F03AFB18B1BDE88F +:101B28000840FFF725BF08BDC40100204FF0B043AF +:101B380007B55A6E42F001025A665B6E002203F046 +:101B48000103019311463220019B01F011FE32205E +:101B580003B05DF804EB01F03DBE00000CB407B51E +:101B6800054A05AB102101930DF062FA03B05DF848 +:101B780004EB02B0704700BF8CF4000830B585B0A4 +:101B8800044602A80D460DF07FF8BDF90C30064A50 +:101B980000931021029B2046FFF7E0FF2046FEF746 +:101BA800E7FA288005B030BD8CF400084FF0B04249 +:101BB80010B5936823F4004393600DF0EDF80E4BD5 +:101BC80001241C7000F0A8F80CF0B8FD0B480CF0CC +:101BD800CFFD0B4B4FF400421A6102200CF0CEFDF2 +:101BE800FFF7EAFB00F0FEF80CF0C2FE21462046A3 +:101BF800BDE810400CF0DCBED0010020851B0008B9 +:101C0800004000580CF0EABE08B5FFF7DDFB40F6CF +:101C1800B83398420CD8B0F5E16F0BD3FE23A0F58A +:101C2800E16058434FF49663B0FBF3F0C0B208BDCF +:101C3800FE20FCE70020FAE77FB5684600F0B6F81A +:101C48000198FFF779F900B207B05DF804FB0000CE +:101C5800194A38B5D2F88035591C044619D101F013 +:101C680027F9054601F030F9054401F027F92B0E54 +:101C7800E3712B0CA3712B0A6371030EE370C0F39D +:101C88000742C0F307232571C0B2A27063702070A9 +:101C980038BD190AC3718171190C1B0E417103718A +:101CA800D2F88435C370D2F88405C0F30722C0F394 +:101CB8000743000EE9E700BF0070FF1F38B5094B66 +:101CC800D3F8803503600133054609D101F0F0F8F7 +:101CD800044601F0F3F8444001F0F6F844402C6063 +:101CE80038BD00BF0070FF1F012102200CF04ABE62 +:101CF800002102200CF046BE00207047024B1878E5 +:101D080008B100F0A7B87047D001002082B0019058 +:101D1800019802B000F03AB9F0B5224A224CD2F844 +:101D2800903043F4804389B0C2F8903001F0D2F883 +:101D380001F0D8F801F0DEF8012304930323069399 +:101D480000254FF0B04305950795DA6C42F0020282 +:101D5800DA64DA6C02F002020292029ADA6C42F059 +:101D68000202DA64DB6C03F0020301934FF480573C +:101D780003A92046019B03974FF4005602F05EF832 +:101D880003A92046039602F059F82A463946204608 +:101D980002F07AF92A463146204602F075F909B070 +:101DA800F0BD00BF000800580004004810B5044604 +:101DB800FFF724FB074BA36040F30F20FEF718FF43 +:101DC800054B064A2360064B6060C4E903230020E4 +:101DD80010BD00BF0000484200007A440D093E00D3 +:101DE800AB03050000207047014B1868704700BF1F +:101DF800D40100200320704708B501464FF47A72D9 +:101E080000238002890DFFF7DDF808BD4FF47A73CF +:101E1800A0FB0303800A40EA83507047034B98688D +:101E28009A689042FBD1C043704700BF0028004029 +:101E380008B5FFF7F3FF014B186008BDD401002077 +:101E480008B5FFF7EBFF024B1B68C01A08BD00BFBF +:101E5800D4010020024B187808B1FFF7DFBF7047A4 +:101E6800D801002010B5074B074C0122DA654FF462 +:101E78008071204602F040FF4FF0FF3323630020BB +:101E880010BD00BF002800408C0100200246002140 +:101E9800014803F048B900BF8C0100200246012127 +:101EA800014803F040B900BF8C01002010B58CB088 +:101EB8002C220021044601A80DF0DCF9FFF7D2FF1F +:101EC8000C4B0D481B681C440023089306934FF0E5 +:101ED8000053E443079301224FF4807301A902944D +:101EE8000B9303F01DF808B1FFF742FD00200CB07A +:101EF80010BD00BFD40100208C01002038B5054674 +:101F0800FFF78CFF02210446074803F013F9C4F3D6 +:101F180009024FF47A71A2FB0121920AA30A2A80CE +:101F280043EA805038BD00BF8C01002001480021E1 +:101F380003F000B98C0100200148012103F0FAB830 +:101F48008C010020F8B50F4D2E78CEB90E4C4FF00D +:101F5800FF372763FFF70EFDFFF784FF4FF480710B +:101F6800204602F0C9FE2046276303F087F8324670 +:101F78002046022103F0D7F8FFF75AFF01232B7000 +:101F88000020F8BDD80100208C010020014610B5C2 +:101F98004FF47A7200238002890DFFF713F8014687 +:101FA800FFF73CFF0446FFF739FF031B8B4200D3C2 +:101FB80010BD00BFF7E70CF0F7BF000010B5064CE6 +:101FC8000221204603F0B6F80221421C2046BDE853 +:101FD800104003F0A8B800BF8C0100201648174A2B +:101FE80008B54FF4E133C0E9002300230C22C0E90F +:101FF8000233C0E90523C0E90733C0E909330361A7 +:1020080004F027FA08B1FFF7B3FC0B48002104F0ED +:1020180098FB08B1FFF7ACFC0748002104F0B1FBBE +:1020280008B1FFF7A5FC044804F06BFB18B1BDE844 +:102038000840FFF79DBC08BD3C020020004400405A +:1020480070B596B006461422002103A80DF012F9C7 +:102058003822002108A80DF00DF932682B4B9A425E +:1020680051D10223089308A8294B0A9302F076FD60 +:1020780008B1FFF77DFC4FF0B04300259A6D254C61 +:1020880042F400329A659A6D02F400320292029A82 +:10209800DA6C42F00102DA64DB6C03F001030193AD +:1020A800019B0C220223CDE903230323CDE9055329 +:1020B80003A907234FF09040079301F0BFFE16498C +:1020C80025621423C4E900131023C4E9023520460D +:1020D8008023C4E90435C4E9065501F0DBFB08B1E7 +:1020E800FFF746FC0B48102101F0A0FD08B1FFF7EF +:1020F8003FFC2520F46700220221A66201F038FB8C +:10210800252001F067FB16B070BD00BF00440040F9 +:1021180004000C00DC0100205800024002680C4B4F +:102128009A4210B5044612D14FF0B0420C21936D7B +:1021380023F4003393654FF0904001F02BFFE06FDC +:1021480001F01AFCBDE81040252001F051BB10BD7C +:102158000044004008B50A460146024803F0F8FA70 +:10216800002008BD3C02002013B5114B114C18602B +:102178004FF40013009302AB13E90600204604F065 +:1021880064FA2368DA69D103FCD4DA695202FCD50F +:102198009A68084842F480029A6004F09CFA06495A +:1021A8000448012204F00AFA002002B010BD00BF62 +:1021B800D00200203C020020D802002008B5074BBE +:1021C8001860FFF759F9FFF709FF054AD2F8803080 +:1021D80043F00063C2F88030002008BDD40200201C +:1021E8000008005808B54FF0B04308489A6B42F40D +:1021F80000329A639A6B22F400329A63FFF78EFFDB +:102208000F2001F0F5FA002008BD00BF3C020020B5 +:1022180008B5074804F01DF908B1FFF7A9FB054800 +:1022280001F038FB18B1BDE80840FFF7A1BB08BDB5 +:102238003C020020DC0100200268044B9A4203D1D2 +:10224800034B00201B681847704700BF004400403C +:10225800D402002002680B4B9A4210B504460FD1F5 +:10226800094B1B682BB1D0F8902012B907480121FF +:10227800984720460549BDE81040012204F09EB960 +:1022880010BD00BF00440040D0020020D80200204A +:10229800F0B587B000244FF0B0430594DA6C42F0F3 +:1022A8000102DA64DB6C03F00103012500932026A8 +:1022B800032701A94FF09040009B0395CDE90165E4 +:1022C800049701F0BBFD402301A94FF09040CDE9F0 +:1022D8000134CDE9035701F0B1FD224631464FF0F4 +:1022E800904001F0D1FE07B0F0BD00000D4B0E4A42 +:1022F8001B68B3FBF2F3DBB258434FF0E023002234 +:1023080058619A611A6942F001021A611A6902F069 +:102318000112012AFAD01A6922F001021A61002278 +:102328009A6170477400002000127A00012238B5C3 +:1023380040214FF0904001F0A7FE0120FFF7D6FFA3 +:10234800202100224FF0904001F09EFE40214FF0E6 +:10235800904001F093FE0128F8D0182400250122AE +:1023680020214FF0904001F08FFE0120FFF7BEFFC3 +:10237800202100224FF0904001F086FE40214FF0CE +:10238800904001F07BFE6D00012804F1FF344FF00E +:10239800010008BF0135FFF7A9FF14F0FF04DED1E3 +:1023A800012220214FF0904001F06EFE0120FFF73E +:1023B8009DFF202122464FF0904001F065FE85F4F4 +:1023C800000038BD07B5FFF7B1FF064B00221860C3 +:1023D80011460090044B02200CF01AFA03B05DF885 +:1023E80004FB00BFE0020020E8F400080000000041 +:1023F80007B5FFF79BFF124B1860124B1B689842FA +:1024080014D9C01AFEF7F4FBFEF71EF80AA3D3E9A5 +:102418000023FEF79BF9FEF709FB0B4B002218601F +:1024280011460090094B02200CF0F2F903B05DF858 +:1024380004FB00BFAFF3008000000000006C8C407C +:10244800E4020020E0020020DC0200200FF5000872 +:1024580007B5FFF71DFFFFF7B5FF4FF4FA60FFF769 +:1024680055FCFFF7AFFF084D084CFFF7C1FF2B687D +:10247800009300222346114602200CF0C9F94FF4BC +:10248800FA60FFF743FCF0E7DC0200202DF50008B6 +:1024980008B5FFF78BFBBDE8084000F041BB4FF0E3 :1024A800FF300CF0FFBA7047014BD870704700BF7F :1024B8000C000020014B1874704700BF0C0000206E :1024C80007B5064B00221B5C00931146044B022003 -:1024D8000CF09EF903B05DF804FB00BF5EF5000840 -:1024E80044F5000808B5022000210CF0A3FABDE865 +:1024D8000CF09EF903B05DF804FB00BF5DF5000841 +:1024E80043F5000808B5022000210CF0A3FABDE866 :1024F800084001480CF006BD3C04002000210120E2 :102508000CF098BA10B542F21073084C002818BFA6 :102518000346074823600CF0A7FC216804480CF028 @@ -601,8 +601,8 @@ :10256800012B0CBF0E4B0F4B0022114602200CF022 :102578004FF994F90530019394F90430009300223F :10258800094B114603200CF043F903B030BD074B4B -:10259800EAE700BFE80200200004004862F50008EE -:1025A80077F5000894F50008CAF50008B1F50008A9 +:10259800EAE700BFE80200200004004861F50008EF +:1025A80076F5000893F50008C9F50008B0F50008AD :1025B80008B50E4B1B78022B03D1002108200CF024 :1025C80039FA0B4800224FF4004101F05DFD08483C :1025D80000224FF4007101F057FDBDE8084004489F @@ -618,10 +618,10 @@ :10267800014602200CF0CCF801260F4B2E702246A2 :10268800214602200CF0C4F80C4804F06FFB2878AF :10269800314604F0C3F803480CF034FCE0E700BF0F -:1026A800000400483C040020F3F50008240400203E -:1026B8007000002011F6000825F600080C00002024 -:1026C8002DE9F04389B0FFF79FFB044604F0A0F919 -:1026D800054600286BD102A8FFF768FC524B00940E +:1026A800000400483C040020F2F50008240400203F +:1026B8007000002010F6000824F600080C00002026 +:1026C8002DE9F04389B0FFF79FFA044604F0A0F91A +:1026D800054600286BD102A8FFF768FB524B00940F :1026E8000122294602200CF093F803984F4CDFF89A :1026F8004081FEF721FC00B201224E4B0090294692 :1027080002200CF085F80223049823704A49FEF74A @@ -637,15 +637,15 @@ :1027A800014670BB0122294B10460CF031F8002479 :1027B80027480CF059FB274B25481968A14238BF18 :1027C80021460CF0D9FB22480CF09CFB09B0BDE86F -:1027D800F083DDE90576D4F80490FFF715FB89F856 +:1027D800F083DDE90576D4F80490FFF715FA89F857 :1027E800060063683A14DA7163683A121A7232148E :1027F8009A7232125F72DA721E735D739D730F23C1 :10280800B7E70631D3D104F0E9F804460028CED062 :1028180001224FF47A730021B0FBF3F310460093C2 -:102828000D4B0BF0F5FFC3E744F60008000000204D -:102838000C0000204FF60008000020410000C842AC -:1028480030030020E8020020000400485AF600087F -:102858003C0400200800002069F6000802484FF4F4 +:102828000D4B0BF0F5FFC3E743F60008000000204E +:102838000C0000204EF60008000020410000C842AD +:1028480030030020E80200200004004859F6000880 +:102858003C0400200800002068F6000802484FF4F5 :10286800006101F016BC00BF0004004800B5034633 :102878008DB000282CD0407802280AD003282AD00E :10288800164B0022114602200DB05DF804EB0BF048 @@ -653,10 +653,10 @@ :1028A80008921A7E0792DA7D06929A7D05925A68F6 :1028B8000492DA68039293F914200292B3F9122071 :1028C80001921B7C00930022054B11460BF0A0FFE0 -:1028D8000DB05DF804FB034BD3E700BF87F6000893 -:1028E8009EF6000810F7000801284FF000020CBF00 -:1028F800024B034B114602200BF08ABF2FF700084A -:1029080041F7000808B504F0A6FB80B904F06CF89C +:1028D8000DB05DF804FB034BD3E700BF86F6000894 +:1028E8009DF600080FF7000801284FF000020CBF02 +:1028F800024B034B114602200BF08ABF2EF700084B +:1029080040F7000808B504F0A6FB80B904F06CF89D :1029180001280CD1BFF34F8F0549064BCA6802F452 :10292800E0621343CB60BFF34F8F00BFFDE708BDE4 :1029380000ED00E00400FA051FB50446002837D072 @@ -669,8 +669,8 @@ :1029A80013460022009311460E4B03200BF030FF14 :1029B80004B010BD00220C4B1146032004B0BDE842 :1029C80010400BF025BF00BF00040048180300208A -:1029D8005AF700088BF70008BCF7000856F70008FC -:1029E80055F70008C9F70008DAF70008F0B50546FA +:1029D80059F700088AF70008BBF7000855F7000800 +:1029E80054F70008C8F70008D9F70008F0B50546FD :1029F80087B00C46002937D02C4801224FF40041FB :102A080001F042FB2A480CF07DFA26789EB1002D91 :102A18004AD06B682E7873B1022E27D0032E0AD1C4 @@ -683,13 +683,13 @@ :102A88000F4B294603200BF0C3FE2A4607484FF494 :102A9800006101F0F9FACEE700221146094B032044 :102AA8000BF0B6FE3A46F1E72E46C4E700040048AC -:102AB8000003002028F90008FBF700083003002075 -:102AC800E8F70008F2F7000838B504460D4607484D +:102AB8000003002028F90008FAF700083003002076 +:102AC800E7F70008F1F7000838B504460D4607484F :102AD8004FF40061FEF74EFE30B92A4621460348FE :102AE800BDE83840FEF74CBD38BD00BF00F0030814 :102AF80010B504F045FB10F1080F07D1064B002272 :102B0800BDE81040114602200BF082BE013001D111 -:102B1800024BF4E710BD00BF42F8000858F800085F +:102B1800024BF4E710BD00BF41F8000857F8000861 :102B2800F0B587B00024012603274F4B02942246B4 :102B38002146CDE900670220022505940BF068FEC6 :102B48000523CDE900532246484B029421462846E6 @@ -710,8 +710,8 @@ :102C38001F4804F0ABF91F4804F098F814480CF04A :102C480061F91D4B0021187803F0E8FD1B49009439 :102C58001B4B09681B4800220CF0A8F819480CF017 -:102C680051F907B0F0BD00BF70F8000891F80008EE -:102C7800B2F80008D3F80008F4F800080D26000898 +:102C680051F907B0F0BD00BF6FF8000890F80008F0 +:102C7800B1F80008D2F80008F3F800080D2600089B :102C880018030020FD25000800030020652800081F :102C9800E8020020B925000824040020796B000808 :102CA800C9260008F92A000829260008000003019F @@ -743,7 +743,7 @@ :102E48000248082101F020F90022F2E700080048B2 :102E5800002070470120704701207047002814BFE8 :102E680016200F207047704710B5032000F06EFC45 -:102E780001F08CFA064B18600F20FFF73DF8044666 +:102E780001F08CFA064B18600F20FEF73DFF044660 :102E880018B9FEF712FE204610BD0124FBE700BF6B :102E9800740000204FF0E022136923F0020313614D :102EA80070474FF0E022136943F002031361704743 @@ -787,12 +787,12 @@ :1031080000200140400D030074000020F8B5456917 :10311800082D04460E460AD00368DB68D80705D593 :10312800A36D43F02003A3650120F8BD0425FEF735 -:10313800E5FE074623681A682A4220D0A26D42F4A9 +:10313800E5FD074623681A682A4220D0A26D42F4AA :103148000072A265DA6812F4406F14D1A27E92B9B7 :103158001A6812070FD51846FFF7D4FE20BB5A6825 :1031680022F00C025A60A26D22F4807222F0010251 :1031780042F00102A265227EFAB10020D5E7711C57 -:10318800D9D0FEF7BBFEC01BB04201D8002ED1D16A +:10318800D9D0FEF7BBFDC01BB04201D8002ED1D16B :1031980023681B682B40CDD1A26D84F8543042F0CF :1031A8000402A2650320C0E7A26D42F02002A265D6 :1031B800E26D42F00102E265DDE70C221A60DCE70D @@ -826,17 +826,17 @@ :10337800004000B8002000B4026838B50446104682 :10338800FFF7C0FD08B9002038BD9368990707D436 :10339800936823F0004323F0170343F0100393606E -:1033A800FEF7ACFD054623689B685B07EBD5FEF787 -:1033B800A5FD401B0228F6D923689B685A07F2D559 +:1033A800FEF7ACFC054623689B685B07EBD5FEF788 +:1033B800A5FC401B0228F6D923689B685A07F2D55A :1033C800A36D43F01003A365E36D43F00103E365C8 :1033D8000120D9E773B50023026801939368DD07DC :1033E800044602D5002002B070BD9168214B1942F5 :1033F80009D0A36D43F01003A365E36D43F0010307 :10340800E3650120EFE7936823F0004323F01703F7 :1034180043F001039360184BD3F8083718021CD403 -:10342800637E012BDED0FEF769FD144E0546226847 +:10342800637E012BDED0FEF769FC144E0546226848 :103438001368DB07D6D49368D9075FBF9368334016 -:1034480043F001039360FEF759FD401B0228EED9B3 +:1034480043F001039360FEF759FC401B0228EED9B4 :1034580023681B68DA07EAD4CBE7094B094A1B68DB :10346800B3FBF2F301330193019B002BD8D0019BEE :10347800013BF8E71700008000200140E8FFFF7FCC @@ -849,8 +849,8 @@ :1034E8000220F9E7026838B5936891680446C8076E :1034F80001D4002038BD9907FBD4936803F0050375 :10350800012B19D1936823F0004323F0170343F0EC -:103518000203936003231360FEF7F0FC054623685B -:103528009B68DB07E5D5FEF7E9FC401B0228F6D9C6 +:103518000203936003231360FEF7F0FB054623685C +:103528009B68DB07E5D5FEF7E9FB401B0228F6D9C7 :1035380023689B68DA07F2D5A36D43F01003A365EF :10354800E36D43F00103E3650120D3E770B504465A :1035580000284BD0836D43F002038365FFF70CFF0F @@ -880,9 +880,9 @@ :1036D800013801F07F010A44DCD199681A48014099 :1036E80041F001019960D3F8B41021F07F0141EA5B :1036F800D202C3F8B4209A68024042F002029A60EB -:10370800FEF7FCFB074623689A68D20708D4DA68F4 +:10370800FEF7FCFA074623689A68D20708D4DA68F5 :103718003243DA60A36D23F0030343F001039FE70C -:10372800FEF7ECFBC01B0228EDD923689B68D9077C +:10372800FEF7ECFAC01B0228EDD923689B68D9077D :10373800E9D5A36D43F01003A365E36D43F00103DE :10374800E365BFE70225BEE7E8FFFF7F0749CA68D0 :1037580022F4E0620302120403F4E063120C134340 @@ -971,11 +971,11 @@ :103C8800002ABFBF054A9A6002F188329A60BABF1B :103C98005869C00F0020704700400058230167454D :103CA800044B5A6942F000425A615869C043C00F38 -:103CB800704700BF0040005870B50546FEF71EF972 +:103CB800704700BF0040005870B50546FEF71EF873 :103CC800124E04463369D90313D43369DA0744BF63 :103CD800012232614CF2FA32134011D10B4E306995 -:103CE80010F480200BD0FEF709F9001BA842F6D388 -:103CF80004E0FEF703F9001BA842E3D3032070BDDC +:103CE80010F480200BD0FEF709F8001BA842F6D389 +:103CF80004E0FEF703F8001BA842E3D3032070BDDD :103D0800024A1361024A01205360F8E70040005854 :103D1800640400202DE9F041184D98462B78012BBA :103D280006460C46174626D001232B704FF47A70AE @@ -1062,9 +1062,9 @@ :104238009C4225D802230BE01A4B9C4207D91A4B03 :104248009C421BD903F5370303F5D853F0E7002345 :1042580004AA02EB830353F80C4C144D2B6823F08B -:10426800070323432B60FDF749FE06462B6803F03E +:10426800070323432B60FDF749FD06462B6803F03F :1042780007039C4206D1002004B070BD0123E7E784 -:104288000024EAE7FDF73AFE801B0228EED9032056 +:104288000024EAE7FDF73AFD801B0228EED9032057 :10429800F2E700BF40F90008A0F90008F0F30008B1 :1042A800C0CF6A00BFEA21013F93340200400058A2 :1042B8004FF0B04310B59A68D96812F00C0205D0D7 @@ -1090,77 +1090,77 @@ :1043F80003F0F00399421FD90846FFF7EFFE0028A3 :104408002DD14FF0B042136843F0080313601368CE :10441800A16A23F0F0030B431360606AFFF7CEFE36 -:10442800FFF7B4FFAB4B1860AB4B1868FDF764FDA2 +:10442800FFF7B4FFAB4B1860AB4B1868FDF764FCA3 :10443800002834D0BDE8F0814FF0B042136843F053 :1044480008031360136823F0F0030B431360606ADA :10445800FFF7B4FE0846FFF7C1FE0028E0D00120B0 :10446800E8E74FF0B043002A54D01A6842F001023E -:104478001A60FDF743FD0746FFF79AFE002842D071 +:104478001A60FDF743FC0746FFF79AFE002842D072 :104488004FF0B042136843F0080313601368A16A41 :1044980023F0F0030B431360606AFFF78FFE236875 :1044A800D80748D42368990700F18C8023681E0731 :1044B80040F1FA80A3694FF0B046002B00F0E1808C :1044C800D6F89430E16903F01002914200F0C480FC :1044D80003F00302022AC2D0D80740F1B380D6F80D -:1044E800943023F00103C6F89430FDF707FD074622 -:1044F800D6F89430990740F1A580FDF7FFFCC31B5F -:10450800112BF5D904E0FDF7F9FCC01B0228B3D93B -:1045180003208FE71A6822F001021A60FDF7EEFC0B -:104528000746FFF745FE0028B9D0FDF7E7FCC01B9A +:1044E800943023F00103C6F89430FDF707FC074623 +:1044F800D6F89430990740F1A580FDF7FFFBC31B60 +:10450800112BF5D904E0FDF7F9FBC01B0228B3D93C +:1045180003208FE71A6822F001021A60FDF7EEFB0C +:104528000746FFF745FE0028B9D0FDF7E7FBC01B9B :104538000228F6D9ECE7082D03D00C2D05D1032E5F :1045480003D16368002BADD189E74FF0B043A16870 :104558001A6822F480120A431A606268B2F5803F32 -:1045680010D11A6842F480321A60FDF7C7FC07467A -:10457800FFF718FE002895D1FDF7C0FCC01B642882 +:1045680010D11A6842F480321A60FDF7C7FB07467B +:10457800FFF718FE002895D1FDF7C0FBC01B642883 :10458800F6D9C5E7B2F5041F04D11A6842F400123F :104598001A60E6E7196821F480311960196821F476 -:1045A80000111960002AE0D1FDF7A8FC0746FFF7C3 -:1045B800F9FD00283FF476AFFDF7A0FCC01B642886 +:1045A80000111960002AE0D1FDF7A8FB0746FFF7C4 +:1045B800F9FD00283FF476AFFDF7A0FBC01B642887 :1045C800F5D9A5E7042D236903D00C2D0ED1022EB1 :1045D8000CD1002B3FF443AF4FF0B04261695368F0 :1045E80023F0FE4343EA016353605FE74FF0B046B0 -:1045F800BBB1336843F480733360FDF77FFC074633 -:1046080033685A0505D4FDF779FCC31B022BF7D98B +:1045F800BBB1336843F480733360FDF77FFB074634 +:1046080033685A0505D4FDF779FBC31B022BF7D98C :104618007EE77368626923F0FE4343EA02637360CE -:1046280044E7336823F480733360FDF767FC07467B -:1046380033685B057FF53AAFFDF760FCC31B022BBF +:1046280044E7336823F480733360FDF767FB07467C +:1046380033685B057FF53AAFFDF760FBC31B022BC0 :10464800F6D965E74FF0B042E169D2F8943023F02B :1046580010030B43C2F894304FF0B047D7F89430AA -:1046680043F00103C7F89430FDF748FC0646D7F835 -:1046780094309A0718D4FDF741FC831B112BF6D907 +:1046680043F00103C7F89430FDF748FB0646D7F836 +:1046780094309A0718D4FDF741FB831B112BF6D908 :1046880046E7D6F8943023F00103C6F89430FDF7D6 -:1046980035FC0746D6F894309B0705D5FDF72EFC68 +:1046980035FB0746D6F894309B0705D5FDF72EFB6A :1046A800C31B112BF6D933E72368580754D50B4F92 -:1046B8003B68D90514D4FFF701FDFDF71FFC06463A -:1046C8003B68DA050CD4FDF719FC831B022BF7D9DC +:1046B8003B68D90514D4FFF701FDFDF71FFB06463B +:1046C8003B68DA050CD4FDF719FB831B022BF7D9DD :1046D8001EE700BF74000020780000200004005886 :1046E800E3684FF0B046002B58D023F08003052B29 :1046F80002BFD6F8903043F00403C6F890304FF06C -:10470800B046FDF7FBFBD6F8903043F001030746AF +:10470800B046FDF7FBFAD6F8903043F001030746B0 :10471800C6F8903041F28838D6F890309B0705D417 -:10472800FDF7ECFBC31B4345F6D9F1E6E36823F03C -:104738000403812B1BD1FDF7E1FBD6F8903043F041 +:10472800FDF7ECFAC31B4345F6D9F1E6E36823F03D +:104738000403812B1BD1FDF7E1FAD6F8903043F042 :104748008003C6F8903007464FF0B04641F28838EB :10475800D6F89030180504D5E36A002B4AD100201A -:1047680068E6FDF7CBFBC01B4045F1D9D0E6FDF765 -:10477800C5FBD6F8903023F08003C6F89030074682 +:1047680068E6FDF7CBFAC01B4045F1D9D0E6FDF766 +:10477800C5FAD6F8903023F08003C6F89030074683 :104788004FF0B04641F28838D6F890301905E3D595 -:10479800FDF7B4FBC01B4045F6D9B9E6FDF7AEFB03 +:10479800FDF7B4FAC01B4045F6D9B9E6FDF7AEFA05 :1047A800D6F8903023F080030746C6F8903041F2DF -:1047B8008838D6F890301A0516D4FDF79FFBD6F83E +:1047B8008838D6F890301A0516D4FDF79FFAD6F83F :1047C800903023F00103C6F8903007464FF0B04808 -:1047D80041F28836D8F890309B07BDD5FDF78EFB9F -:1047E800C31BB342F6D993E6FDF788FBC01B4045CF +:1047D80041F28836D8F890309B07BDD5FDF78EFAA0 +:1047E800C31BB342F6D993E6FDF788FAC01B4045D0 :1047F800DFD98DE60C2D4ED0022B4FF0B0431A684E -:1048080022F080721A6033D1FDF778FB0546FFF776 +:1048080022F080721A6033D1FDF778FA0546FFF777 :10481800DEFC38BBD4E90C314FF0B0420B43D06812 :104828002D4901400B43E16B0B43216C0B43616C39 :104838000B43A16B43EA0123D360136843F08073F1 -:104848001360D36843F08053D360FDF757FB0446E9 -:10485800FFF7BDFC002882D1FDF750FB001B0A289A -:10486800F6D955E6FDF74AFB401B0A28CFD94FE693 -:10487800FDF744FB0446FFF7AAFC30B94FF0B042FD -:10488800164BD1680B40D36069E7FDF737FB001B77 +:104848001360D36843F08053D360FDF757FA0446EA +:10485800FFF7BDFC002882D1FDF750FA001B0A289B +:10486800F6D955E6FDF74AFA401B0A28CFD94FE694 +:10487800FDF744FA0446FFF7AAFC30B94FF0B042FE +:10488800164BD1680B40D36069E7FDF737FA001B78 :104898000A28F0D93CE6012B3FF4E1AD4FF0B043D4 :1048A800D868236B00F003029A427FF4D8AD626B9C :1048B80000F0700393427FF4D2ADA26B00F4FE4384 @@ -1169,33 +1169,33 @@ :1048E8002DE9F0410D46044610B90120BDE8F081DC :1048F800754E336803F007038B4216D32368980775 :1049080027D54FF0B047A268BB6823F0F0031343E4 -:10491800BB60FDF7F3FA0646BB68D90319D4FDF767 -:10492800EDFA831B022BF7D911E0336823F0070354 -:104938000B433360FDF7E2FA0746336803F00703D9 -:10494800AB42DBD0FDF7DAFAC01B0228F5D9032009 +:10491800BB60FDF7F3F90646BB68D90319D4FDF768 +:10492800EDF9831B022BF7D911E0336823F0070355 +:104938000B433360FDF7E2F90746336803F00703DA +:10494800AB42DBD0FDF7DAF9C01B0228F5D903200A :10495800CCE723689A0616D54FF0B0476269D7F8B6 -:10496800083123F0F0031343C7F80831FDF7C6FAFE -:104978000646D7F808319B0305D4FDF7BFFA831B19 +:10496800083123F0F0031343C7F80831FDF7C6F9FF +:104978000646D7F808319B0305D4FDF7BFF9831B1A :10498800022BF6D9E3E72368580617D54FF0B0474E :10499800A269D7F8083123F00F0343EA1213C7F8C6 -:1049A8000831FDF7ABFA0646D7F80831D90305D424 -:1049B800FDF7A4FA831B022BF6D9C8E723685A0728 +:1049A8000831FDF7ABF90646D7F80831D90305D425 +:1049B800FDF7A4F9831B022BF6D9C8E723685A0729 :1049C80013D54FF0B047E268BB6823F4E0631343A4 -:1049D800BB60FDF793FA0646BB689B0305D4FDF759 -:1049E8008DFA831B022BF7D9B1E72368180714D572 +:1049D800BB60FDF793F90646BB689B0305D4FDF75A +:1049E8008DF9831B022BF7D9B1E72368180714D573 :1049F8004FF0B0472269BB6823F4605343EAC2030F -:104A0800BB60FDF77BFA0646BB68590305D4FDF782 -:104A180075FA831B022BF7D999E72368DA070FD4B5 +:104A0800BB60FDF77BF90646BB68590305D4FDF783 +:104A180075F9831B022BF7D999E72368DA070FD4B6 :104A2800294C236803F00703AB4239D8FFF7AEFCE3 -:104A3800264B1860264BBDE8F0411868FDF75CBAB4 +:104A3800264B1860264BBDE8F0411868FDF75CB9B5 :104A48006268022A1DD1FFF7ADFB00283FF44DAF85 :104A58004FF0B04641F28838B36823F0030313439C -:104A6800B360FDF74BFA0746B368626803F00C03BE -:104A7800B3EB820FD4D0FDF741FAC01B4045F3D900 +:104A6800B360FDF74BF90746B368626803F00C03BF +:104A7800B3EB820FD4D0FDF741F9C01B4045F3D901 :104A880065E7032A02D1FFF7A2FBDEE712B9FFF7B9 :104A98008FFBDAE74FF0B0431B685B05D8D424E7F7 -:104AA800236823F007032B432360FDF727FA064604 -:104AB800236803F00703AB42B8D0FDF71FFA801B49 +:104AA800236823F007032B432360FDF727F9064605 +:104AB800236803F00703AB42B8D0FDF71FF9801B4A :104AC8000228F5D943E700BF0040005874000020D1 :104AD8007800002008B5FFF759FC4FF0B043044AAE :104AE8009B68C3F3022352F82330D84008BD00BFA7 @@ -1206,15 +1206,15 @@ :104B3800000123EA020300F47F200343C1F8883010 :104B480070474FF0B041020CD1F88830120423EAC4 :104B5800020343EA0040C1F8880070470368DA039B -:104B680070B5044639D5FFF7A9FAFDF7C7F9614EC4 +:104B680070B5044639D5FFF7A9FAFDF7C7F8614EC5 :104B780005463368DB0532D54FF0B043616BD3F897 :104B8800902002F4407291421DD0D3F89010D3F8CF :104B9800902042F48032C3F89020D3F8902021F47A :104BA800407022F480328D07C3F89020C3F890003B -:104BB80009D5FDF7A3F941F288360546FFF7AAFFA4 +:104BB80009D5FDF7A3F841F288360546FFF7AAFFA5 :104BC800012840F090804FF0B042616BD2F89030ED :104BD80023F440730B43C2F89030002605E0FDF73C -:104BE8008DF9401B0228C4D903262568E8070AD591 +:104BE8008DF8401B0228C4D903262568E8070AD592 :104BF8004FF0B0416268D1F8883023EA124392B28C :104C08001343C1F88830A9070AD54FF0B041A2680C :104C1800D1F8883023EA124392B21343C1F888309E @@ -1230,7 +1230,7 @@ :104CB800883019B9D36843F08073D3606B0410D57A :104CC8004FF0B042E16AD2F8883023F040530B43EA :104CD800B1F1005FC2F8883003D1D36843F4803360 -:104CE800D360304670BDFDF709F9401BB0427FF62E +:104CE800D360304670BDFDF709F8401BB0427FF62F :104CF80065AF79E70004005830B590F82C30012BE7 :104D080002464FF0020022D0174B82F82D00CA2429 :104D1800012582F82C505C6253245C62B1F5807FD7 @@ -1240,15 +1240,15 @@ :104D580021F408519961D96C24F0020421F0004132 :104D6800D9641463D865E9E70028004070B50B4E94 :104D7800036B756D1D40EA07044603D50123F365EF -:104D8800FDF719FAAB0704D50223F365204600F0B6 +:104D8800FDF719F9AB0704D50223F365204600F0B7 :104D9800C9F9012384F82D3070BD00BF00280040F8 -:104DA80038B50A4CE36823F02003E360FDF7A6F862 -:104DB8000546E3689B0601D5002038BDFDF79EF83F +:104DA80038B50A4CE36823F02003E360FCF7A6FF5C +:104DB8000546E3689B0601D5002038BDFCF79EFF39 :104DC800401BB0F57A7FF4D90320F6E700280040AD :104DD800F8B5114DEC6814F0400406461AD1EB689A -:104DE80043F08003EB60FDF789F823460746EC683B -:104DF80014F0400401D1032B01D11846F8BDFDF78A -:104E08007DF8C01BB0F57A7F234684BF032386F85C +:104DE80043F08003EB60FCF789FF23460746EC6835 +:104DF80014F0400401D1032B01D11846F8BDFCF78B +:104E08007DFFC01BB0F57A7F234684BF032386F855 :104E18002D30ECE70023F0E70028004038B50F4CB0 :104E2800E36823F08003E360A3699B06054606D484 :104E3800FFF7B6FF10B1032085F82D0038BDA36930 @@ -1297,7 +1297,7 @@ :1050E800801041F48021C0F88010FF215162002017 :1050F800012283F82D2083F82C00704700280040F7 :1051080000080058064B5A6D520610B5044603D5E0 -:105118004022DA65FDF752F8012384F82D3010BDDE +:105118004022DA65FCF752FF012384F82D3010BDD8 :10512800002800407047890001F1804101F53141B4 :105138000A607047890001F1804101F53141086832 :1051480070470000034AD2F8903043F40043C2F895 @@ -1308,7 +1308,7 @@ :1051980037B5054600284ED0837903F0FF046BB17C :1051A800032C0BD0254B4FF400629A612868FFF757 :1051B800DDFF002401232B71AC602FE000236B710D -:1051C8002846FCF7B3FD1E4AD2F8903043F48053CA +:1051C8002846FCF7B3FC1E4AD2F8903043F48053CB :1051D800C2F89030002CE5D102234FF0B042AB71F9 :1051E800D2F8943023F40043C2F89430154B1B686E :1051F8001C214B43DB0C64214B430193019B93B966 @@ -1409,7 +1409,7 @@ :1057E800200317D1A0F85630026802F1080353E8E5 :1057F800003F23F08003083242E8003102680029A4 :10580800F2D152E8003F43F0400342E8003100295A -:10581800F7D108BDFCF710FEFBE7704708B5806AB2 +:10581800F7D108BDFCF710FDFBE7704708B5806AB3 :10582800FFF7FBFF08BD7047806A38B50468D0F8F9 :105838008830D0F88C50A268120606D5212B04D1E6 :105848000023A0F85630FFF73CFFA3685B0606D597 @@ -1460,7 +1460,7 @@ :105B1800284305D0A36F002B3FF454AF2046CCE6B2 :105B28004F0611D556060FD553E8002F22F0400234 :105B380043E800210029F7D12023C4F88830A16761 -:105B48002046FCF779FC3DE70D0206D5500004D548 +:105B48002046FCF779FB3DE70D0206D5500004D549 :105B58002046BDE8F04100F077BDCB017FF532AFBC :105B6800002ABFF62FAF2046BDE8F04100F06BBD1C :105B7800010000102001000479580008FEFFFFEF23 @@ -1471,7 +1471,7 @@ :105BC800003103680029F5D103F1080252E8002FDB :105BD80022F0010203F1080C4CE800210029F3D15E :105BE8002022C0F88C20184A41679342016705D1EA -:105BF800C26E012A0ED0FCF72DFC1EE05A68110275 +:105BF800C26E012A0ED0FCF72DFB1EE05A68110276 :105C0800F6D553E8002F22F0806243E800210029EE :105C1800F7D1EDE70022C26653E8002F22F0100208 :105C280043E800210029F7D1DA69B0F85C10D20600 @@ -1483,7 +1483,7 @@ :105C8800002F22F4907243E800210029F7D103F194 :105C9800080252E8002F22F0010203F1080C4CE838 :105CA80000210029F3D12022C0F88C20174A41672F -:105CB8009342016705D1C26E012A0ED0FCF7CAFBD8 +:105CB8009342016705D1C26E012A0ED0FCF7CAFAD9 :105CC8001EE05A681102F6D553E8002F22F08062D0 :105CD80043E800210029F7D1EDE70022C26653E826 :105CE800002F22F0100243E800210029F7D1DA69D9 @@ -1513,7 +1513,7 @@ :105E680043E800210029F7D1E26E012A14D100226B :105E7800E26653E8002F22F0100243E800210029CF :105E8800F7D1DA69B4F85C10D20644BF10221A625E -:105E98002046FFF7F7FC53E72046FCF7DBFA4FE70D +:105E98002046FFF7F7FC53E72046FCF7DBF94FE70E :105EA8009A6942F008029A616CE700BFFEFFFFEFB3 :105EB80000800040895B00082DE9F84F0368B0F8BE :105EC8006060D3F81CB01F689D68D0F88C20222A27 @@ -1540,7 +1540,7 @@ :1060180014D10022E26653E8002F22F0100243E870 :1060280000210029F7D1DA69B4F85C10D20644BF20 :1060380010221A622046FFF725FC55E72046FCF798 -:1060480009FA51E79A6942F008029A616EE700BFBF +:1060480009F951E79A6942F008029A616EE700BFC0 :10605800FEFFFFEF00800040555C000838B504469D :1060680003682169A2681D68C0690A4361690A4317 :106078007749024329400A431A605A68E16822F4C2 @@ -1588,7 +1588,7 @@ :106318000268C16C536823F400230B43536010BD1B :106328002DE9F843DDF8209005460F4616469846B5 :106338002A68D36937EA03030CBF01230023B34259 -:1063480001D0002029E0B9F1FF3FF2D0FBF7D6FDDC +:1063480001D0002029E0B9F1FF3FF2D0FBF7D6FCDD :10635800A0EB080048452C6802D8B9F1000F1ED1FF :1063680054E8003F23F4D07344E80032002AF7D100 :1063780004F1080353E8003F23F0010304F1080186 @@ -1599,14 +1599,14 @@ :1063C80004F1080353E8003F23F0010304F1080136 :1063D80041E80032002AF3D12023C5F88830C5F8F7 :1063E8008C30C5F89030D4E773B504460026C0F861 -:1063F8009060FBF783FD23681B681A07054619D4CC +:1063F8009060FBF783FC23681B681A07054619D4CD :1064080023681B685B070AD56FF07E430093002260 :106418002B464FF480012046FFF782FFB0B90020D9 :106428002023C4F8883084F88400C4F88C30E066EF :1064380020670CE06FF07E430093324603464FF42A :1064480000112046FFF76CFF0028D9D0032002B0C6 :1064580070BD10B5044650B3D0F888301BB980F829 -:106468008430FBF7EDFE22682423C4F888301368D3 +:106468008430FBF7EDFD22682423C4F888301368D4 :1064780023F0010313602046FFF7F0FD012816D032 :10648800A36A13B12046FFF7F7FE23685A6822F47F :1064980090425A609A6822F02A029A601A6842F07A @@ -1642,7 +1642,7 @@ :106678001A609A6822F440120A439A6071B95A68FB :10668800BDF80C009DF80E1022F0100202435A606B :106698005A6822F07F4242EA01625A601A6842F060 -:1066A80001021A60FBF72AFC6FF07E420346009253 +:1066A80001021A60FBF72AFB6FF07E420346009254 :1066B8004FF4800100222046FFF732FE38B920232C :1066C800C4F88830002384F8843004B010BD032057 :1066D800F8E70220F9E790F88430012B0FD0012366 @@ -3348,7 +3348,7 @@ :10D1180040F262211A46084600F05EFFDCE7A0688C :10D128008001F0E7500E0020800E00200004004827 :10D1380008B54FF0040000F0DBFDBDE80840022010 -:10D14800F4F7E4BEF7B500230D4640F201211A4674 +:10D14800F4F7E4BDF7B500230D4640F201211A4675 :10D158000646084600F040FF2F4B304C4FF4005273 :10D168009A6194F85600012101F0BEF92378012B49 :10D1780040F6890012D194F85130062B0ED100F0F8 @@ -3441,7 +3441,7 @@ :10D6E8002FFE204600F0DEFC00240123CDE908438C :10D6F80003234FF4167229462046CDE90644CDE9A6 :10D708000444CDE90244CDE900532346FFF7ECFE7B -:10D718002046FFF7D9FCFFF791FCF4F7F7FB01F07F +:10D718002046FFF7D9FCFFF791FCF4F7F7FA01F080 :10D728005FFB0446204601F065FBB04205D30124A7 :10D73800FFF770FC20460BB0F0BD00F04FFE8742AB :10D74800F0DA0024F4E70000F0B5BDF814409DF8C5 @@ -3510,9 +3510,9 @@ :10DB38005400FFF797BE00BF800E0020014B1878F5 :10DB4800704700BFEE0F002007B501238DF80710BE :10DB58000DF1070201460348F7F71EFC03B05DF814 -:10DB680004FB00BFD001002007B5012301460DF1D9 +:10DB680004FB00BFC401002007B5012301460DF1E5 :10DB780007020448F7F749FC9DF8070003B05DF871 -:10DB880004FB00BFD001002010B50446F5F7BEF82D +:10DB880004FB00BFC401002010B50446F5F7BEF839 :10DB980001280CD140F62310FFF7E6FF00F0F90149 :10DBA800214340F62310BDE81040FFF7CDBF10BD5C :10DBB80010B50C4B1B7804469BB94FF4D760FFF7A0 @@ -3520,7 +3520,7 @@ :10DBD800FFF7BAFFE1B240F2B960BDE81040FFF7C5 :10DBE800B3BF10BDED0F002010B51346EFF310843E :10DBF80072B60A4601460348F7F7CEFB84F310884D -:10DC080010BD00BFD001002008B5014608224FF41E +:10DC080010BD00BFC401002008B5014608224FF42A :10DC1800D860FFF7E9FF002008BD000007B5074BF3 :10DC28001B7840BAADF804002BB9022201A940F2D2 :10DC3800BC60FFF7D9FF03B05DF804FBED0F0020CF @@ -3528,13 +3528,13 @@ :10DC580001A940F2BE60FFF7C7FF03B05DF804FBFF :10DC6800ED0F002010B51346EFF3108472B60A4684 :10DC780001460348F7F7C9FB84F3108810BD00BFBD -:10DC8800D001002010B51346EFF3108472B60A468F +:10DC8800C401002010B51346EFF3108472B60A469B :10DC980001460348F7F7ABFC84F3108810BD00BFBA -:10DCA800D00100200A4601460020FFF7EBBF000024 +:10DCA800C40100200A4601460020FFF7EBBF000030 :10DCB80010B51346EFF3108472B60A4601460348BE -:10DCC800F7F7C8FC84F3108810BD00BFD00100200E +:10DCC800F7F7C8FC84F3108810BD00BFC40100201A :10DCD80010B51346EFF3108472B60A46014603489E -:10DCE800F7F7CEFB84F3108810BD00BFD0010020E9 +:10DCE800F7F7CEFB84F3108810BD00BFC4010020F5 :10DCF80013B504460020F5F703F80220FFF744FFA8 :10DD080004F0070401220DF1070184208DF8074073 :10DD1800FFF7DEFF024B00221A7002B010BD00BFF1 @@ -3587,7 +3587,7 @@ :10E0080004FB07B50B0C042200F0070049BA8DF891 :10E018000400ADF8061097200DEB02018DF80530CD :10E02800FFF756FE03B05DF804FB000010B508B119 -:10E03800194B1860F3F76CFE0220FFF7A5FD0024CA +:10E03800194B1860F3F76CFD0220FFF7A5FD0024CB :10E04800164B20461C70FFF76DFEF4F75DFE0128A5 :10E0580016D14021FFF7D5FF40F611102146FFF7F2 :10E0680073FD4FF07F00FFF760FF0E2140F61F1091 @@ -3645,7 +3645,7 @@ :10E3A80007B502228DF804008DF805108F2001A909 :10E3B800FFF78EFC03B05DF804FB000010B51346B0 :10E3C800EFF3108472B60A4601460348F7F790F84F -:10E3D80084F3108810BD00BFD001002007B50122CA +:10E3D80084F3108810BD00BFC401002007B50122D6 :10E3E80001A91520FFF7EAFF9DF8040040424010FC :10E3F80003B05DF804FB000037B505460C46022261 :10E4080001A91320FFF7DAFF0A4B1B78012B0DD166 @@ -3702,7 +3702,7 @@ :10E73800D38281F310887047F015002010B508487F :10E748001822002100F074F906484FF48062002175 :10E7580000F06EF9044B05481B68BDE810401847E7 -:10E76800F0150020EF11002034F50008E1E800085A +:10E76800F0150020EF110020D8F40008E1E80008B7 :10E77800014B5860704700BFF0150020014B18721C :10E78800704700BFF015002073B5EFF3108572B61F :10E798001C4CE08A00282FD1FFF7B8FF218A628A33 @@ -3710,9 +3710,9 @@ :10E7B8009BB20221A382A17063B9A3702382238A2A :10E7C8009A428BBFD21AC3F58063A282A38201E06A :10E7D800002BF4D0268A0C4B1E4485F31088F3F7DF -:10E7E80083FB0A4BA18ADB680193304602B0BDE87F +:10E7E80083FA0A4BA18ADB680193304602B0BDE880 :10E7F80070401847FFF796FF85F31088002002B095 -:10E8080070BD00BFF0150020EF11002034F500089E +:10E8080070BD00BFF0150020EF110020D8F40008FB :10E8180008B4F0B586B00023ADF800302B4B0B9C44 :10E828001D7A85424CD3D86881434CD15B681BB1B3 :10E8380012B1694602A898470CAB22464FF4007102 @@ -3733,8 +3733,8 @@ :10E928001A821A8A90428BBF801AC2F58062988236 :10E938009A8201E00029F4D0188A0B4A104484F323 :10E9480010880A4A998AD368019302B0BDE810403A -:10E95800184784F31088F3F7CBFA02B0BDE81040EB -:10E96800FFF7E0BEF0150020EF11002034F5000895 +:10E95800184784F31088F3F7CBF902B0BDE81040EC +:10E96800FFF7E0BEF0150020EF110020D8F40008F2 :10E97800024A00231360024A136070470C160020F5 :10E988000816002010B5EFF3108472B641B10129C2 :10E9980003D1064A13680343136084F3108810BD3B @@ -3761,7 +3761,7 @@ :10EAE80001D019421ED04FF0FF333B60FFF7B8FF4B :10EAF800EFF3108472B63368DBF80020DAF8001000 :10EB08000B4029680B4205D1D9F80030134201D1D6 -:10EB1800F3F778F984F31088FFF7A3FFC5F80080AE +:10EB1800F3F778F884F31088FFF7A3FFC5F80080AF :10EB2800BDE8F88F236823680340134062681A42DF :10EB380004BF4FF0FF32626060681840FFF792FF31 :10EB480062683860012303FA00F022EA000262607A @@ -3784,43 +3784,43 @@ :10EC58009847009BBDF804400290181ABDF80C3084 :10EC6800E41AA3B224B2002CBEBF03F57A731CB217 :10EC780000F1FF302B689847AB682046984705B0ED -:10EC880030BD00BFF4F4000873B5114E00230546EB +:10EC880030BD00BF98F4000873B5114E0023054647 :10EC98000093ADF8043001A833699847F3680090F1 :10ECA8009847736804469847009B1844BDF8043099 :10ECB80023449AB21BB2B3F57A7FA2BF0130A2F502 :10ECC8007A731BB228602846AB8002B070BD00BFC3 -:10ECD800F4F4000837B500230093ADF80430074B6F +:10ECD80098F4000837B500230093ADF80430074BCB :10ECE80004461B6901A898476D46009095E8030003 -:10ECF80084E80300204603B030BD00BFF4F40008E8 +:10ECF80084E80300204603B030BD00BF98F4000844 :10ED080037B50F4D02AB03E90300EB6898476B6812 :10ED180004469847BDF80430009A1B1B99B21BB2F1 :10ED2800002BA2EB0002BEBF01F57A7102F1FF329F :10ED38000BB24FF47A7000FB023003B030BD00BF55 -:10ED4800F4F400082DE9F0414FF47A75B1FBF5F5BC +:10ED480098F400082DE9F0414FF47A75B1FBF5F518 :10ED5800C5EB4513DFF83C8005EB8303A1EBC30348 :10ED68009CB2D8F80C3006469847D8F804300746C5 :10ED78009847E31999B21BB2B3F57A7F2844A2BF2A :10ED8800A1F57A7301301BB23060B3803046BDE81C -:10ED9800F08100BFF4F40008024B00221A60024B15 -:10EDA8001B6818473816002008F50008F8B504460F +:10ED9800F08100BF98F40008024B00221A60024B71 +:10EDA8001B68184738160020ACF40008F8B504466C :10EDB800174608461E467CB173B1084B00255B6AAE :10EDC80025609847069B60602581A572E6602361EF -:10EDD800E77265612846F8BD0120FCE708F50008E0 +:10EDD800E77265612846F8BD0120FCE7ACF400083D :10EDE80010B5034CE3699847A36ABDE8104018477B -:10EDF80008F5000870B5064DEB69064698476B6A3A +:10EDF800ACF4000870B5064DEB69064698476B6A97 :10EE0800044630469847AB6A201ABDE87040184758 -:10EE180008F50008054B1B680BB918467047834274 +:10EE1800ACF40008054B1B680BB9184670478342D1 :10EE280001D05B69F8E70120704700BF3816002061 :10EE38002DE9F3410B4E336A044698470123B7691D :10EE48002372D4F800800546B8472844804502D28A :10EE5800B84728442060B3682068019302B0BDE831 -:10EE6800F041184708F5000870B520B3EFF3108695 +:10EE6800F0411847ACF4000870B520B3EFF31086F2 :10EE780072B6124D2B680122827253B1002242727F :10EE880098425C690ED102723CB120462C60FFF7B3 :10EE9800CFFF86F31088002070BD094BDB689847C8 :10EEA8002C60F6E71A465B69002BF2D09842F9D13C :10EEB80043695361EDE70120EEE700BF38160020F3 -:10EEC80008F50008084B10B51A685369516911B95B +:10EEC800ACF40008084B10B51A685369516911B9B8 :10EED8005061416110BD046819688C4202D91A4614 :10EEE8005B69F3E71946F3E738160020044A13680C :10EEF8000BB10021197243611060FFF799BF00BF81 @@ -3831,10 +3831,10 @@ :10EF48002046FFF7D3FF88F310882846BDE8F081F4 :10EF5800B3699847236818443B6820601B68984247 :10EF68002046EED3FFF7AEFFEDE70125EDE700BF42 -:10EF780008F500083816002010B5044608467CB18C +:10EF7800ACF400083816002010B5044608467CB1E9 :10EF8800084B5B6A984760602046FFF743FF40B133 :10EF98002046FFF769FF2046BDE81040FFF7B2BFE3 -:10EFA800012010BD08F500082DE9F041EFF31087A6 +:10EFA800012010BDACF400082DE9F041EFF3108703 :10EFB80072B61D4E1D4D73699847336904469847CC :10EFC8002B684BB94FF000082B688BB9286828BB11 :10EFD80087F31088BDE8F081011B241A1A688A4259 @@ -3842,7 +3842,7 @@ :10EFF8001C681CB1B36998478442E7D22C686369DE :10F008002B60A4F80880D4E9033098476389B3F5E6 :10F01800807FD9D12046FFF775FFD5E7037A002B0B -:10F02800D6D1FFF705FFD3E708F50008381600200A +:10F02800D6D1FFF705FFD3E7ACF400083816002067 :10F038002DE9F04F002997B081461E4640F3118113 :10F0480004464F1E1378A4EB090023B9002323704C :10F0580017B0BDE8F08FB842F8DA252B05D004F8D0 @@ -3912,82 +3912,82 @@ :10F450000000000000000000000D0A202D2D2D2DC1 :10F460002D20537461727420202D2D2D2D2D200DF3 :10F470000A0000009F1A00088D1A0008711A00087F -:10F48000911A00086D1A0008B11A00080D0A20230D -:10F490002323232320204D616F205069203D2564C4 -:10F4A0002020203C3C3C3C3C3C200D0A000D0A2026 -:10F4B000232323232320205765696768745F5368DB -:10F4C000697775203D25642020203C3C3C3C3C3C39 -:10F4D000200D0A004E657420576569676874203DE9 -:10F4E000202564202067200D0A0025647325303311 -:10F4F000643A00009520000835210008A520000886 -:10F5000041210008052100084D21000800000000ED -:10F51000B52000086D20000839200008F11F000800 -:10F52000492000085D200008FD1F00080120000898 -:10F5300015200008C5230008ED23000871230008EA -:10F540005D23000853776974636820746F20436CEF -:10F5500061737320256320646F6E650D0A0041425C -:10F5600043000D0A232323232323203D204A4F4910 -:10F570004E4544203D2000414250203D3D3D3D3D13 +:10F48000911A00086D1A0008B11A00082564732546 +:10F490003033643A00000000951E0008351F000854 +:10F4A000A51E0008411F0008051F00084D1F000889 +:10F4B00000000000B51E00086D1E0008391E00087F +:10F4C000F11D0008491E00085D1E0008FD1D000812 +:10F4D000011E0008151E0008C5210008ED210008C6 +:10F4E000712100085D2100080D0A20232323232316 +:10F4F000202047726F737320576569676874203DD9 +:10F5000025642020203C3C3C3C3C3C200D0A000D66 +:10F510000A20232323232320204E65742057656966 +:10F52000676874203D25642020200D0A004E657414 +:10F5300020576569676874203D2025642020672076 +:10F540000D0A0053776974636820746F20436C61FF +:10F55000737320256320646F6E650D0A004142437A +:10F56000000D0A232323232323203D204A4F494E05 +:10F570004544203D2000414250203D3D3D3D3D3D24 :10F580003D3D3D3D3D3D3D3D3D3D3D3D3D3D3D3DAB -:10F590003D0D0A004F544141203D3D3D3D3D3D3D27 -:10F5A0003D3D3D3D3D3D3D3D3D3D3D3D3D3D0D0AEE -:10F5B000000D0A232323232323203D204A4F494EB5 -:10F5C000204641494C45440D0A002323232323238D -:10F5D00020552F4C204652414D453A4A4F494E2026 -:10F5E0007C2044523A2564207C205057523A2564AE -:10F5F0000D0A004C6D48616E646C65722053746F27 -:10F6000070206F6E20676F696E67202E2E2E0D0A98 -:10F61000004C6D48616E646C65722053746F70703D -:10F6200065640D0A004C6D48616E646C65722073F0 -:10F63000776974636820746F20414250206D6F6455 -:10F64000650D0A00564444413A2025640D0A0074B1 -:10F65000656D703A2025640D0A0053454E442052D2 -:10F660004551554553540D0A004E65787420547821 -:10F6700020696E20203A207E2564207365636F6EBA -:10F68000642873290D0A000D0A2323232323232032 -:10F69000424541434F4E204C4F53540D0A000D0A32 -:10F6A00023232323232320424541434F4E20524509 -:10F6B000434549564544207C2044523A2564207CE9 -:10F6C00020525353493A2564207C20534E523A2508 -:10F6D00064207C2046513A2564207C2054494D45C5 -:10F6E0003A2564207C20444553433A2564207C20FD -:10F6F000494E464F3A30325825303258253032582C -:10F70000202530325825303258253032580D0A0025 -:10F710000D0A23232323232320424541434F4E2018 -:10F720004E4F542052454345495645440D0A004E1C -:10F73000564D20444154412053544F5245440D0AE4 -:10F74000004E564D204441544120524553544F528F -:10F7500045440D0A004E41434B000D0A2323232349 -:10F760002323203D3D3D3D3D3D3D3D3D3D204D4321 -:10F7700050532D436F6E6669726D203D3D3D3D3D9A -:10F780003D3D3D3D3D3D3D3D0D0A002323232323CB -:10F790002320552F4C204652414D453A25303464A4 -:10F7A000207C20504F52543A2564207C2044523A09 -:10F7B0002564207C205057523A256400207C204D3F -:10F7C000534720545950453A00434F4E4649524DF5 -:10F7D0004544205B25735D0D0A00554E434F4E4650 -:10F7E00049524D45440D0A004C4544204F46460DB4 -:10F7F0000A004C4544204F4E0D0A002323232323A7 -:10F800002320442F4C204652414D453A2530346444 -:10F81000207C20504F52543A2564207C2044523A98 -:10F820002564207C20534C4F543A2573207C205271 -:10F830005353493A2564207C20534E523A25640D97 -:10F840000A004E564D204441544120555020544FFB -:10F8500020444154450D0A004E564D204441544128 -:10F860002053544F5245204641494C45440D0A000F -:10F870004150504C49434154494F4E5F56455253B5 -:10F88000494F4E3A205625582E25582E25580D0AF8 -:10F89000004D575F4C4F524157414E5F56455253B2 -:10F8A000494F4E3A20205625582E25582E25580DC2 -:10F8B0000A004D575F524144494F5F5645525349E4 -:10F8C0004F4E3A202020205625582E25582E2558B8 -:10F8D0000D0A004C325F535045435F564552534921 -:10F8E0004F4E3A20202020205625582E25582E25D0 -:10F8F000580D0A0052505F535045435F56455253CE -:10F90000494F4E3A20202020205625582D25582E8C -:10F9100025582E25580D0A0031003200435F4D4313 -:10F9200000505F4D4300000018F900081AF9000864 -:10F9300060F500081CF90008D5FB000821F9000853 +:10F590000D0A004F544141203D3D3D3D3D3D3D3D27 +:10F5A0003D3D3D3D3D3D3D3D3D3D3D3D3D0D0A002B +:10F5B0000D0A232323232323203D204A4F494E2095 +:10F5C0004641494C45440D0A00232323232323208D +:10F5D000552F4C204652414D453A4A4F494E207CCA +:10F5E0002044523A2564207C205057523A25640D1D +:10F5F0000A004C6D48616E646C65722053746F70C4 +:10F60000206F6E20676F696E67202E2E2E0D0A0008 +:10F610004C6D48616E646C65722053746F707065D8 +:10F62000640D0A004C6D48616E646C6572207377DE +:10F630006974636820746F20414250206D6F646567 +:10F640000D0A00564444413A2025640D0A007465B1 +:10F650006D703A2025640D0A0053454E44205245F2 +:10F6600051554553540D0A004E6578742054782046 +:10F67000696E20203A207E2564207365636F6E6476 +:10F680002873290D0A000D0A232323232323204254 +:10F690004541434F4E204C4F53540D0A000D0A2351 +:10F6A000232323232320424541434F4E20524543E9 +:10F6B0004549564544207C2044523A2564207C200C +:10F6C000525353493A2564207C20534E523A2564C4 +:10F6D000207C2046513A2564207C2054494D453AEF +:10F6E0002564207C20444553433A2564207C2049EE +:10F6F0004E464F3A30325825303258253032582055 +:10F700002530325825303258253032580D0A000D38 +:10F710000A23232323232320424541434F4E204ED7 +:10F720004F542052454345495645440D0A004E5614 +:10F730004D20444154412053544F5245440D0A003A +:10F740004E564D204441544120524553544F52454A +:10F75000440D0A004E41434B000D0A23232323236B +:10F7600023203D3D3D3D3D3D3D3D3D3D204D4350F4 +:10F77000532D436F6E6669726D203D3D3D3D3D3DAD +:10F780003D3D3D3D3D3D3D0D0A00232323232323E5 +:10F7900020552F4C204652414D453A2530346420A7 +:10F7A0007C20504F52543A2564207C2044523A2504 +:10F7B00064207C205057523A256400207C204D5311 +:10F7C0004720545950453A00434F4E4649524D4503 +:10F7D00044205B25735D0D0A00554E434F4E46494C +:10F7E000524D45440D0A004C4544204F46460D0AF3 +:10F7F000004C4544204F4E0D0A002323232323238E +:10F8000020442F4C204652414D453A253034642047 +:10F810007C20504F52543A2564207C2044523A2593 +:10F8200064207C20534C4F543A2573207C20525343 +:10F8300053493A2564207C20534E523A25640D0AE0 +:10F84000004E564D204441544120555020544F20E5 +:10F85000444154450D0A004E564D20444154412028 +:10F8600053544F5245204641494C45440D0A0041EE +:10F8700050504C49434154494F4E5F5645525349AD +:10F880004F4E3A205625582E25582E25580D0A0041 +:10F890004D575F4C4F524157414E5F564552534969 +:10F8A0004F4E3A20205625582E25582E25580D0A01 +:10F8B000004D575F524144494F5F56455253494F9F +:10F8C0004E3A202020205625582E25582E25580DFA +:10F8D0000A004C325F535045435F56455253494FDF +:10F8E0004E3A20202020205625582E25582E2558C7 +:10F8F0000D0A0052505F535045435F5645525349DD +:10F900004F4E3A20202020205625582D25582E25B0 +:10F91000582E25580D0A0031003200435F4D430038 +:10F92000505F4D430000000017F9000819F9000866 +:10F930005FF500081BF90008D5FB000820F9000856 :10F94000A0860100400D0300801A060000350C005F :10F9500040420F0080841E0000093D0000127A0022 :10F960000024F40000366E010048E801006CDC025F @@ -4029,8 +4029,8 @@ :10FBA00061742044522025640D0A005458206F6E61 :10FBB000206672657120256420487A206174204493 :10FBC000522025640D0A004D756C74695F43004D29 -:10FBD000756C74695F50000018F900081AF9000884 -:10FBE00060F50008C7FB0008D5FB0008CFFB000844 +:10FBD000756C74695F50000017F9000819F9000886 +:10FBE0005FF50008C7FB0008D5FB0008CFFB000845 :10FBF000A584998D0DBDB1545003A97D1962E69A73 :10FC0000459D408715EBC90BEC67FDEABFF7965B96 :10FC1000C21CAE6A5A41024F5CF434089373533FDE @@ -4111,7 +4111,7 @@ :1000B0000C0000004D434B45400001080D000000BE :1000C0004D434B304D0001080E0000004D415330B0 :1000D0004D0001080F0000004D4E53305A0001083A -:1000E000100000005A45524F71F4000852616469D3 +:1000E000100000005A45524F2CF500085261646917 :1000F0006F53656E64204F76657273697A650D0A79 :10010000004952515F52585F54585F54494D454F12 :1001100055540D0A00505245204F4B0D0A005359BB @@ -4152,8 +4152,8 @@ :08033000390100080000000083 :100338000000000031030020102700000000010029 :1003480000000000000000000000000004000000A1 -:10035800401F0000111E0008411E0008591E000819 -:10036800C51E00081D260008D12A0008052500081A +:10035800401F0000111C0008411C0008591C00081F +:10036800C51C00081D260008D12A0008052500081C :10037800F1280008000000003D2500084129000878 :10038800F5290008C924000875280008AF240008CA :100398000D250008B1240008BD2400080D29000817 diff --git a/STM32CubeIDE/Release/objects.list b/STM32CubeIDE/Release/objects.list index db08c8b..e505ec4 100644 --- a/STM32CubeIDE/Release/objects.list +++ b/STM32CubeIDE/Release/objects.list @@ -8,7 +8,6 @@ "./Application/User/Core/stm32_lpm_if.o" "./Application/User/Core/stm32wlxx_hal_msp.o" "./Application/User/Core/stm32wlxx_it.o" -"./Application/User/Core/sts_weight_scale.o" "./Application/User/Core/subghz.o" "./Application/User/Core/sys_app.o" "./Application/User/Core/sys_debug.o" @@ -18,6 +17,7 @@ "./Application/User/Core/timer_if.o" "./Application/User/Core/usart.o" "./Application/User/Core/usart_if.o" +"./Application/User/Core/sts_weight_scale.o" "./Application/User/LoRaWAN/App/CayenneLpp.o" "./Application/User/LoRaWAN/App/app_lorawan.o" "./Application/User/LoRaWAN/App/lora_app.o" diff --git a/STM32CubeIDE/STM32WL55JCIX_FLASH.ld b/STM32CubeIDE/STM32WL55JCIX_FLASH.ld index d45d121..43a7268 100644 --- a/STM32CubeIDE/STM32WL55JCIX_FLASH.ld +++ b/STM32CubeIDE/STM32WL55JCIX_FLASH.ld @@ -91,13 +91,13 @@ SECTIONS . = ALIGN(8); } >FLASH - .ARM.extab : { + .ARM.extab (READONLY) : { . = ALIGN(8); *(.ARM.extab* .gnu.linkonce.armextab.*) . = ALIGN(8); } >FLASH - .ARM : { + .ARM (READONLY): { . = ALIGN(8); __exidx_start = .; *(.ARM.exidx*) @@ -105,7 +105,7 @@ SECTIONS . = ALIGN(8); } >FLASH - .preinit_array : + .preinit_array (READONLY) : { . = ALIGN(8); PROVIDE_HIDDEN (__preinit_array_start = .); @@ -114,7 +114,7 @@ SECTIONS . = ALIGN(8); } >FLASH - .init_array : + .init_array (READONLY): { . = ALIGN(8); PROVIDE_HIDDEN (__init_array_start = .); @@ -124,7 +124,7 @@ SECTIONS . = ALIGN(8); } >FLASH - .fini_array : + .fini_array (READONLY): { . = ALIGN(8); PROVIDE_HIDDEN (__fini_array_start = .);