From 104e3a79f6ecb1e0145caaa9afa16f18bbb64061 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1PDT1EL\\10564" <1056470187@qq.com>
Date: Mon, 12 Oct 2026 09:55:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=8A=E4=B8=8B=E8=BF=90?=
=?UTF-8?q?=E5=8A=A8=E6=96=B9=E5=90=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.cproject | 7 +-
Core/Src/app.c | 11 +-
Debug/Core/Src/app.o | Bin 824924 -> 824924 bytes
Debug/Core/Src/app.su | 10 +-
Debug/g031_JIECANG_JC35W8.elf | Bin 1098888 -> 1098884 bytes
Debug/g031_JIECANG_JC35W8.hex | 1875 ++++++++++++++++++++++++++++++++
Debug/g031_JIECANG_JC35W8.list | 26 +-
Debug/g031_JIECANG_JC35W8.map | 50 +-
Debug/makefile | 12 +-
Debug/sources.mk | 1 +
10 files changed, 1940 insertions(+), 52 deletions(-)
create mode 100644 Debug/g031_JIECANG_JC35W8.hex
diff --git a/.cproject b/.cproject
index 07cf462..8f31257 100644
--- a/.cproject
+++ b/.cproject
@@ -22,11 +22,12 @@
+
-
-
+
@@ -53,7 +54,7 @@
-
+
diff --git a/Core/Src/app.c b/Core/Src/app.c
index a21d152..00d0ae8 100644
--- a/Core/Src/app.c
+++ b/Core/Src/app.c
@@ -120,15 +120,16 @@ static void App_UpdateMotor(void)
if (up != 0)
{
/* 正转：IO_1 高，IO_2 低 */
- HAL_GPIO_WritePin(IO_1_GPIO_Port, IO_1_Pin, GPIO_PIN_RESET);
- HAL_GPIO_WritePin(IO_2_GPIO_Port, IO_2_Pin, GPIO_PIN_SET);
+
+
+ HAL_GPIO_WritePin(IO_1_GPIO_Port, IO_1_Pin, GPIO_PIN_SET);
+ HAL_GPIO_WritePin(IO_2_GPIO_Port, IO_2_Pin, GPIO_PIN_RESET);
}
else if (down != 0)
{
- HAL_GPIO_WritePin(IO_1_GPIO_Port, IO_1_Pin, GPIO_PIN_SET);
- HAL_GPIO_WritePin(IO_2_GPIO_Port, IO_2_Pin, GPIO_PIN_RESET);
/* 反转：IO_1 低，IO_2 高 */
-
+ HAL_GPIO_WritePin(IO_1_GPIO_Port, IO_1_Pin, GPIO_PIN_RESET);
+ HAL_GPIO_WritePin(IO_2_GPIO_Port, IO_2_Pin, GPIO_PIN_SET);
}
else
{
diff --git a/Debug/Core/Src/app.o b/Debug/Core/Src/app.o
index 57baff3b412092a789a426b1c0eb649464e36f79..7a8ee21088a75016e6c80fc72142dda500fd61f4 100644
GIT binary patch
delta 545
zcmYk3&1(};6vfY(nKw!5WC~M4YyC>n*se-(RxQ~TSM92xR4bxFK!svUNv4}Z0}9c
z7yqVGH)qa(Pve_X*2*&?UGP~bZ#n)CF@7G-%{v=cMQ;7uYHmlidJ)PS&e3rLd>P6d
z`kMC@xZ2)oSnOHLy#1(wRmoJegfs9c-fU0JBlCMoj7$Hu-jfR?U;mVKOSiL$Ae*2)
z$?jlmn$_r#d083P6?HqW;(9)*%u7lay`W+zBzT$yQV~iMd*~&JA#$nBk6i-J1UQL9Qf9Xr+{co
kVj37~#nbW!LDRD$Cwa{O{JFaTTtjK
zXpCi2h{av0My-g93zuCLBs(?Qji6xr4-^+#?}Sl&@Z-L7@8#V4-gej9?s^-OMivF;
zhp@l*d;iJU7sb|D<4|kT7<#>E+{-TX5|Fbfu=6+rxaELg&s(totvQ{ayD|@cu)j-#
z*1Y9hD4XENSk5>j_Y>eJ`~9HmqwsA{^qSZJKLmC>8*qMBb#Ofwc_=-qIhA=C@^r*b
zEc{L7Z_Jj!ZswVkwdSly4}2cWn@+GJ#xLTzHD~>@$d~`Nn%k7EHez|*8J;r0SFxPN
zSpT5{R|i|25_@)v?>=i_AeokybH-OP{lU~4iodF2-1x8cfjq!{vn%U1?v`_5IY+y~
z;qc51+sTr7QR&wd^=wUL^xLjVR+Sy;bWNp3<>G4=NJS`320(8F2kR^{2u{}Nay6*b
zd7Nv(ojTvLw>05X&;(sD1SKQ{Q%DM_aKcYtI=9r`N{8*O18z6JnUwE34D3YlD3DG`
jEC8h_9s_p6zHgaFI2wF?WKHpEaAMgS=jrhLvSsoQEQWvR
diff --git a/Debug/Core/Src/app.su b/Debug/Core/Src/app.su
index 10a550f..e14ecf9 100644
--- a/Debug/Core/Src/app.su
+++ b/Debug/Core/Src/app.su
@@ -1,8 +1,8 @@
../Core/Src/app.c:40:6:App_Init 8 static
../Core/Src/app.c:69:6:App_Process 8 static
../Core/Src/app.c:88:13:App_UpdateMotor 32 static
-../Core/Src/app.c:141:13:App_SetCurrentLimit 16 static
-../Core/Src/app.c:151:13:App_UpdateEncoderRegister 16 static
-../Core/Src/app.c:158:13:App_ProcessZeroCommand 8 static
-../Core/Src/app.c:167:13:App_UpdateLed 32 static
-../Core/Src/app.c:207:6:HAL_ADC_ConvCpltCallback 32 static
+../Core/Src/app.c:142:13:App_SetCurrentLimit 16 static
+../Core/Src/app.c:152:13:App_UpdateEncoderRegister 16 static
+../Core/Src/app.c:159:13:App_ProcessZeroCommand 8 static
+../Core/Src/app.c:168:13:App_UpdateLed 32 static
+../Core/Src/app.c:208:6:HAL_ADC_ConvCpltCallback 32 static
diff --git a/Debug/g031_JIECANG_JC35W8.elf b/Debug/g031_JIECANG_JC35W8.elf
index c5618c4778498f668ae1b47d14182bbbf72ce4f9..e1c199f750da25e453470c191615aeb0d34f62d3 100644
GIT binary patch
delta 1111
zcmYjQZERCj7=GXP?ws3}-rJ_LY+{Amwaz&gr8p7eAHx=KY_l0bi4JgMEP#%WEd@V<
zn?_6>y2*^=R5DY@FsR^Q8uLzqiOaz3hr&#VNHoEZ7(!x+^zy&wP$ZHf1^KM#1>{arWE(C)~)kL&6WMcEYz7G>2^TFddG+!mQ=)bi7!+yaTaOm{l(?Dv6hh2D=N$$>T6$~haf
zQ&n)Dbphg?J39amJ68%BGLSrD1_zzw{Mi-l%yvuIjZ;n(W+8;im8hZRjS6-6yp9WDtBa8Ex-$#Of8|_Iz(+;y__79
zJ~?~|z}aWo4)f(d=_ql>
z6kV#8rD23v@4Wxw?U?2kpY>$}PG>`FEe@?M89JjM_h?WoA^o_MuHobSOIU0o9OXw#
z#hZj({7qCu3CH=@GE*OAS|p@-7Jtm>>wM2*!!6w4iE6_2oT)H8$N8j)kXwEL!1f5h
z0?SIPpIuSQe^-k0h*|!k%4}N5UsVf-u$wQ`h^3_O_uqYDCF%REOo_#W!`%LWa0yF!
z_k$ux`W7!gBvORaeClCw!*7=b%<@(0^xMMYi*=&McfZ^yO128L+>CInj3;EPu(aMM
z{C8^FOF=*s2!hO4XAP>JCXvLPQcc3cyqahdmHLOe+9W1$CYx&(8dAg7@M-up0vZc6
zf*Ov7%em%|JEz(n3*W|P>%-H%IICWt3McS0_0d%LZd|9nGjvSdFjS)A=L%+np?6gG
Hxp3M48YME7
delta 1114
zcmYjQZEO@(6utKjZ)SGcncXZ|Tj~O{-KEyr7#1sH^oOC9Qrg-8N-RZaDGi{uRJ-6u
zw3SFw7hOXW*(apXlDN@gEgFKi5>0Fh#xz3z5YPw#HHIG;V`7?GL!$3(HVr>c&YW{U
z=De4ggX!vb($$AO96k^`8^ZxB2&EV+2IH^jKg02#1F
zJ#BvE1N$uiz`^4VfcIgY4{&JAT1^HswujP;K
z#e8)?l(uO7v0QO4Mfye}dPo?}
zl~w&?h4-Ywml~BkJ)gp8Qu6bH+#MdTSMrO3+zIjJy1VIwbI=BRwc3w^iOhOsNoT8a
z%Ja_iEo~36qa#56iLyKpl)NkNA?(?W>fjQy<
zWSZr~D8>0&f;JmwPVN7rMJ9(RDyJPPll8R}$w&0ICW*pB(e?YzE*E)YJ)p;~Hk@iwc|*4yI}wn8|BJ$$KBtRQv1{~i=;NS$v@QYQ1RBAVaEu;L*jt3FwLc|%
zOVq=D3IL)&5TrjmBO|*TL;|He(jYuMA-`-8W$K^0-XO+tx
{
/* 正转：IO_1 高，IO_2 低 */
- HAL_GPIO_WritePin(IO_1_GPIO_Port, IO_1_Pin, GPIO_PIN_RESET);
+
+
+ HAL_GPIO_WritePin(IO_1_GPIO_Port, IO_1_Pin, GPIO_PIN_SET);
80007b0: 4b1b ldr r3, [pc, #108] ; (8000820 )
- 80007b2: 2200 movs r2, #0
+ 80007b2: 2201 movs r2, #1
80007b4: 2101 movs r1, #1
80007b6: 0018 movs r0, r3
80007b8: f003 f81c bl 80037f4
- HAL_GPIO_WritePin(IO_2_GPIO_Port, IO_2_Pin, GPIO_PIN_SET);
+ HAL_GPIO_WritePin(IO_2_GPIO_Port, IO_2_Pin, GPIO_PIN_RESET);
80007bc: 23a0 movs r3, #160 ; 0xa0
80007be: 05db lsls r3, r3, #23
- 80007c0: 2201 movs r2, #1
+ 80007c0: 2200 movs r2, #0
80007c2: 2180 movs r1, #128 ; 0x80
80007c4: 0018 movs r0, r3
80007c6: f003 f815 bl 80037f4
@@ -1113,16 +1115,16 @@ static void App_UpdateMotor(void)
80007d0: 781b ldrb r3, [r3, #0]
80007d2: 2b00 cmp r3, #0
80007d4: d00d beq.n 80007f2
- HAL_GPIO_WritePin(IO_1_GPIO_Port, IO_1_Pin, GPIO_PIN_SET);
+ HAL_GPIO_WritePin(IO_1_GPIO_Port, IO_1_Pin, GPIO_PIN_RESET);
80007d6: 4b12 ldr r3, [pc, #72] ; (8000820 )
- 80007d8: 2201 movs r2, #1
+ 80007d8: 2200 movs r2, #0
80007da: 2101 movs r1, #1
80007dc: 0018 movs r0, r3
80007de: f003 f809 bl 80037f4
- HAL_GPIO_WritePin(IO_2_GPIO_Port, IO_2_Pin, GPIO_PIN_RESET);
+ HAL_GPIO_WritePin(IO_2_GPIO_Port, IO_2_Pin, GPIO_PIN_SET);
80007e2: 23a0 movs r3, #160 ; 0xa0
80007e4: 05db lsls r3, r3, #23
- 80007e6: 2200 movs r2, #0
+ 80007e6: 2201 movs r2, #1
80007e8: 2180 movs r1, #128 ; 0x80
80007ea: 0018 movs r0, r3
80007ec: f003 f802 bl 80037f4
diff --git a/Debug/g031_JIECANG_JC35W8.map b/Debug/g031_JIECANG_JC35W8.map
index 0aed46a..e1cc515 100644
--- a/Debug/g031_JIECANG_JC35W8.map
+++ b/Debug/g031_JIECANG_JC35W8.map
@@ -5016,32 +5016,32 @@ LOAD d:/st/stm32cubeide_1.10.1/stm32cubeide/plugins/com.st.stm32cube.ide.mcu.ext
.debug_macro 0x0000000000018029 0x232 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_uart.o
.debug_macro 0x000000000001825b 0x213 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_uart_ex.o
-.debug_line 0x0000000000000000 0x16ff7
+.debug_line 0x0000000000000000 0x16ff5
.debug_line 0x0000000000000000 0x7ea ./Core/Src/adc.o
- .debug_line 0x00000000000007ea 0xa1d ./Core/Src/app.o
- .debug_line 0x0000000000001207 0x741 ./Core/Src/dma.o
- .debug_line 0x0000000000001948 0x761 ./Core/Src/gpio.o
- .debug_line 0x00000000000020a9 0x7fc ./Core/Src/main.o
- .debug_line 0x00000000000028a5 0xbc9 ./Core/Src/modbus.o
- .debug_line 0x000000000000346e 0x745 ./Core/Src/stm32g0xx_hal_msp.o
- .debug_line 0x0000000000003bb3 0x7f2 ./Core/Src/stm32g0xx_it.o
- .debug_line 0x00000000000043a5 0x7b8 ./Core/Src/system_stm32g0xx.o
- .debug_line 0x0000000000004b5d 0x88e ./Core/Src/tim.o
- .debug_line 0x00000000000053eb 0x7df ./Core/Src/usart.o
- .debug_line 0x0000000000005bca 0x89 ./Core/Startup/startup_stm32g031g8ux.o
- .debug_line 0x0000000000005c53 0xb06 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal.o
- .debug_line 0x0000000000006759 0x18a0 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_adc.o
- .debug_line 0x0000000000007ff9 0xa21 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_adc_ex.o
- .debug_line 0x0000000000008a1a 0xb6f ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_cortex.o
- .debug_line 0x0000000000009589 0xd8f ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_dma.o
- .debug_line 0x000000000000a318 0xb5b ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_gpio.o
- .debug_line 0x000000000000ae73 0xad3 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_pwr_ex.o
- .debug_line 0x000000000000b946 0xf19 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_rcc.o
- .debug_line 0x000000000000c85f 0xc38 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_rcc_ex.o
- .debug_line 0x000000000000d497 0x3b7e ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_tim.o
- .debug_line 0x0000000000011015 0x1c3c ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_tim_ex.o
- .debug_line 0x0000000000012c51 0x3579 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_uart.o
- .debug_line 0x00000000000161ca 0xe2d ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_uart_ex.o
+ .debug_line 0x00000000000007ea 0xa1b ./Core/Src/app.o
+ .debug_line 0x0000000000001205 0x741 ./Core/Src/dma.o
+ .debug_line 0x0000000000001946 0x761 ./Core/Src/gpio.o
+ .debug_line 0x00000000000020a7 0x7fc ./Core/Src/main.o
+ .debug_line 0x00000000000028a3 0xbc9 ./Core/Src/modbus.o
+ .debug_line 0x000000000000346c 0x745 ./Core/Src/stm32g0xx_hal_msp.o
+ .debug_line 0x0000000000003bb1 0x7f2 ./Core/Src/stm32g0xx_it.o
+ .debug_line 0x00000000000043a3 0x7b8 ./Core/Src/system_stm32g0xx.o
+ .debug_line 0x0000000000004b5b 0x88e ./Core/Src/tim.o
+ .debug_line 0x00000000000053e9 0x7df ./Core/Src/usart.o
+ .debug_line 0x0000000000005bc8 0x89 ./Core/Startup/startup_stm32g031g8ux.o
+ .debug_line 0x0000000000005c51 0xb06 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal.o
+ .debug_line 0x0000000000006757 0x18a0 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_adc.o
+ .debug_line 0x0000000000007ff7 0xa21 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_adc_ex.o
+ .debug_line 0x0000000000008a18 0xb6f ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_cortex.o
+ .debug_line 0x0000000000009587 0xd8f ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_dma.o
+ .debug_line 0x000000000000a316 0xb5b ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_gpio.o
+ .debug_line 0x000000000000ae71 0xad3 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_pwr_ex.o
+ .debug_line 0x000000000000b944 0xf19 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_rcc.o
+ .debug_line 0x000000000000c85d 0xc38 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_rcc_ex.o
+ .debug_line 0x000000000000d495 0x3b7e ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_tim.o
+ .debug_line 0x0000000000011013 0x1c3c ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_tim_ex.o
+ .debug_line 0x0000000000012c4f 0x3579 ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_uart.o
+ .debug_line 0x00000000000161c8 0xe2d ./Drivers/STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_uart_ex.o
.debug_str 0x0000000000000000 0x998a1
.debug_str 0x0000000000000000 0x948b1 ./Core/Src/adc.o
diff --git a/Debug/makefile b/Debug/makefile
index ab8fea1..043fac5 100644
--- a/Debug/makefile
+++ b/Debug/makefile
@@ -52,6 +52,9 @@ default.size.stdout \
OBJDUMP_LIST += \
g031_JIECANG_JC35W8.list \
+OBJCOPY_HEX += \
+g031_JIECANG_JC35W8.hex \
+
# All Target
all: main-build
@@ -75,12 +78,17 @@ g031_JIECANG_JC35W8.list: $(EXECUTABLES) makefile objects.list $(OPTIONAL_TOOL_D
@echo 'Finished building: $@'
@echo ' '
+g031_JIECANG_JC35W8.hex: $(EXECUTABLES) makefile objects.list $(OPTIONAL_TOOL_DEPS)
+ arm-none-eabi-objcopy -O ihex $(EXECUTABLES) "g031_JIECANG_JC35W8.hex"
+ @echo 'Finished building: $@'
+ @echo ' '
+
# Other Targets
clean:
- -$(RM) default.size.stdout g031_JIECANG_JC35W8.elf g031_JIECANG_JC35W8.list g031_JIECANG_JC35W8.map
+ -$(RM) default.size.stdout g031_JIECANG_JC35W8.elf g031_JIECANG_JC35W8.hex g031_JIECANG_JC35W8.list g031_JIECANG_JC35W8.map
-@echo ' '
-secondary-outputs: $(SIZE_OUTPUT) $(OBJDUMP_LIST)
+secondary-outputs: $(SIZE_OUTPUT) $(OBJDUMP_LIST) $(OBJCOPY_HEX)
fail-specified-linker-script-missing:
@echo 'Error: Cannot find the specified linker script. Check the linker settings in the build configuration.'
diff --git a/Debug/sources.mk b/Debug/sources.mk
index 3cccd04..22ef594 100644
--- a/Debug/sources.mk
+++ b/Debug/sources.mk
@@ -9,6 +9,7 @@ S_SRCS :=
C_SRCS :=
S_UPPER_SRCS :=
O_SRCS :=
+OBJCOPY_HEX :=
SIZE_OUTPUT :=
OBJDUMP_LIST :=
SU_FILES :=