From 2038a1aa9d7048032e3bbfdc7fcb30793d2eb1c9 Mon Sep 17 00:00:00 2001 From: Marcel Date: Tue, 19 Dec 2023 21:00:57 +0100 Subject: [PATCH] Fixed inverted digital output pin --- CHANGELOG.md | 5 +++++ build/src/CMakeFiles/main.dir/main.cpp.obj | Bin 46676 -> 46676 bytes build/src/main.bin | Bin 81388 -> 81388 bytes build/src/main.dis | 6 +++--- build/src/main.elf | Bin 142176 -> 142176 bytes build/src/main.elf.map | 12 ++++++------ build/src/main.hex | 6 +++--- build/src/main.uf2 | Bin 162816 -> 162816 bytes src/main.cpp | 6 +++--- 9 files changed, 20 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9779f9b..9c34dc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,3 +52,8 @@ First (more or less) working version. ### Fixed - Struct for saving settings to FLASH is now 256 bytes excactly (problem with padding done by the compiler) + +## [1.1.1] - 2023-12-19 + +### Fixed +- One of the digital outputs was inverted. diff --git a/build/src/CMakeFiles/main.dir/main.cpp.obj b/build/src/CMakeFiles/main.dir/main.cpp.obj index 4a6b85b8d993235496bb46a75d04adc26f52b986..f4f920e10cebd9f0c3980a2d7a33e6a68068b8de 100644 GIT binary patch delta 41 zcmV+^0M`H1>;ly60;ly60 diff --git a/build/src/main.bin b/build/src/main.bin index 09057b870c0317ac808355bdf124e24895f4686a..0e12a47fb38d98057caa44d05cc1c494e189846e 100755 GIT binary patch delta 45 zcmV+|0Mh^L`vmO!1hDu80i(0|1veiPT44brT1Jy_|M#Z*&?68c8wQ$#LnXIEB>|}z D=m!%A delta 45 zcmV+|0Mh^L`vmO!1hDu80b{fI1veiPnqdJWT1Jy_|M#Z*&?68c8wOf~LnXIEB>|}z D @@ -4252,7 +4252,7 @@ Disassembly of section .text: 1000252a: 23d0 movs r3, #208 ; 0xd0 1000252c: 2210 movs r2, #16 1000252e: 061b lsls r3, r3, #24 -10002530: 619a str r2, [r3, #24] +10002530: 615a str r2, [r3, #20] 10002532: 2301 movs r3, #1 10002534: 465a mov r2, fp 10002536: 7093 strb r3, [r2, #2] @@ -4260,7 +4260,7 @@ Disassembly of section .text: 1000253c: 23d0 movs r3, #208 ; 0xd0 1000253e: 2210 movs r2, #16 10002540: 061b lsls r3, r3, #24 -10002542: 615a str r2, [r3, #20] +10002542: 619a str r2, [r3, #24] 10002544: 2300 movs r3, #0 10002546: 465a mov r2, fp 10002548: 7093 strb r3, [r2, #2] diff --git a/build/src/main.elf b/build/src/main.elf index d3bf26f2e00c3c2b73c7a1e3e2ffdfe8cfb3a6c7..624cd1ee91ce400b90820d2a442a500fad1dd634 100755 GIT binary patch delta 58 zcmV-A0LA~{)(GI%2(b7S0i(0|6*nIfT44brT1Jy_|M#Z*&?68c8wQ$#Lp8TUH322Q Q22XHSNl|gPZu0^1H})PFcK`qY delta 58 zcmV-A0LA~{)(GI%2(b7S0b{fI6*nIfnqdJWT1Jy_|M#Z*&?68c8wOf~Lp8TUH322Q Q22)IOMloWyZu0^1H|*9J0RR91 diff --git a/build/src/main.elf.map b/build/src/main.elf.map index 9dbdcee..b0b1f01 100644 --- a/build/src/main.elf.map +++ b/build/src/main.elf.map @@ -1424,9 +1424,9 @@ Discarded input sections 0x00000000 0xc libi2c_sensor.a(i2c_sensor.cpp.obj) .ARM.exidx.text._Z8reg_readP8i2c_instjhPhh 0x00000000 0x8 libi2c_sensor.a(i2c_sensor.cpp.obj) - .text 0x00000000 0x0 /tmp/ccSLrF1b.o - .data 0x00000000 0x0 /tmp/ccSLrF1b.o - .bss 0x00000000 0x0 /tmp/ccSLrF1b.o + .text 0x00000000 0x0 /tmp/ccOpVIQq.o + .data 0x00000000 0x0 /tmp/ccOpVIQq.o + .bss 0x00000000 0x0 /tmp/ccOpVIQq.o .data 0x00000000 0x0 /usr/lib/gcc/arm-none-eabi/7.3.1/thumb/v6-m/libgcc.a(_dvmd_tls.o) .bss 0x00000000 0x0 /usr/lib/gcc/arm-none-eabi/7.3.1/thumb/v6-m/libgcc.a(_dvmd_tls.o) .data 0x00000000 0x0 /usr/lib/gcc/arm-none-eabi/7.3.1/thumb/v6-m/libgcc.a(unwind-arm.o) @@ -1748,7 +1748,7 @@ LOAD /usr/lib/gcc/arm-none-eabi/7.3.1/../../../arm-none-eabi/lib/thumb/v6-m/crt0 .boot2 0x10000000 0x100 0x10000000 __boot2_start__ = . *(.boot2) - .boot2 0x10000000 0x100 /tmp/ccSLrF1b.o + .boot2 0x10000000 0x100 /tmp/ccOpVIQq.o 0x10000100 __boot2_end__ = . 0x00000001 ASSERT (((__boot2_end__ - __boot2_start__) == 0x100), ERROR: Pico second stage bootloader must be 256 bytes in size) @@ -3336,7 +3336,7 @@ LOAD libLoRa_pico_lib.a LOAD libLoRa_print.a LOAD libKISS.a LOAD libi2c_sensor.a -LOAD /tmp/ccSLrF1b.o +LOAD /tmp/ccOpVIQq.o LOAD /usr/lib/gcc/arm-none-eabi/7.3.1/../../../arm-none-eabi/lib/thumb/v6-m/libstdc++.a LOAD /usr/lib/gcc/arm-none-eabi/7.3.1/../../../arm-none-eabi/lib/thumb/v6-m/libm.a START GROUP @@ -3461,7 +3461,7 @@ OUTPUT(main.elf elf32-littlearm) .ARM.attributes 0x0000096e 0x32 libi2c_sensor.a(i2c_sensor.cpp.obj) .ARM.attributes - 0x000009a0 0x22 /tmp/ccSLrF1b.o + 0x000009a0 0x22 /tmp/ccOpVIQq.o .ARM.attributes 0x000009c2 0x1e /usr/lib/gcc/arm-none-eabi/7.3.1/thumb/v6-m/libgcc.a(_dvmd_tls.o) .ARM.attributes diff --git a/build/src/main.hex b/build/src/main.hex index 2859ddd..936cbd2 100644 --- a/build/src/main.hex +++ b/build/src/main.hex @@ -94,7 +94,7 @@ :1005C000042005F02BF8022005F028F8032005F0A0 :1005D00025F80820D02440212022102300260427BB :1005E0008046240661626262636267626062A16142 -:1005F000F2302E70A2616E706361AE70676105F0BB +:1005F000F2302E70A2616E70A361AE70676105F07B :100600007FFC4346A7614648A361EE7005F078FC85 :100610004448FFF713FF0FF011FD434B002800D0B3 :100620006FE018704148FFF709FF414D2B681B78B8 @@ -594,8 +594,8 @@ :1025000003F0FEFC01235A46A561D370FFF7BCFB24 :10251000D024042524066561FA2003F0F1FC002391 :102520005A46A561D370FFF7AFFBD02310221B06DC -:102530009A6101235A469370FFF7A6FBD02310221D -:102540001B065A6100235A469370FFF79DFBD02368 +:102530005A6101235A469370FFF7A6FBD02310225D +:102540001B069A6100235A469370FFF79DFBD02328 :1025500020221B065A6101235A465370FFF794FB51 :10256000C8110110A00E0110D02320221B069A6171 :1025700000235A465370FFF787FBD02340221B06E7 diff --git a/build/src/main.uf2 b/build/src/main.uf2 index a84a1d1733ee3a9f8d7cb3ee115e802a68196a78..89d8af531db6d44766fb436ba4053c24c5a90af8 100644 GIT binary patch delta 60 zcmV-C0K@-)_z8gc39uLo2%}-HaA#o!@RK0{+q3%%RX!71VF4prMw4*=_on;MBM>4R S2AYFoN{3@g0k>mH0-Z4cTNpk7 delta 60 zcmV-C0K@-)_z8gc39uLo2xDQcaA#o!@RK0{+q3%%RX!7%VF4prMw4*=_on;MBM>4R S23mt-N{3@g0k>mH0-Z7VOc(wD diff --git a/src/main.cpp b/src/main.cpp index 540c58b..3f88859 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -188,7 +188,7 @@ void setup(void) Status.PowerSupply24V = OFF; gpio_put(PowerSupply12VControl, 0); Status.PowerSupply12V = OFF; - gpio_put(PowerSupply5VControl, 1); + gpio_put(PowerSupply5VControl, 0); Status.PowerSupply5V = OFF; gpio_put(RelayOffControl, 1); @@ -715,12 +715,12 @@ int main() { break; // Switch off 5V power supply case 34 : - gpio_put(PowerSupply5VControl, 1); + gpio_put(PowerSupply5VControl, 0); Status.PowerSupply5V = OFF; break; // Switch on 5V power supply case 35 : - gpio_put(PowerSupply5VControl, 0); + gpio_put(PowerSupply5VControl, 1); Status.PowerSupply5V = ON; break; // Switch off relay