Small changes

This commit is contained in:
Merrick 2019-11-21 14:54:40 -05:00
parent 095897e35a
commit 722622862c
14 changed files with 26471 additions and 26468 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

Binary file not shown.

View file

@ -1,6 +1,6 @@
############################################################################### ###############################################################################
# #
# IAR ELF Linker V8.32.2.178/W32 for ARM 12/Nov/2019 17:41:06 # IAR ELF Linker V8.32.2.178/W32 for ARM 13/Nov/2019 10:02:23
# Copyright 2007-2018 IAR Systems AB. # Copyright 2007-2018 IAR Systems AB.
# #
# Output file = # Output file =
@ -8,7 +8,7 @@
# Map file = # Map file =
# C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\List\Press.map # C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\List\Press.map
# Command line = # Command line =
# -f C:\Users\Maxunm\AppData\Local\Temp\EW7DEE.tmp # -f C:\Users\Maxunm\AppData\Local\Temp\EWD0F6.tmp
# (C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\main.o # (C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\main.o
# C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\startup_stm32f429xx.o # C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\startup_stm32f429xx.o
# C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal.o # C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal.o
@ -76,54 +76,53 @@ initialize by copy { rw };
.intvec ro code 0x800'0000 0x1ac startup_stm32f429xx.o [1] .intvec ro code 0x800'0000 0x1ac startup_stm32f429xx.o [1]
- 0x800'01ac 0x1ac - 0x800'01ac 0x1ac
"P1": 0x2530 "P1": 0x2534
.text ro code 0x800'01ac 0x4d4 stm32f4xx_hal_adc.o [1] .text ro code 0x800'01ac 0x4d4 stm32f4xx_hal_adc.o [1]
.text ro code 0x800'0680 0x12c stm32f4xx_hal_msp.o [1] .text ro code 0x800'0680 0x12c stm32f4xx_hal_msp.o [1]
.text ro code 0x800'07ac 0x44c main.o [1] .text ro code 0x800'07ac 0x450 main.o [1]
.text ro code 0x800'0bf8 0x2 stm32f4xx_hal_adc_ex.o [1] .text ro code 0x800'0bfc 0x2 stm32f4xx_hal_adc_ex.o [1]
.text ro code 0x800'0bfa 0x2 stm32f4xx_hal_adc.o [1] .text ro code 0x800'0bfe 0x2 stm32f4xx_hal_adc.o [1]
.text ro code 0x800'0bfc 0x2 stm32f4xx_hal_adc.o [1] .text ro code 0x800'0c00 0x2 stm32f4xx_hal_adc.o [1]
.text ro code 0x800'0bfe 0x3a zero_init3.o [4] .text ro code 0x800'0c02 0x3a zero_init3.o [4]
.text ro code 0x800'0c38 0x1f4 stm32f4xx_hal_gpio.o [1] .text ro code 0x800'0c3c 0x1f4 stm32f4xx_hal_gpio.o [1]
.text ro code 0x800'0e2c 0xc4 stm32f4xx_hal_cortex.o [1] .text ro code 0x800'0e30 0xc4 stm32f4xx_hal_cortex.o [1]
.text ro code 0x800'0ef0 0x6 ABImemclr4.o [4] .text ro code 0x800'0ef4 0x6 ABImemclr4.o [4]
.text ro code 0x800'0ef8 0x34 stm32f4xx_hal.o [1] .text ro code 0x800'0efc 0x34 stm32f4xx_hal.o [1]
.text ro code 0x800'0f2c 0x392 stm32f4xx_hal_tim.o [1] .text ro code 0x800'0f30 0x392 stm32f4xx_hal_tim.o [1]
.text ro code 0x800'12c0 0x4a stm32f4xx_hal_tim_ex.o [1] .text ro code 0x800'12c4 0x4a stm32f4xx_hal_tim_ex.o [1]
.text ro code 0x800'130c 0x28 stm32f4xx_hal.o [1] .text ro code 0x800'1310 0x28 stm32f4xx_hal.o [1]
.text ro code 0x800'1334 0x2f8 stm32f4xx_hal_rcc.o [1] .text ro code 0x800'1338 0x2f8 stm32f4xx_hal_rcc.o [1]
.text ro code 0x800'162c 0x17c stm32f4xx_hal_rcc.o [1] .text ro code 0x800'1630 0x17c stm32f4xx_hal_rcc.o [1]
.text ro code 0x800'17a8 0x1a U32ToDbl.o [3] .text ro code 0x800'17ac 0x1a U32ToDbl.o [3]
.text ro code 0x800'17c4 0x246 DblDiv.o [3] .text ro code 0x800'17c8 0x246 DblDiv.o [3]
.text ro code 0x800'1a0c 0x17a DblAdd.o [3] .text ro code 0x800'1a10 0x17a DblAdd.o [3]
.text ro code 0x800'1b88 0x12 math_wrappers64.o [3] .text ro code 0x800'1b8c 0x12 math_wrappers64.o [3]
.text ro code 0x800'1b9c 0x1a2 DblMul.o [3] .text ro code 0x800'1ba0 0x1a2 DblMul.o [3]
.text ro code 0x800'1d40 0xc stm32f4xx_hal.o [1] .text ro code 0x800'1d44 0xc stm32f4xx_hal.o [1]
.text ro code 0x800'1d4c 0xe2 DblSub.o [3] .text ro code 0x800'1d50 0xe2 DblSub.o [3]
.text ro code 0x800'1e30 0x2e DblCmpLe.o [3] .text ro code 0x800'1e34 0x2e DblCmpLe.o [3]
.text ro code 0x800'1e60 0x3a DblToS32.o [3] .text ro code 0x800'1e64 0x3a DblToS32.o [3]
.text ro code 0x800'1e9c 0x32 ABImemset48.o [4] .text ro code 0x800'1ea0 0x32 ABImemset48.o [4]
.text ro code 0x800'1ed0 0x40 stm32f4xx_hal.o [1] .text ro code 0x800'1ed4 0x40 stm32f4xx_hal.o [1]
.text ro code 0x800'1f10 0x106 I64DivMod_small.o [4] .text ro code 0x800'1f14 0x106 I64DivMod_small.o [4]
.text ro code 0x800'2018 0x31c logx64.o [3] .text ro code 0x800'201c 0x31c logx64.o [3]
.text ro code 0x800'2334 0x2 I64DivZer.o [4] .text ro code 0x800'2338 0x2 I64DivZer.o [4]
.text ro code 0x800'2338 0x70 frexp.o [3] .text ro code 0x800'233c 0x70 frexp.o [3]
.text ro code 0x800'23a8 0x22 S32ToDbl.o [3] .text ro code 0x800'23ac 0x22 S32ToDbl.o [3]
.text ro code 0x800'23cc 0x60 system_stm32f4xx.o [1] .text ro code 0x800'23d0 0x60 system_stm32f4xx.o [1]
.text ro code 0x800'242c 0x38 packbits_init_single.o [4] .text ro code 0x800'2430 0x38 packbits_init_single.o [4]
.text ro code 0x800'2464 0x28 data_init.o [4] .text ro code 0x800'2468 0x28 data_init.o [4]
.text ro code 0x800'248c 0x22 fpinit_M.o [3] .text ro code 0x800'2490 0x22 fpinit_M.o [3]
.iar.init_table const 0x800'24b0 0x20 - Linker created - .iar.init_table const 0x800'24b4 0x20 - Linker created -
.text ro code 0x800'24d0 0x20 stm32f4xx_it.o [1] .text ro code 0x800'24d4 0x20 stm32f4xx_it.o [1]
.text ro code 0x800'24f0 0x10 stm32f4xx_hal.o [1] .text ro code 0x800'24f4 0x10 stm32f4xx_hal.o [1]
.text ro code 0x800'2500 0x1e cmain.o [4] .text ro code 0x800'2504 0x1e cmain.o [4]
.text ro code 0x800'251e 0x4 low_level_init.o [2] .text ro code 0x800'2522 0x4 low_level_init.o [2]
.text ro code 0x800'2522 0x4 exit.o [2] .text ro code 0x800'2526 0x4 exit.o [2]
.text ro code 0x800'2528 0xa cexit.o [4] .text ro code 0x800'252c 0xa cexit.o [4]
.text ro code 0x800'2534 0x14 exit.o [5] .text ro code 0x800'2538 0x14 exit.o [5]
.text ro code 0x800'2548 0x10 startup_stm32f429xx.o [1] .text ro code 0x800'254c 0x10 startup_stm32f429xx.o [1]
.text ro code 0x800'2558 0xc cstartup_M.o [4] .text ro code 0x800'255c 0xc cstartup_M.o [4]
.text ro code 0x800'2564 0x4 startup_stm32f429xx.o [1]
.text ro code 0x800'2568 0x4 startup_stm32f429xx.o [1] .text ro code 0x800'2568 0x4 startup_stm32f429xx.o [1]
.text ro code 0x800'256c 0x4 startup_stm32f429xx.o [1] .text ro code 0x800'256c 0x4 startup_stm32f429xx.o [1]
.text ro code 0x800'2570 0x4 startup_stm32f429xx.o [1] .text ro code 0x800'2570 0x4 startup_stm32f429xx.o [1]
@ -212,10 +211,11 @@ initialize by copy { rw };
.text ro code 0x800'26bc 0x4 startup_stm32f429xx.o [1] .text ro code 0x800'26bc 0x4 startup_stm32f429xx.o [1]
.text ro code 0x800'26c0 0x4 startup_stm32f429xx.o [1] .text ro code 0x800'26c0 0x4 startup_stm32f429xx.o [1]
.text ro code 0x800'26c4 0x4 startup_stm32f429xx.o [1] .text ro code 0x800'26c4 0x4 startup_stm32f429xx.o [1]
.rodata const 0x800'26c8 0x0 zero_init3.o [4] .text ro code 0x800'26c8 0x4 startup_stm32f429xx.o [1]
.rodata const 0x800'26c8 0x0 packbits_init_single.o [4] .rodata const 0x800'26cc 0x0 zero_init3.o [4]
Initializer bytes const 0x800'26c8 0x14 <for P2-1> .rodata const 0x800'26cc 0x0 packbits_init_single.o [4]
- 0x800'26dc 0x2530 Initializer bytes const 0x800'26cc 0x14 <for P2-1>
- 0x800'26e0 0x2534
"P2", part 1 of 3: 0x48 "P2", part 1 of 3: 0x48
P2-1 0x2000'0000 0x48 <Init block> P2-1 0x2000'0000 0x48 <Init block>
@ -238,7 +238,7 @@ Unused ranges:
From To Size From To Size
---- -- ---- ---- -- ----
0x800'26dc 0x81f'ffff 0x1f'd924 0x800'26e0 0x81f'ffff 0x1f'd920
0x2000'0508 0x2002'ffff 0x2'faf8 0x2000'0508 0x2002'ffff 0x2'faf8
@ -254,7 +254,7 @@ Zero (__iar_zero_init3)
Copy/packbits (__iar_packbits_init_single3) Copy/packbits (__iar_packbits_init_single3)
1 source range, total size 0x14 (27% of destination): 1 source range, total size 0x14 (27% of destination):
0x800'26c8 0x14 0x800'26cc 0x14
1 destination range, total size 0x48: 1 destination range, total size 0x48:
0x2000'0000 0x48 0x2000'0000 0x48
@ -271,7 +271,7 @@ command line/config:
Total: Total:
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj: [1] C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj: [1]
main.o 1 100 15 248 main.o 1 104 15 248
startup_stm32f429xx.o 800 startup_stm32f429xx.o 800
stm32f4xx_hal.o 184 3 12 stm32f4xx_hal.o 184 3 12
stm32f4xx_hal_adc.o 1 240 stm32f4xx_hal_adc.o 1 240
@ -285,7 +285,7 @@ C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj: [1]
stm32f4xx_it.o 32 stm32f4xx_it.o 32
system_stm32f4xx.o 96 2 4 system_stm32f4xx.o 96 2 4
------------------------------------------------- -------------------------------------------------
Total: 6 578 20 264 Total: 6 582 20 264
dl7M_tlf.a: [2] dl7M_tlf.a: [2]
exit.o 4 exit.o 4
@ -331,7 +331,7 @@ shb_l.a: [5]
Gaps 34 2 Gaps 34 2
Linker created 32 1 024 Linker created 32 1 024
----------------------------------------------------- -----------------------------------------------------
Grand Total: 9 894 54 1 288 Grand Total: 9 898 54 1 288
******************************************************************************* *******************************************************************************
@ -340,18 +340,18 @@ shb_l.a: [5]
Entry Address Size Type Object Entry Address Size Type Object
----- ------- ---- ---- ------ ----- ------- ---- ---- ------
.iar.init_table$$Base 0x800'24b0 -- Gb - Linker created - .iar.init_table$$Base 0x800'24b4 -- Gb - Linker created -
.iar.init_table$$Limit 0x800'24d0 -- Gb - Linker created - .iar.init_table$$Limit 0x800'24d4 -- Gb - Linker created -
?main 0x800'2501 Code Gb cmain.o [4] ?main 0x800'2505 Code Gb cmain.o [4]
ADC_IRQHandler 0x800'24e5 0x6 Code Gb stm32f4xx_it.o [1] ADC_IRQHandler 0x800'24e9 0x6 Code Gb stm32f4xx_it.o [1]
ADC_Init 0x800'056b 0xf4 Code Lc stm32f4xx_hal_adc.o [1] ADC_Init 0x800'056b 0xf4 Code Lc stm32f4xx_hal_adc.o [1]
AHBPrescTable 0x800'241c 0x10 Data Gb system_stm32f4xx.o [1] AHBPrescTable 0x800'2420 0x10 Data Gb system_stm32f4xx.o [1]
BusFault_Handler 0x800'24d7 0x2 Code Gb stm32f4xx_it.o [1] BusFault_Handler 0x800'24db 0x2 Code Gb stm32f4xx_it.o [1]
CSTACK$$Base 0x2000'0108 -- Gb - Linker created - CSTACK$$Base 0x2000'0108 -- Gb - Linker created -
CSTACK$$Limit 0x2000'0508 -- Gb - Linker created - CSTACK$$Limit 0x2000'0508 -- Gb - Linker created -
DebugMon_Handler 0x800'24dd 0x2 Code Gb stm32f4xx_it.o [1] DebugMon_Handler 0x800'24e1 0x2 Code Gb stm32f4xx_it.o [1]
HAL_ADCEx_InjectedConvCpltCallback HAL_ADCEx_InjectedConvCpltCallback
0x800'0bf9 0x2 Code Wk stm32f4xx_hal_adc_ex.o [1] 0x800'0bfd 0x2 Code Wk stm32f4xx_hal_adc_ex.o [1]
HAL_ADC_ConfigChannel 0x800'0435 0x110 Code Gb stm32f4xx_hal_adc.o [1] HAL_ADC_ConfigChannel 0x800'0435 0x110 Code Gb stm32f4xx_hal_adc.o [1]
HAL_ADC_ConvCpltCallback HAL_ADC_ConvCpltCallback
0x800'09bf 0x92 Code Gb main.o [1] 0x800'09bf 0x92 Code Gb main.o [1]
@ -360,104 +360,104 @@ HAL_ADC_IRQHandler 0x800'0303 0x120 Code Gb stm32f4xx_hal_adc.o [1]
HAL_ADC_Init 0x800'01ad 0x50 Code Gb stm32f4xx_hal_adc.o [1] HAL_ADC_Init 0x800'01ad 0x50 Code Gb stm32f4xx_hal_adc.o [1]
HAL_ADC_MspInit 0x800'06b5 0x66 Code Gb stm32f4xx_hal_msp.o [1] HAL_ADC_MspInit 0x800'06b5 0x66 Code Gb stm32f4xx_hal_msp.o [1]
HAL_ADC_Start_IT 0x800'01fd 0x62 Code Gb stm32f4xx_hal_adc.o [1] HAL_ADC_Start_IT 0x800'01fd 0x62 Code Gb stm32f4xx_hal_adc.o [1]
HAL_Delay 0x800'130d 0x28 Code Wk stm32f4xx_hal.o [1] HAL_Delay 0x800'1311 0x28 Code Wk stm32f4xx_hal.o [1]
HAL_GPIO_Init 0x800'0c39 0x1b8 Code Gb stm32f4xx_hal_gpio.o [1] HAL_GPIO_Init 0x800'0c3d 0x1b8 Code Gb stm32f4xx_hal_gpio.o [1]
HAL_GPIO_WritePin 0x800'0df1 0x8 Code Gb stm32f4xx_hal_gpio.o [1] HAL_GPIO_WritePin 0x800'0df5 0x8 Code Gb stm32f4xx_hal_gpio.o [1]
HAL_GetTick 0x800'1d41 0xc Code Wk stm32f4xx_hal.o [1] HAL_GetTick 0x800'1d45 0xc Code Wk stm32f4xx_hal.o [1]
HAL_IncTick 0x800'24f1 0x10 Code Wk stm32f4xx_hal.o [1] HAL_IncTick 0x800'24f5 0x10 Code Wk stm32f4xx_hal.o [1]
HAL_Init 0x800'0ef9 0x30 Code Gb stm32f4xx_hal.o [1] HAL_Init 0x800'0efd 0x30 Code Gb stm32f4xx_hal.o [1]
HAL_InitTick 0x800'1ed1 0x40 Code Wk stm32f4xx_hal.o [1] HAL_InitTick 0x800'1ed5 0x40 Code Wk stm32f4xx_hal.o [1]
HAL_MspInit 0x800'0681 0x34 Code Gb stm32f4xx_hal_msp.o [1] HAL_MspInit 0x800'0681 0x34 Code Gb stm32f4xx_hal_msp.o [1]
HAL_NVIC_EnableIRQ 0x800'0e9b 0xa Code Gb stm32f4xx_hal_cortex.o [1] HAL_NVIC_EnableIRQ 0x800'0e9f 0xa Code Gb stm32f4xx_hal_cortex.o [1]
HAL_NVIC_SetPriority 0x800'0e61 0x3a Code Gb stm32f4xx_hal_cortex.o [1] HAL_NVIC_SetPriority 0x800'0e65 0x3a Code Gb stm32f4xx_hal_cortex.o [1]
HAL_NVIC_SetPriorityGrouping HAL_NVIC_SetPriorityGrouping
0x800'0e47 0x1a Code Gb stm32f4xx_hal_cortex.o [1] 0x800'0e4b 0x1a Code Gb stm32f4xx_hal_cortex.o [1]
HAL_RCC_ClockConfig 0x800'162d 0xfe Code Gb stm32f4xx_hal_rcc.o [1] HAL_RCC_ClockConfig 0x800'1631 0xfe Code Gb stm32f4xx_hal_rcc.o [1]
HAL_RCC_OscConfig 0x800'1335 0x2f8 Code Wk stm32f4xx_hal_rcc.o [1] HAL_RCC_OscConfig 0x800'1339 0x2f8 Code Wk stm32f4xx_hal_rcc.o [1]
HAL_SYSTICK_Config 0x800'0eaf 0x28 Code Gb stm32f4xx_hal_cortex.o [1] HAL_SYSTICK_Config 0x800'0eb3 0x28 Code Gb stm32f4xx_hal_cortex.o [1]
HAL_TIMEx_MasterConfigSynchronization HAL_TIMEx_MasterConfigSynchronization
0x800'12c1 0x4a Code Gb stm32f4xx_hal_tim_ex.o [1] 0x800'12c5 0x4a Code Gb stm32f4xx_hal_tim_ex.o [1]
HAL_TIM_MspPostInit 0x800'0741 0x48 Code Gb stm32f4xx_hal_msp.o [1] HAL_TIM_MspPostInit 0x800'0741 0x48 Code Gb stm32f4xx_hal_msp.o [1]
HAL_TIM_PWM_ConfigChannel HAL_TIM_PWM_ConfigChannel
0x800'0fb1 0xbc Code Gb stm32f4xx_hal_tim.o [1] 0x800'0fb5 0xbc Code Gb stm32f4xx_hal_tim.o [1]
HAL_TIM_PWM_Init 0x800'0f57 0x1a Code Gb stm32f4xx_hal_tim.o [1] HAL_TIM_PWM_Init 0x800'0f5b 0x1a Code Gb stm32f4xx_hal_tim.o [1]
HAL_TIM_PWM_MspInit 0x800'071b 0x26 Code Gb stm32f4xx_hal_msp.o [1] HAL_TIM_PWM_MspInit 0x800'071b 0x26 Code Gb stm32f4xx_hal_msp.o [1]
HAL_TIM_PWM_Start 0x800'0f71 0x14 Code Gb stm32f4xx_hal_tim.o [1] HAL_TIM_PWM_Start 0x800'0f75 0x14 Code Gb stm32f4xx_hal_tim.o [1]
HardFault_Handler 0x800'24d3 0x2 Code Gb stm32f4xx_it.o [1] HardFault_Handler 0x800'24d7 0x2 Code Gb stm32f4xx_it.o [1]
MemManage_Handler 0x800'24d5 0x2 Code Gb stm32f4xx_it.o [1] MemManage_Handler 0x800'24d9 0x2 Code Gb stm32f4xx_it.o [1]
NMI_Handler 0x800'24d1 0x2 Code Gb stm32f4xx_it.o [1] NMI_Handler 0x800'24d5 0x2 Code Gb stm32f4xx_it.o [1]
NVIC_SetPriority 0x800'0e2d 0x1a Code Lc stm32f4xx_hal_cortex.o [1] NVIC_SetPriority 0x800'0e31 0x1a Code Lc stm32f4xx_hal_cortex.o [1]
PendSV_Handler 0x800'24df 0x2 Code Gb stm32f4xx_it.o [1] PendSV_Handler 0x800'24e3 0x2 Code Gb stm32f4xx_it.o [1]
Region$$Table$$Base 0x800'24b0 -- Gb - Linker created - Region$$Table$$Base 0x800'24b4 -- Gb - Linker created -
Region$$Table$$Limit 0x800'24d0 -- Gb - Linker created - Region$$Table$$Limit 0x800'24d4 -- Gb - Linker created -
SVC_Handler 0x800'24db 0x2 Code Gb stm32f4xx_it.o [1] SVC_Handler 0x800'24df 0x2 Code Gb stm32f4xx_it.o [1]
SysTick_Handler 0x800'24e1 0x4 Code Gb stm32f4xx_it.o [1] SysTick_Handler 0x800'24e5 0x4 Code Gb stm32f4xx_it.o [1]
SystemClock_Config 0x800'0929 0x96 Code Gb main.o [1] SystemClock_Config 0x800'0929 0x96 Code Gb main.o [1]
SystemCoreClock 0x2000'0044 0x4 Data Gb system_stm32f4xx.o [1] SystemCoreClock 0x2000'0044 0x4 Data Gb system_stm32f4xx.o [1]
SystemInit 0x800'23cd 0x3a Code Gb system_stm32f4xx.o [1] SystemInit 0x800'23d1 0x3a Code Gb system_stm32f4xx.o [1]
TIM_Base_SetConfig 0x800'10a1 0x8e Code Gb stm32f4xx_hal_tim.o [1] TIM_Base_SetConfig 0x800'10a5 0x8e Code Gb stm32f4xx_hal_tim.o [1]
TIM_CCxChannelCmd 0x800'118b 0x14 Code Gb stm32f4xx_hal_tim.o [1] TIM_CCxChannelCmd 0x800'118f 0x14 Code Gb stm32f4xx_hal_tim.o [1]
TIM_OC1_SetConfig 0x800'119f 0x50 Code Lc stm32f4xx_hal_tim.o [1] TIM_OC1_SetConfig 0x800'11a3 0x50 Code Lc stm32f4xx_hal_tim.o [1]
TIM_OC2_SetConfig 0x800'1131 0x58 Code Gb stm32f4xx_hal_tim.o [1] TIM_OC2_SetConfig 0x800'1135 0x58 Code Gb stm32f4xx_hal_tim.o [1]
TIM_OC3_SetConfig 0x800'11ef 0x56 Code Lc stm32f4xx_hal_tim.o [1] TIM_OC3_SetConfig 0x800'11f3 0x56 Code Lc stm32f4xx_hal_tim.o [1]
TIM_OC4_SetConfig 0x800'1245 0x46 Code Lc stm32f4xx_hal_tim.o [1] TIM_OC4_SetConfig 0x800'1249 0x46 Code Lc stm32f4xx_hal_tim.o [1]
UsageFault_Handler 0x800'24d9 0x2 Code Gb stm32f4xx_it.o [1] UsageFault_Handler 0x800'24dd 0x2 Code Gb stm32f4xx_it.o [1]
__aeabi_cdcmple 0x800'1e31 Code Gb DblCmpLe.o [3] __aeabi_cdcmple 0x800'1e35 Code Gb DblCmpLe.o [3]
__aeabi_d2iz 0x800'1e61 Code Gb DblToS32.o [3] __aeabi_d2iz 0x800'1e65 Code Gb DblToS32.o [3]
__aeabi_dadd 0x800'1a0d Code Gb DblAdd.o [3] __aeabi_dadd 0x800'1a11 Code Gb DblAdd.o [3]
__aeabi_ddiv 0x800'17c5 Code Gb DblDiv.o [3] __aeabi_ddiv 0x800'17c9 Code Gb DblDiv.o [3]
__aeabi_dmul 0x800'1b9d Code Gb DblMul.o [3] __aeabi_dmul 0x800'1ba1 Code Gb DblMul.o [3]
__aeabi_dsub 0x800'1d4d Code Gb DblSub.o [3] __aeabi_dsub 0x800'1d51 Code Gb DblSub.o [3]
__aeabi_i2d 0x800'23a9 Code Gb S32ToDbl.o [3] __aeabi_i2d 0x800'23ad Code Gb S32ToDbl.o [3]
__aeabi_ldiv0 0x800'2335 Code Gb I64DivZer.o [4] __aeabi_ldiv0 0x800'2339 Code Gb I64DivZer.o [4]
__aeabi_memclr4 0x800'0ef1 Code Gb ABImemclr4.o [4] __aeabi_memclr4 0x800'0ef5 Code Gb ABImemclr4.o [4]
__aeabi_ui2d 0x800'17a9 Code Gb U32ToDbl.o [3] __aeabi_ui2d 0x800'17ad Code Gb U32ToDbl.o [3]
__cmain 0x800'2501 Code Gb cmain.o [4] __cmain 0x800'2505 Code Gb cmain.o [4]
__exit 0x800'2535 0x14 Code Gb exit.o [5] __exit 0x800'2539 0x14 Code Gb exit.o [5]
__iar_Log64 0x800'2019 0x280 Code Lc logx64.o [3] __iar_Log64 0x800'201d 0x280 Code Lc logx64.o [3]
__iar_Memset4_word 0x800'1e9d Code Gb ABImemset48.o [4] __iar_Memset4_word 0x800'1ea1 Code Gb ABImemset48.o [4]
__iar_Memset8_word 0x800'1e9d Code Gb ABImemset48.o [4] __iar_Memset8_word 0x800'1ea1 Code Gb ABImemset48.o [4]
__iar_dadd 0x800'1d5d Code Gb DblSub.o [3] __iar_dadd 0x800'1d61 Code Gb DblSub.o [3]
__iar_data_init3 0x800'2465 0x28 Code Gb data_init.o [4] __iar_data_init3 0x800'2469 0x28 Code Gb data_init.o [4]
__iar_dsub 0x800'1a1d Code Gb DblAdd.o [3] __iar_dsub 0x800'1a21 Code Gb DblAdd.o [3]
__iar_dsubStart 0x800'1a2f Code Gb DblAdd.o [3] __iar_dsubStart 0x800'1a33 Code Gb DblAdd.o [3]
__iar_frexp 0x800'2345 Code Gb frexp.o [3] __iar_frexp 0x800'2349 Code Gb frexp.o [3]
__iar_frexpl 0x800'2345 Code Gb frexp.o [3] __iar_frexpl 0x800'2349 Code Gb frexp.o [3]
__iar_init_vfp 0x800'248d Code Gb fpinit_M.o [3] __iar_init_vfp 0x800'2491 Code Gb fpinit_M.o [3]
__iar_log64 0x800'2331 0x4 Code Gb logx64.o [3] __iar_log64 0x800'2335 0x4 Code Gb logx64.o [3]
__iar_log_medium 0x800'2331 0x4 Code Gb logx64.o [3] __iar_log_medium 0x800'2335 0x4 Code Gb logx64.o [3]
__iar_log_medium64 0x800'2331 0x4 Code Gb logx64.o [3] __iar_log_medium64 0x800'2335 0x4 Code Gb logx64.o [3]
__iar_log_mediuml 0x800'2331 0x4 Code Gb logx64.o [3] __iar_log_mediuml 0x800'2335 0x4 Code Gb logx64.o [3]
__iar_packbits_init_single3 __iar_packbits_init_single3
0x800'242d 0x38 Code Gb packbits_init_single.o [4] 0x800'2431 0x38 Code Gb packbits_init_single.o [4]
__iar_program_start 0x800'2559 Code Gb cstartup_M.o [4] __iar_program_start 0x800'255d Code Gb cstartup_M.o [4]
__iar_small_uldivmod 0x800'1f11 Code Gb I64DivMod_small.o [4] __iar_small_uldivmod 0x800'1f15 Code Gb I64DivMod_small.o [4]
__iar_softfp___iar_frexp64 __iar_softfp___iar_frexp64
0x800'2339 Code Gb frexp.o [3] 0x800'233d Code Gb frexp.o [3]
__iar_softfp_frexp 0x800'2339 Code Gb frexp.o [3] __iar_softfp_frexp 0x800'233d Code Gb frexp.o [3]
__iar_softfp_frexpl 0x800'2339 Code Gb frexp.o [3] __iar_softfp_frexpl 0x800'233d Code Gb frexp.o [3]
__iar_vfp_log 0x800'1b8f 0xc Code Gb math_wrappers64.o [3] __iar_vfp_log 0x800'1b93 0xc Code Gb math_wrappers64.o [3]
__iar_zero_init3 0x800'0bff 0x3a Code Gb zero_init3.o [4] __iar_zero_init3 0x800'0c03 0x3a Code Gb zero_init3.o [4]
__low_level_init 0x800'251f 0x4 Code Gb low_level_init.o [2] __low_level_init 0x800'2523 0x4 Code Gb low_level_init.o [2]
__vector_table 0x800'0000 Data Gb startup_stm32f429xx.o [1] __vector_table 0x800'0000 Data Gb startup_stm32f429xx.o [1]
_call_main 0x800'250d Code Gb cmain.o [4] _call_main 0x800'2511 Code Gb cmain.o [4]
_exit 0x800'2529 Code Gb cexit.o [4] _exit 0x800'252d Code Gb cexit.o [4]
_main 0x800'251b Code Gb cmain.o [4] _main 0x800'251f Code Gb cmain.o [4]
computePID 0x800'0a51 0x124 Code Gb main.o [1] computePID 0x800'0a51 0x12a Code Gb main.o [1]
counter 0x2000'0048 0x1 Data Gb main.o [1] counter 0x2000'0048 0x1 Data Gb main.o [1]
cumError 0x2000'0018 0x8 Data Gb main.o [1] cumError 0x2000'0018 0x8 Data Gb main.o [1]
currentTime 0x2000'0030 0x4 Data Gb main.o [1] currentTime 0x2000'0030 0x4 Data Gb main.o [1]
elapsedTime 0x2000'0000 0x8 Data Gb main.o [1] elapsedTime 0x2000'0000 0x8 Data Gb main.o [1]
error 0x2000'0010 0x8 Data Gb main.o [1] error 0x2000'0010 0x8 Data Gb main.o [1]
exit 0x800'2523 0x4 Code Gb exit.o [2] exit 0x800'2527 0x4 Code Gb exit.o [2]
hadc2 0x2000'00c0 0x48 Data Gb main.o [1] hadc2 0x2000'00c0 0x48 Data Gb main.o [1]
htim4 0x2000'004c 0x3c Data Gb main.o [1] htim4 0x2000'004c 0x3c Data Gb main.o [1]
kd 0x2000'00b0 0x8 Data Gb main.o [1] kd 0x2000'00b0 0x8 Data Gb main.o [1]
ki 0x2000'00a8 0x8 Data Gb main.o [1] ki 0x2000'00a8 0x8 Data Gb main.o [1]
kp 0x2000'00a0 0x8 Data Gb main.o [1] kp 0x2000'00a0 0x8 Data Gb main.o [1]
lastError 0x2000'0028 0x8 Data Gb main.o [1] lastError 0x2000'0028 0x8 Data Gb main.o [1]
log 0x800'2331 0x4 Code Gb logx64.o [3] log 0x800'2335 0x4 Code Gb logx64.o [3]
logl 0x800'2331 0x4 Code Gb logx64.o [3] logl 0x800'2335 0x4 Code Gb logx64.o [3]
main 0x800'07ad 0x17c Code Gb main.o [1] main 0x800'07ad 0x17c Code Gb main.o [1]
myPID 0x2000'00bc 0x4 Data Gb main.o [1] myPID 0x2000'00bc 0x4 Data Gb main.o [1]
previousTime 0x2000'0034 0x4 Data Gb main.o [1] previousTime 0x2000'0034 0x4 Data Gb main.o [1]
@ -478,7 +478,7 @@ uwTickPrio 0x2000'0040 0x4 Data Gb stm32f4xx_hal.o [1]
[4] = rt7M_tl.a [4] = rt7M_tl.a
[5] = shb_l.a [5] = shb_l.a
9 894 bytes of readonly code memory 9 898 bytes of readonly code memory
54 bytes of readonly data memory 54 bytes of readonly data memory
1 288 bytes of readwrite data memory 1 288 bytes of readwrite data memory

Binary file not shown.

Binary file not shown.

View file

@ -1,5 +1,8 @@
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\Press.pbd C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\Press.pbd
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\main.pbi C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\main.pbi
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_msp.pbi
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_it.pbi
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\system_stm32f4xx.pbi
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal.pbi C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal.pbi
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_adc.pbi C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_adc.pbi
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_adc_ex.pbi C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_adc_ex.pbi
@ -10,12 +13,9 @@ C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_flash.pbi
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_flash_ex.pbi C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_flash_ex.pbi
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_flash_ramfunc.pbi C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_flash_ramfunc.pbi
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_gpio.pbi C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_gpio.pbi
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_msp.pbi
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_pwr.pbi C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_pwr.pbi
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_pwr_ex.pbi C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_pwr_ex.pbi
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_rcc.pbi C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_rcc.pbi
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_rcc_ex.pbi C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_rcc_ex.pbi
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_tim.pbi C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_tim.pbi
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_tim_ex.pbi C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_hal_tim_ex.pbi
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\stm32f4xx_it.pbi
C:\Users\Maxunm\Desktop\TShirtPress\EWARM\Press\Obj\system_stm32f4xx.pbi

File diff suppressed because it is too large Load diff

Binary file not shown.

Binary file not shown.

View file

@ -153,11 +153,11 @@
<RecentlyUsedMenus>1</RecentlyUsedMenus> <RecentlyUsedMenus>1</RecentlyUsedMenus>
<MenuShadows>1</MenuShadows> <MenuShadows>1</MenuShadows>
<ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay> <ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay>
<CommandsUsage>F20000000A001086000036000000AF0600000200000020810000010000000C810000060000000E810000010000001F8100002F0000008E8600000100000011860000040000004681000008000000608600007E000000</CommandsUsage> <CommandsUsage>F30000000A001086000037000000AF0600000200000020810000010000000C810000060000001F8100002F0000000E810000010000008E8600000100000011860000040000004681000008000000608600007E000000</CommandsUsage>
</MFCToolBarParameters> </MFCToolBarParameters>
<CommandManager> <CommandManager>
<CommandsWithoutImages>0400FFFFFFFF838600005886000004DC0000</CommandsWithoutImages> <CommandsWithoutImages>0400FFFFFFFF838600005886000004DC0000</CommandsWithoutImages>
<MenuUserImages>0E00578600001B0000002392000000000000008D0000200000009A8600001900000000840000790000001A860000340000005D840000040000008E8600003D000000698600003A00000055860000070000000E8600001A000000C386000003000000A18600003E000000C08600000D000000</MenuUserImages> <MenuUserImages>0E00578600001B0000002392000000000000008D0000200000009A8600001900000000840000790000001A860000340000008E8600003D0000005D84000004000000698600003A00000055860000070000000E8600001A000000A18600003E000000C386000003000000C08600000D000000</MenuUserImages>
</CommandManager> </CommandManager>
<Pane-59393> <Pane-59393>
<ID>0</ID> <ID>0</ID>
@ -851,7 +851,10 @@
<item>rateError</item> <item>rateError</item>
<item>elapsedTime</item> <item>elapsedTime</item>
<item>setPoint</item> <item>setPoint</item>
<item></item> <item>kp</item>
<item>ki</item>
<item>kd</item>
<item />
</expressions> </expressions>
<col-names> <col-names>
<item>Expression</item> <item>Expression</item>
@ -1030,7 +1033,7 @@
</BasePane-34049> </BasePane-34049>
<MFCToolBar-34050> <MFCToolBar-34050>
<Name>Trace</Name> <Name>Trace</Name>
<Buttons>00200000010000000200FFFF01001100434D4643546F6F6C426172427574746F6E53920000000004008A000000FFFEFF03450054004D0000000000000000000000000001000000010000000180549200000000000025000000FFFEFF03530057004F00000000000000000000000000010000000100000000000000FFFEFF05540072006100630065002F000000</Buttons> <Buttons>00200000010000000200FFFF01001100434D4643546F6F6C426172427574746F6E539200000000040089000000FFFEFF03450054004D0000000000000000000000000001000000010000000180549200000000000025000000FFFEFF03530057004F00000000000000000000000000010000000100000000000000FFFEFF05540072006100630065002F000000</Buttons>
</MFCToolBar-34050> </MFCToolBar-34050>
<Pane-34050> <Pane-34050>
<ID>34050</ID> <ID>34050</ID>
@ -1047,7 +1050,7 @@
</BasePane-34050> </BasePane-34050>
<MFCToolBar-34051> <MFCToolBar-34051>
<Name>Main</Name> <Name>Main</Name>
<Buttons>00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000067000000FFFEFF000000000000000000000000000100000001000000018001E100000000000068000000FFFEFF000000000000000000000000000100000001000000018003E10000000004006A000000FFFEFF000000000000000000000000000100000001000000018000810000000000004B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000004006D000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000000006F000000FFFEFF000000000000000000000000000100000001000000018022E10000000000006E000000FFFEFF000000000000000000000000000100000001000000018025E100000000000071000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040074000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040075000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000400FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004005E000000FFFEFF000000000000000000000000000100000001000000018024E100000000040070000000FFFEFF000000000000000000000000000100000001000000018028E100000000040072000000FFFEFF000000000000000000000000000100000001000000018029E100000000040073000000FFFEFF000000000000000000000000000100000001000000018002810000000004004D000000FFFEFF0000000000000000000000000001000000010000000180298100000000040062000000FFFEFF0000000000000000000000000001000000010000000180278100000000040060000000FFFEFF0000000000000000000000000001000000010000000180288100000000040061000000FFFEFF00000000000000000000000000010000000100000001801D810000000000005A000000FFFEFF00000000000000000000000000010000000100000001801E810000000004005B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000000000051000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000052000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000066000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F810000000000005C000000FFFEFF000000000000000000000000000100000001000000018020810000000000005D000000FFFEFF0000000000000000000000000001000000010000000180468100000000020064000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000</Buttons> <Buttons>00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000066000000FFFEFF000000000000000000000000000100000001000000018001E100000000000067000000FFFEFF000000000000000000000000000100000001000000018003E100000000040069000000FFFEFF000000000000000000000000000100000001000000018000810000000000004A000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000004006C000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000000006E000000FFFEFF000000000000000000000000000100000001000000018022E10000000000006D000000FFFEFF000000000000000000000000000100000001000000018025E100000000000070000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040073000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040074000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000400FFFFFFFFFFFEFF0000000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004005D000000FFFEFF000000000000000000000000000100000001000000018024E10000000004006F000000FFFEFF000000000000000000000000000100000001000000018028E100000000040071000000FFFEFF000000000000000000000000000100000001000000018029E100000000040072000000FFFEFF000000000000000000000000000100000001000000018002810000000004004C000000FFFEFF0000000000000000000000000001000000010000000180298100000000040061000000FFFEFF000000000000000000000000000100000001000000018027810000000004005F000000FFFEFF0000000000000000000000000001000000010000000180288100000000040060000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040059000000FFFEFF00000000000000000000000000010000000100000001801E810000000004005A000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000000040050000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000051000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000065000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F810000000000005B000000FFFEFF000000000000000000000000000100000001000000018020810000000000005C000000FFFEFF0000000000000000000000000001000000010000000180468100000000000063000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000</Buttons>
</MFCToolBar-34051> </MFCToolBar-34051>
<Pane-34051> <Pane-34051>
<ID>34051</ID> <ID>34051</ID>

File diff suppressed because one or more lines are too long

View file

@ -345,15 +345,15 @@ int computePID(double inp){
cumError += error * elapsedTime; // compute integral cumError += error * elapsedTime; // compute integral
rateError = (error - lastError)/elapsedTime; // compute derivative rateError = (error - lastError)/elapsedTime; // compute derivative
double out; double out;
if(cumError < 0){ if(cumError < -0xFFFF/ki){
cumError = 0; //Clamping cumError = -0xFFFF/ki; //Clamping
} }
if(cumError > 0xFFFF/ki){ if(cumError > 0xFFFF/ki){
cumError = 0xFFFF/ki; cumError = 0xFFFF/ki; //Clamping
out = 0xFFFF; //Clamping
}else{
out = kp*error + ki*cumError + kd*rateError;
} }
out = kp*error + ki*cumError + kd*rateError;
if(out < 0){ if(out < 0){
out = 0; out = 0;
} }

BIN
en.CD00164185.pdf Normal file

Binary file not shown.