diff --git a/fw/Core/Src/main.c b/fw/Core/Src/main.c index 7a9a664..135a623 100644 --- a/fw/Core/Src/main.c +++ b/fw/Core/Src/main.c @@ -72,26 +72,27 @@ const uint16_t tim21_period = MEASUREMENT_PERIOD_S * (SYSTEM_CLOCK_HZ / tim21_pr /* Input registers memory map implementation */ enum { - REGISTER_NUM_T = 30010, /* deg C */ - REGISTER_NUM_T_F = 30011, /* deg F */ - REGISTER_NUM_RH = 30012, /* %, from SHT4x */ - REGISTER_NUM_LIGHT_INTENSITY_0 = 30013, /* ticks, from LTR329 */ /*TODO: Find out what it is */ - REGISTER_NUM_LIGHT_INTENSITY_1 = 30014, /* ticks, from LTR329 */ /*TODO: Find out what it is */ - REGISTER_NUM_DEVICE_IDENTIFIER = 30100 + REGISTER_NUM_SERIAL_NUMBER_1 = 30001, + REGISTER_NUM_SERIAL_NUMBER_2 = 30002, + REGISTER_NUM_T = 30003, /* deg C */ + REGISTER_NUM_T_F = 30004, /* deg F */ + REGISTER_NUM_RH = 30005, /* %, from SHT4x */ + REGISTER_NUM_LIGHT_INTENSITY_0 = 30006, /* ticks, from LTR329 */ /*TODO: Find out what it is */ + REGISTER_NUM_LIGHT_INTENSITY_1 = 30007, /* ticks, from LTR329 */ /*TODO: Find out what it is */ /* VOC Index has initial blackout beriod, when the data is not ready. VOC index is 0 during this period */ } data_registers_numbers; enum { - REGISTER_NUM_LTR329_GAIN = 40001, - REGISTER_NUM_LTR329_MEAS_RATE = 40002, - REGISTER_NUM_LTR329_INTEGRATION_TIME = 40003, - REGISTER_NUM_LTR329_MODE = 40004, + REGISTER_NUM_MODBUS_ADDR = 40001, + REGISTER_NUM_BAUDRATE = 40002, + REGISTER_NUM_LTR329_GAIN = 40003, + REGISTER_NUM_LTR329_MEAS_RATE = 40004, + REGISTER_NUM_LTR329_INTEGRATION_TIME = 40005, + REGISTER_NUM_LTR329_MODE = 40006, + REGISTER_NUM_RESET_DEVICE = 49999 /* TODO: Change registers to start with the modbus specific settings? */ /* TODO: Seal the gap */ - REGISTER_NUM_MODBUS_ADDR = 40007, - REGISTER_NUM_BAUDRATE = 40008, - REGISTER_NUM_RESET_DEVICE = 40100 } config_registers_numbers; /* Variables to store the measured data */ diff --git a/fw/Debug/Core/Src/main.o b/fw/Debug/Core/Src/main.o index 4ccf3de..ba203b7 100644 Binary files a/fw/Debug/Core/Src/main.o and b/fw/Debug/Core/Src/main.o differ diff --git a/fw/Debug/Core/Src/main.su b/fw/Debug/Core/Src/main.su index ae64885..82a0f3f 100644 --- a/fw/Debug/Core/Src/main.su +++ b/fw/Debug/Core/Src/main.su @@ -57,26 +57,26 @@ stm32l0xx_ll_usart.h:2996:22:LL_USART_EnableIT_RXNE 32 static,ignoring_inline_as stm32l0xx_ll_usart.h:3145:22:LL_USART_DisableIT_IDLE 32 static,ignoring_inline_asm stm32l0xx_ll_usart.h:3156:22:LL_USART_DisableIT_RXNE 32 static,ignoring_inline_asm stm32l0xx_ll_usart.h:3639:22:LL_USART_TransmitData9 16 static -main.c:129:8:sht4x_i2c_transmit 32 static -main.c:134:8:sht4x_i2c_receive 32 static -main.c:139:9:sensirion_crc8_calculate 16 static -main.c:144:8:sht4x_disable_interrupts 8 static -main.c:149:8:sht4x_enable_interrupts 8 static -main.c:154:8:ltr329_i2c_transmit 32 static -main.c:158:8:ltr329_i2c_receive 32 static -main.c:163:8:ltr329_disable_interrupts 8 static -main.c:168:8:ltr329_enable_interrupts 8 static -main.c:173:6:delay_ms 16 static -main.c:183:5:main 32 static -main.c:374:6:SystemClock_Config 8 static -main.c:427:13:MX_I2C1_Init 72 static -main.c:490:13:MX_IWDG_Init 8 static -main.c:520:13:MX_TIM21_Init 24 static -main.c:559:13:MX_USART2_UART_Init 72 static -main.c:644:13:MX_GPIO_Init 8 static -main.c:653:6:USART2_TX_Buffer 24 static,ignoring_inline_asm -main.c:664:8:uart_disable_interrupts 8 static -main.c:673:8:uart_enable_interrupts 8 static -main.c:682:8:modbus_slave_callback 32 static -main.c:839:8:modbus_transmit_function 16 static -main.c:851:6:Error_Handler 8 static,ignoring_inline_asm +main.c:130:8:sht4x_i2c_transmit 32 static +main.c:135:8:sht4x_i2c_receive 32 static +main.c:140:9:sensirion_crc8_calculate 16 static +main.c:145:8:sht4x_disable_interrupts 8 static +main.c:150:8:sht4x_enable_interrupts 8 static +main.c:155:8:ltr329_i2c_transmit 32 static +main.c:159:8:ltr329_i2c_receive 32 static +main.c:164:8:ltr329_disable_interrupts 8 static +main.c:169:8:ltr329_enable_interrupts 8 static +main.c:174:6:delay_ms 16 static +main.c:184:5:main 32 static +main.c:375:6:SystemClock_Config 8 static +main.c:428:13:MX_I2C1_Init 72 static +main.c:491:13:MX_IWDG_Init 8 static +main.c:521:13:MX_TIM21_Init 24 static +main.c:560:13:MX_USART2_UART_Init 72 static +main.c:645:13:MX_GPIO_Init 8 static +main.c:654:6:USART2_TX_Buffer 24 static,ignoring_inline_asm +main.c:665:8:uart_disable_interrupts 8 static +main.c:674:8:uart_enable_interrupts 8 static +main.c:683:8:modbus_slave_callback 32 static +main.c:840:8:modbus_transmit_function 16 static +main.c:852:6:Error_Handler 8 static,ignoring_inline_asm diff --git a/fw/Debug/rht_wired_sensor.bin b/fw/Debug/rht_wired_sensor.bin index aba9358..72866c4 100755 Binary files a/fw/Debug/rht_wired_sensor.bin and b/fw/Debug/rht_wired_sensor.bin differ diff --git a/fw/Debug/rht_wired_sensor.elf b/fw/Debug/rht_wired_sensor.elf index 8c0ab7b..ea87e0c 100755 Binary files a/fw/Debug/rht_wired_sensor.elf and b/fw/Debug/rht_wired_sensor.elf differ diff --git a/fw/Debug/rht_wired_sensor.list b/fw/Debug/rht_wired_sensor.list index b915acb..339ca75 100644 --- a/fw/Debug/rht_wired_sensor.list +++ b/fw/Debug/rht_wired_sensor.list @@ -7,43 +7,43 @@ Idx Name Size VMA LMA File off Algn CONTENTS, ALLOC, LOAD, READONLY, DATA 1 .text 00003e98 080000c0 080000c0 000100c0 2**2 CONTENTS, ALLOC, LOAD, READONLY, CODE - 2 .rodata 00000148 08003f58 08003f58 00013f58 2**2 + 2 .rodata 00000138 08003f58 08003f58 00013f58 2**2 CONTENTS, ALLOC, LOAD, READONLY, DATA - 3 .ARM.extab 00000000 080040a0 080040a0 00020008 2**0 + 3 .ARM.extab 00000000 08004090 08004090 00020008 2**0 CONTENTS - 4 .ARM 00000000 080040a0 080040a0 00020008 2**0 + 4 .ARM 00000000 08004090 08004090 00020008 2**0 CONTENTS - 5 .preinit_array 00000000 080040a0 080040a0 00020008 2**0 + 5 .preinit_array 00000000 08004090 08004090 00020008 2**0 CONTENTS, ALLOC, LOAD, DATA - 6 .init_array 00000004 080040a0 080040a0 000140a0 2**2 + 6 .init_array 00000004 08004090 08004090 00014090 2**2 CONTENTS, ALLOC, LOAD, DATA - 7 .fini_array 00000004 080040a4 080040a4 000140a4 2**2 + 7 .fini_array 00000004 08004094 08004094 00014094 2**2 CONTENTS, ALLOC, LOAD, DATA - 8 .data 00000008 20000000 080040a8 00020000 2**2 + 8 .data 00000008 20000000 08004098 00020000 2**2 CONTENTS, ALLOC, LOAD, DATA - 9 .bss 00000174 20000008 080040b0 00020008 2**2 + 9 .bss 00000174 20000008 080040a0 00020008 2**2 ALLOC - 10 ._user_heap_stack 00000604 2000017c 080040b0 0002017c 2**0 + 10 ._user_heap_stack 00000604 2000017c 080040a0 0002017c 2**0 ALLOC 11 .ARM.attributes 00000028 00000000 00000000 00020008 2**0 CONTENTS, READONLY - 12 .debug_info 00009636 00000000 00000000 00020030 2**0 + 12 .debug_info 0000963d 00000000 00000000 00020030 2**0 CONTENTS, READONLY, DEBUGGING, OCTETS - 13 .debug_abbrev 00001d62 00000000 00000000 00029666 2**0 + 13 .debug_abbrev 00001d62 00000000 00000000 0002966d 2**0 CONTENTS, READONLY, DEBUGGING, OCTETS - 14 .debug_aranges 000009d8 00000000 00000000 0002b3c8 2**3 + 14 .debug_aranges 000009d8 00000000 00000000 0002b3d0 2**3 CONTENTS, READONLY, DEBUGGING, OCTETS - 15 .debug_ranges 000008e0 00000000 00000000 0002bda0 2**3 + 15 .debug_ranges 000008e0 00000000 00000000 0002bda8 2**3 CONTENTS, READONLY, DEBUGGING, OCTETS - 16 .debug_macro 0000d7a8 00000000 00000000 0002c680 2**0 + 16 .debug_macro 0000d7a8 00000000 00000000 0002c688 2**0 CONTENTS, READONLY, DEBUGGING, OCTETS - 17 .debug_line 000079e5 00000000 00000000 00039e28 2**0 + 17 .debug_line 000079e5 00000000 00000000 00039e30 2**0 CONTENTS, READONLY, DEBUGGING, OCTETS - 18 .debug_str 00044d2a 00000000 00000000 0004180d 2**0 + 18 .debug_str 00044d45 00000000 00000000 00041815 2**0 CONTENTS, READONLY, DEBUGGING, OCTETS - 19 .comment 00000053 00000000 00000000 00086537 2**0 + 19 .comment 00000053 00000000 00000000 0008655a 2**0 CONTENTS, READONLY - 20 .debug_frame 00002214 00000000 00000000 0008658c 2**2 + 20 .debug_frame 00002214 00000000 00000000 000865b0 2**2 CONTENTS, READONLY, DEBUGGING, OCTETS Disassembly of section .text: @@ -4990,7 +4990,7 @@ int8_t modbus_slave_callback(modbus_transaction_t *transaction) 8001d1a: 4a93 ldr r2, [pc, #588] ; (8001f68 ) 8001d1c: 4694 mov ip, r2 8001d1e: 4463 add r3, ip - 8001d20: 2b07 cmp r3, #7 + 8001d20: 2b05 cmp r3, #5 8001d22: d84b bhi.n 8001dbc 8001d24: 009a lsls r2, r3, #2 8001d26: 4b91 ldr r3, [pc, #580] ; (8001f6c ) @@ -5142,7 +5142,7 @@ int8_t modbus_slave_callback(modbus_transaction_t *transaction) 8001e04: 4a58 ldr r2, [pc, #352] ; (8001f68 ) 8001e06: 4694 mov ip, r2 8001e08: 4463 add r3, ip - 8001e0a: 2b07 cmp r3, #7 + 8001e0a: 2b05 cmp r3, #5 8001e0c: d900 bls.n 8001e10 8001e0e: e186 b.n 800211e 8001e10: 009a lsls r2, r3, #2 @@ -5346,7 +5346,7 @@ int8_t modbus_slave_callback(modbus_transaction_t *transaction) 8001f48: 701a strb r2, [r3, #0] break; 8001f4a: e0eb b.n 8002124 - 8001f4c: ffff8ac6 .word 0xffff8ac6 + 8001f4c: ffff8acd .word 0xffff8acd 8001f50: 08003fc8 .word 0x08003fc8 8001f54: 2000003c .word 0x2000003c 8001f58: 20000074 .word 0x20000074 @@ -5356,10 +5356,10 @@ int8_t modbus_slave_callback(modbus_transaction_t *transaction) 8001f68: ffff63bf .word 0xffff63bf 8001f6c: 08003fdc .word 0x08003fdc 8001f70: 20000068 .word 0x20000068 - 8001f74: 00009c48 .word 0x00009c48 + 8001f74: 00009c46 .word 0x00009c46 8001f78: 00009c41 .word 0x00009c41 - 8001f7c: 08003ffc .word 0x08003ffc - 8001f80: 00009ca4 .word 0x00009ca4 + 8001f7c: 08003ff4 .word 0x08003ff4 + 8001f80: 0000c34f .word 0x0000c34f 8001f84: 2000002b .word 0x2000002b 8001f88: 08003fc4 .word 0x08003fc4 8001f8c: 20000029 .word 0x20000029 @@ -6188,7 +6188,7 @@ LoopForever: ldr r1, =_edata 80023c4: 20000008 .word 0x20000008 ldr r2, =_sidata - 80023c8: 080040a8 .word 0x080040a8 + 80023c8: 08004098 .word 0x08004098 ldr r2, =_sbss 80023cc: 20000008 .word 0x20000008 ldr r4, =_ebss @@ -7402,7 +7402,7 @@ static uint32_t RCC_GetHCLKClockFreq(uint32_t SYSCLK_Frequency) 8002a56: b002 add sp, #8 8002a58: bd80 pop {r7, pc} 8002a5a: 46c0 nop ; (mov r8, r8) - 8002a5c: 0800401c .word 0x0800401c + 8002a5c: 0800400c .word 0x0800400c 08002a60 : * @brief Return PCLK1 clock frequency @@ -7431,7 +7431,7 @@ static uint32_t RCC_GetPCLK1ClockFreq(uint32_t HCLK_Frequency) 8002a7e: b002 add sp, #8 8002a80: bd80 pop {r7, pc} 8002a82: 46c0 nop ; (mov r8, r8) - 8002a84: 0800402c .word 0x0800402c + 8002a84: 0800401c .word 0x0800401c 08002a88 : /** @@ -7514,7 +7514,7 @@ static uint32_t RCC_PLL_GetFreqDomain_SYS(void) 8002ae8: 003d0900 .word 0x003d0900 8002aec: 00f42400 .word 0x00f42400 8002af0: 007a1200 .word 0x007a1200 - 8002af4: 08004034 .word 0x08004034 + 8002af4: 08004024 .word 0x08004024 08002af8 : { @@ -10240,7 +10240,7 @@ static int8_t modbus_process_read_write_request(const uint8_t *buffer, int len, 8003ae2: b006 add sp, #24 8003ae4: bdb0 pop {r4, r5, r7, pc} 8003ae6: 46c0 nop ; (mov r8, r8) - 8003ae8: 08004040 .word 0x08004040 + 8003ae8: 08004030 .word 0x08004030 8003aec: 00002711 .word 0x00002711 8003af0: 00007531 .word 0x00007531 8003af4: ffff9c41 .word 0xffff9c41 @@ -10887,10 +10887,10 @@ int8_t sht4x_measure(int16_t *temperature, uint16_t *relative_humidity) 8003ef2: 4798 blx r3 8003ef4: 3601 adds r6, #1 8003ef6: e7f2 b.n 8003ede <__libc_init_array+0x1e> - 8003ef8: 080040a0 .word 0x080040a0 - 8003efc: 080040a0 .word 0x080040a0 - 8003f00: 080040a0 .word 0x080040a0 - 8003f04: 080040a4 .word 0x080040a4 + 8003ef8: 08004090 .word 0x08004090 + 8003efc: 08004090 .word 0x08004090 + 8003f00: 08004090 .word 0x08004090 + 8003f04: 08004094 .word 0x08004094 08003f08 : 8003f08: 0003 movs r3, r0 diff --git a/fw/Debug/rht_wired_sensor.map b/fw/Debug/rht_wired_sensor.map index 17d49d6..97c9b7c 100644 --- a/fw/Debug/rht_wired_sensor.map +++ b/fw/Debug/rht_wired_sensor.map @@ -1892,7 +1892,7 @@ LOAD /opt/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools- .iplt 0x0000000008003f58 0x0 .iplt 0x0000000008003f58 0x0 /opt/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.linux64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o -.rodata 0x0000000008003f58 0x148 +.rodata 0x0000000008003f58 0x138 0x0000000008003f58 . = ALIGN (0x4) *(.rodata) .rodata 0x0000000008003f58 0x41 ./Core/Src/main.o @@ -1906,63 +1906,63 @@ LOAD /opt/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools- 0x0000000008003fc4 config_baudrates_length *fill* 0x0000000008003fc5 0x3 .rodata.modbus_slave_callback - 0x0000000008003fc8 0x54 ./Core/Src/main.o + 0x0000000008003fc8 0x44 ./Core/Src/main.o .rodata.AHBPrescTable - 0x000000000800401c 0x10 ./Core/Src/system_stm32l0xx.o - 0x000000000800401c AHBPrescTable + 0x000000000800400c 0x10 ./Core/Src/system_stm32l0xx.o + 0x000000000800400c AHBPrescTable .rodata.APBPrescTable - 0x000000000800402c 0x8 ./Core/Src/system_stm32l0xx.o - 0x000000000800402c APBPrescTable + 0x000000000800401c 0x8 ./Core/Src/system_stm32l0xx.o + 0x000000000800401c APBPrescTable .rodata.PLLMulTable - 0x0000000008004034 0x9 ./Core/Src/system_stm32l0xx.o - 0x0000000008004034 PLLMulTable - *fill* 0x000000000800403d 0x3 + 0x0000000008004024 0x9 ./Core/Src/system_stm32l0xx.o + 0x0000000008004024 PLLMulTable + *fill* 0x000000000800402d 0x3 .rodata.modbus_process_read_write_request - 0x0000000008004040 0x60 ./Libs/modbus/modbus.o - 0x00000000080040a0 . = ALIGN (0x4) + 0x0000000008004030 0x60 ./Libs/modbus/modbus.o + 0x0000000008004090 . = ALIGN (0x4) -.rel.dyn 0x00000000080040a0 0x0 - .rel.iplt 0x00000000080040a0 0x0 /opt/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.linux64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o +.rel.dyn 0x0000000008004090 0x0 + .rel.iplt 0x0000000008004090 0x0 /opt/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.linux64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o -.ARM.extab 0x00000000080040a0 0x0 - 0x00000000080040a0 . = ALIGN (0x4) +.ARM.extab 0x0000000008004090 0x0 + 0x0000000008004090 . = ALIGN (0x4) *(.ARM.extab* .gnu.linkonce.armextab.*) - 0x00000000080040a0 . = ALIGN (0x4) + 0x0000000008004090 . = ALIGN (0x4) -.ARM 0x00000000080040a0 0x0 - 0x00000000080040a0 . = ALIGN (0x4) - 0x00000000080040a0 __exidx_start = . +.ARM 0x0000000008004090 0x0 + 0x0000000008004090 . = ALIGN (0x4) + 0x0000000008004090 __exidx_start = . *(.ARM.exidx*) - 0x00000000080040a0 __exidx_end = . - 0x00000000080040a0 . = ALIGN (0x4) + 0x0000000008004090 __exidx_end = . + 0x0000000008004090 . = ALIGN (0x4) -.preinit_array 0x00000000080040a0 0x0 - 0x00000000080040a0 . = ALIGN (0x4) - 0x00000000080040a0 PROVIDE (__preinit_array_start = .) +.preinit_array 0x0000000008004090 0x0 + 0x0000000008004090 . = ALIGN (0x4) + 0x0000000008004090 PROVIDE (__preinit_array_start = .) *(.preinit_array*) - 0x00000000080040a0 PROVIDE (__preinit_array_end = .) - 0x00000000080040a0 . = ALIGN (0x4) + 0x0000000008004090 PROVIDE (__preinit_array_end = .) + 0x0000000008004090 . = ALIGN (0x4) -.init_array 0x00000000080040a0 0x4 - 0x00000000080040a0 . = ALIGN (0x4) - 0x00000000080040a0 PROVIDE (__init_array_start = .) +.init_array 0x0000000008004090 0x4 + 0x0000000008004090 . = ALIGN (0x4) + 0x0000000008004090 PROVIDE (__init_array_start = .) *(SORT_BY_NAME(.init_array.*)) *(.init_array*) - .init_array 0x00000000080040a0 0x4 /opt/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.linux64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o - 0x00000000080040a4 PROVIDE (__init_array_end = .) - 0x00000000080040a4 . = ALIGN (0x4) + .init_array 0x0000000008004090 0x4 /opt/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.linux64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o + 0x0000000008004094 PROVIDE (__init_array_end = .) + 0x0000000008004094 . = ALIGN (0x4) -.fini_array 0x00000000080040a4 0x4 - 0x00000000080040a4 . = ALIGN (0x4) +.fini_array 0x0000000008004094 0x4 + 0x0000000008004094 . = ALIGN (0x4) [!provide] PROVIDE (__fini_array_start = .) *(SORT_BY_NAME(.fini_array.*)) *(.fini_array*) - .fini_array 0x00000000080040a4 0x4 /opt/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.linux64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o + .fini_array 0x0000000008004094 0x4 /opt/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.linux64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o [!provide] PROVIDE (__fini_array_end = .) - 0x00000000080040a8 . = ALIGN (0x4) - 0x00000000080040a8 _sidata = LOADADDR (.data) + 0x0000000008004098 . = ALIGN (0x4) + 0x0000000008004098 _sidata = LOADADDR (.data) -.data 0x0000000020000000 0x8 load address 0x00000000080040a8 +.data 0x0000000020000000 0x8 load address 0x0000000008004098 0x0000000020000000 . = ALIGN (0x4) 0x0000000020000000 _sdata = . *(.data) @@ -1979,11 +1979,11 @@ LOAD /opt/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools- *fill* 0x0000000020000005 0x3 0x0000000020000008 _edata = . -.igot.plt 0x0000000020000008 0x0 load address 0x00000000080040b0 +.igot.plt 0x0000000020000008 0x0 load address 0x00000000080040a0 .igot.plt 0x0000000020000008 0x0 /opt/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.linux64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/crtbegin.o 0x0000000020000008 . = ALIGN (0x4) -.bss 0x0000000020000008 0x174 load address 0x00000000080040b0 +.bss 0x0000000020000008 0x174 load address 0x00000000080040a0 0x0000000020000008 _sbss = . 0x0000000020000008 __bss_start__ = _sbss *(.bss) @@ -2003,7 +2003,7 @@ LOAD /opt/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools- .bss.modbus_address_changed 0x000000002000002b 0x1 ./Core/Src/main.o 0x000000002000002b modbus_address_changed - .bss.new_baud.8665 + .bss.new_baud.8666 0x000000002000002c 0x4 ./Core/Src/main.o .bss.usart2_rx_message_index 0x0000000020000030 0x2 ./Core/Src/stm32l0xx_it.o @@ -2043,7 +2043,7 @@ LOAD /opt/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools- 0x000000002000017c __bss_end__ = _ebss ._user_heap_stack - 0x000000002000017c 0x604 load address 0x00000000080040b0 + 0x000000002000017c 0x604 load address 0x00000000080040a0 0x0000000020000180 . = ALIGN (0x8) *fill* 0x000000002000017c 0x4 [!provide] PROVIDE (end = .) @@ -2120,23 +2120,23 @@ LOAD /opt/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools- LOAD /opt/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.linux64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/../../../../arm-none-eabi/lib/thumb/v6-m/nofp/libm.a LOAD /opt/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.9-2020-q2-update.linux64_2.0.0.202105311346/tools/bin/../lib/gcc/arm-none-eabi/9.3.1/thumb/v6-m/nofp/libgcc.a -.debug_info 0x0000000000000000 0x9636 +.debug_info 0x0000000000000000 0x963d .debug_info 0x0000000000000000 0x576 ./Core/Src/config.o .debug_info 0x0000000000000576 0x4aa ./Core/Src/i2c.o - .debug_info 0x0000000000000a20 0x2d69 ./Core/Src/main.o - .debug_info 0x0000000000003789 0xfb7 ./Core/Src/stm32l0xx_it.o - .debug_info 0x0000000000004740 0x302 ./Core/Src/system_stm32l0xx.o - .debug_info 0x0000000000004a42 0x22 ./Core/Startup/startup_stm32l031g6ux.o - .debug_info 0x0000000000004a64 0x657 ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_gpio.o - .debug_info 0x00000000000050bb 0x668 ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_i2c.o - .debug_info 0x0000000000005723 0x799 ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_rcc.o - .debug_info 0x0000000000005ebc 0xcdc ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_tim.o - .debug_info 0x0000000000006b98 0x6c8 ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_usart.o - .debug_info 0x0000000000007260 0x8c9 ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_utils.o - .debug_info 0x0000000000007b29 0x111 ./Libs/crc8/crc8.o - .debug_info 0x0000000000007c3a 0x63d ./Libs/ltr329/ltr329.o - .debug_info 0x0000000000008277 0x1136 ./Libs/modbus/modbus.o - .debug_info 0x00000000000093ad 0x289 ./Libs/sht4x/sht4x.o + .debug_info 0x0000000000000a20 0x2d70 ./Core/Src/main.o + .debug_info 0x0000000000003790 0xfb7 ./Core/Src/stm32l0xx_it.o + .debug_info 0x0000000000004747 0x302 ./Core/Src/system_stm32l0xx.o + .debug_info 0x0000000000004a49 0x22 ./Core/Startup/startup_stm32l031g6ux.o + .debug_info 0x0000000000004a6b 0x657 ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_gpio.o + .debug_info 0x00000000000050c2 0x668 ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_i2c.o + .debug_info 0x000000000000572a 0x799 ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_rcc.o + .debug_info 0x0000000000005ec3 0xcdc ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_tim.o + .debug_info 0x0000000000006b9f 0x6c8 ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_usart.o + .debug_info 0x0000000000007267 0x8c9 ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_utils.o + .debug_info 0x0000000000007b30 0x111 ./Libs/crc8/crc8.o + .debug_info 0x0000000000007c41 0x63d ./Libs/ltr329/ltr329.o + .debug_info 0x000000000000827e 0x1136 ./Libs/modbus/modbus.o + .debug_info 0x00000000000093b4 0x289 ./Libs/sht4x/sht4x.o .debug_abbrev 0x0000000000000000 0x1d62 .debug_abbrev 0x0000000000000000 0x19a ./Core/Src/config.o @@ -2303,38 +2303,38 @@ LOAD /opt/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools- .debug_line 0x0000000000006ba6 0xa30 ./Libs/modbus/modbus.o .debug_line 0x00000000000075d6 0x40f ./Libs/sht4x/sht4x.o -.debug_str 0x0000000000000000 0x44d2a +.debug_str 0x0000000000000000 0x44d45 .debug_str 0x0000000000000000 0x33679 ./Core/Src/config.o 0x33894 (size before relaxing) .debug_str 0x0000000000033679 0x124c ./Core/Src/i2c.o 0x33e09 (size before relaxing) - .debug_str 0x00000000000348c5 0xc96b ./Core/Src/main.o - 0x414fd (size before relaxing) - .debug_str 0x0000000000041230 0x175 ./Core/Src/stm32l0xx_it.o + .debug_str 0x00000000000348c5 0xc986 ./Core/Src/main.o + 0x41518 (size before relaxing) + .debug_str 0x000000000004124b 0x175 ./Core/Src/stm32l0xx_it.o 0x3fe14 (size before relaxing) - .debug_str 0x00000000000413a5 0x61 ./Core/Src/system_stm32l0xx.o + .debug_str 0x00000000000413c0 0x61 ./Core/Src/system_stm32l0xx.o 0x31c42 (size before relaxing) - .debug_str 0x0000000000041406 0x36 ./Core/Startup/startup_stm32l031g6ux.o + .debug_str 0x0000000000041421 0x36 ./Core/Startup/startup_stm32l031g6ux.o 0x84 (size before relaxing) - .debug_str 0x000000000004143c 0x586 ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_gpio.o + .debug_str 0x0000000000041457 0x586 ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_gpio.o 0x32dbc (size before relaxing) - .debug_str 0x00000000000419c2 0x3ed ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_i2c.o + .debug_str 0x00000000000419dd 0x3ed ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_i2c.o 0x33507 (size before relaxing) - .debug_str 0x0000000000041daf 0x511 ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_rcc.o + .debug_str 0x0000000000041dca 0x511 ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_rcc.o 0x33a57 (size before relaxing) - .debug_str 0x00000000000422c0 0xdf1 ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_tim.o + .debug_str 0x00000000000422db 0xdf1 ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_tim.o 0x35bfb (size before relaxing) - .debug_str 0x00000000000430b1 0x7dd ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_usart.o + .debug_str 0x00000000000430cc 0x7dd ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_usart.o 0x35310 (size before relaxing) - .debug_str 0x000000000004388e 0xcb3 ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_utils.o + .debug_str 0x00000000000438a9 0xcb3 ./Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_ll_utils.o 0x35184 (size before relaxing) - .debug_str 0x0000000000044541 0x70 ./Libs/crc8/crc8.o + .debug_str 0x000000000004455c 0x70 ./Libs/crc8/crc8.o 0x3d6b (size before relaxing) - .debug_str 0x00000000000445b1 0x2ae ./Libs/ltr329/ltr329.o + .debug_str 0x00000000000445cc 0x2ae ./Libs/ltr329/ltr329.o 0x331de (size before relaxing) - .debug_str 0x000000000004485f 0x311 ./Libs/modbus/modbus.o + .debug_str 0x000000000004487a 0x311 ./Libs/modbus/modbus.o 0x7ef4 (size before relaxing) - .debug_str 0x0000000000044b70 0x1ba ./Libs/sht4x/sht4x.o + .debug_str 0x0000000000044b8b 0x1ba ./Libs/sht4x/sht4x.o 0x3f32 (size before relaxing) .comment 0x0000000000000000 0x53 diff --git a/fw/Libs/ltr329 b/fw/Libs/ltr329 index a937c1c..05ed8c2 160000 --- a/fw/Libs/ltr329 +++ b/fw/Libs/ltr329 @@ -1 +1 @@ -Subproject commit a937c1c08bba3e7e199d632a78cd34a2bbfec24f +Subproject commit 05ed8c25c956c210948ef9f80cf9b78bd90014d4