diff --git a/drivers/Driver_Timer.h b/drivers/Driver_Timer.h index 18a439f..a9f306b 100644 --- a/drivers/Driver_Timer.h +++ b/drivers/Driver_Timer.h @@ -6,11 +6,12 @@ typedef struct { TIM_TypeDef * Timer; - unsigned short ARR; - unsigned short PSC; + unsigned short ARR; // Valeur du registre ARR (auto-reload register) qui détermine la période du timer + unsigned short PSC; // Valeur du registre PSC (prescaler) qui détermine le rapport de division de la fréquence d'horloge } MyTimer_Struct_TypeDef; + void MyTimer_Base_Init(MyTimer_Struct_TypeDef * Timer); #define MyTimer_Base_Start(Timer) diff --git a/projet_1/Listings/tp_sim.map b/projet_1/Listings/tp_sim.map index e4c3709..3ac9316 100644 --- a/projet_1/Listings/tp_sim.map +++ b/projet_1/Listings/tp_sim.map @@ -264,13 +264,13 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name - 152 16 0 0 0 2207 driver_gpio.o - 70 0 0 0 0 1168 main.o + 152 16 0 0 0 2108 driver_gpio.o + 70 0 0 0 0 1166 main.o 36 8 236 0 1024 840 startup_stm32f10x_md.o 272 0 0 0 0 2793 system_stm32f10x.o ---------------------------------------------------------------------- - 534 24 252 0 1024 7008 Object Totals + 534 24 252 0 1024 6907 Object Totals 0 0 16 0 0 0 (incl. Generated) 4 0 0 0 0 0 (incl. Padding) @@ -309,8 +309,8 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 620 40 252 0 1024 7188 Grand Totals - 620 40 252 0 1024 7188 ELF Image Totals + 620 40 252 0 1024 7087 Grand Totals + 620 40 252 0 1024 7087 ELF Image Totals 620 40 252 0 0 0 ROM Totals ============================================================================== diff --git a/projet_1/Objects/driver_gpio.o b/projet_1/Objects/driver_gpio.o index 54bb463..a467d84 100644 Binary files a/projet_1/Objects/driver_gpio.o and b/projet_1/Objects/driver_gpio.o differ diff --git a/projet_1/Objects/driver_timer.d b/projet_1/Objects/driver_timer.d new file mode 100644 index 0000000..f096ea7 --- /dev/null +++ b/projet_1/Objects/driver_timer.d @@ -0,0 +1,10 @@ +./objects/driver_timer.o: ..\drivers\Driver_Timer.c \ + ..\drivers\Driver_Timer.h \ + C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h \ + RTE\_sim\RTE_Components.h \ + C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h \ + C:\Keil_v5\ARM\ARMCLANG\Bin\..\include\stdint.h \ + C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h \ + C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h \ + C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h \ + C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h diff --git a/projet_1/Objects/main.o b/projet_1/Objects/main.o new file mode 100644 index 0000000..ae007f7 Binary files /dev/null and b/projet_1/Objects/main.o differ diff --git a/projet_1/Objects/tp_board.dep b/projet_1/Objects/tp_board.dep index c8d3daa..f8a7a6e 100644 --- a/projet_1/Objects/tp_board.dep +++ b/projet_1/Objects/tp_board.dep @@ -1,6 +1,6 @@ Dependencies for Project 'tp', Target 'board': (DO NOT MODIFY !) CompilerVersion: 6190000::V6.19::ARMCLANG -F (.\src\main.c)(0x64174EF9)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/main.o -MD) +F (.\src\main.c)(0x6417630F)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/main.o -MD) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_board\RTE_Components.h)(0x6415C72E) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -9,9 +9,9 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) -I (..\drivers\Driver_GPIO.h)(0x641736B7) -F (..\drivers\Driver_GPIO.c)(0x64173933)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_gpio.o -MD) -I (..\drivers\Driver_GPIO.h)(0x641736B7) +I (..\drivers\Driver_GPIO.h)(0x6417630F) +F (..\drivers\Driver_GPIO.c)(0x6417630F)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_gpio.o -MD) +I (..\drivers\Driver_GPIO.h)(0x6417630F) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_board\RTE_Components.h)(0x6415C72E) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -20,7 +20,7 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) -F (..\drivers\Driver_GPIO.h)(0x641736B7)() +F (..\drivers\Driver_GPIO.h)(0x6417630F)() F (RTE/Device/STM32F103RB/RTE_Device.h)(0x5FC0B25A)() F (RTE/Device/STM32F103RB/startup_stm32f10x_md.s)(0x61ADDBCE)(--target=arm-arm-none-eabi -mcpu=cortex-m3 -masm=auto -Wa,armasm,--diag_suppress=A1950W -c -gdwarf-4 -Wa,armasm,--pd,"__MICROLIB SETA 1" -Wa,armasm,--pd,"__EVAL SETA 1" -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -Wa,armasm,--pd,"__UVISION_VERSION SETA 538" -Wa,armasm,--pd,"_RTE_ SETA 1" -Wa,armasm,--pd,"STM32F10X_MD SETA 1" -Wa,armasm,--pd,"_RTE_ SETA 1" -o ./objects/startup_stm32f10x_md.o) F (RTE/Device/STM32F103RB/system_stm32f10x.c)(0x61ADDBCE)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/system_stm32f10x.o -MD) diff --git a/projet_1/Objects/tp_sim.axf b/projet_1/Objects/tp_sim.axf new file mode 100644 index 0000000..0d9599d Binary files /dev/null and b/projet_1/Objects/tp_sim.axf differ diff --git a/projet_1/Objects/tp_sim.build_log.htm b/projet_1/Objects/tp_sim.build_log.htm index 65ce604..600053e 100644 --- a/projet_1/Objects/tp_sim.build_log.htm +++ b/projet_1/Objects/tp_sim.build_log.htm @@ -28,38 +28,12 @@ Project File Date: 03/19/2023 *** Using Compiler 'V6.19', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin' Rebuild target 'board' assembling startup_stm32f10x_md.s... -src/main.c(12): error: use of undeclared identifier 'RCC_APB1Periph_TIM2' - RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM2, ENABLE); - ^ -src/main.c(14): error: use of undeclared identifier 'TIM_TimeBaseInitTypeDef' - TIM_TimeBaseInitTypeDef timer_init; - ^ -src/main.c(15): error: use of undeclared identifier 'timer_init' - timer_init.TIM_Period = 4999; // ARR = Période - 1 - ^ -src/main.c(16): error: use of undeclared identifier 'timer_init' - timer_init.TIM_Prescaler = 7199; // PSC = Fréquence d'horloge / Fréquence de comptage - 1 - ^ -src/main.c(17): error: use of undeclared identifier 'timer_init' - timer_init.TIM_ClockDivision = TIM_CKD_DIV1; - ^ -src/main.c(17): error: use of undeclared identifier 'TIM_CKD_DIV1' - timer_init.TIM_ClockDivision = TIM_CKD_DIV1; - ^ -src/main.c(18): error: use of undeclared identifier 'timer_init' - timer_init.TIM_CounterMode = TIM_CounterMode_Up; - ^ -src/main.c(18): error: use of undeclared identifier 'TIM_CounterMode_Up' - timer_init.TIM_CounterMode = TIM_CounterMode_Up; - ^ -src/main.c(19): error: use of undeclared identifier 'timer_init' - TIM_TimeBaseInit(TIM2, &timer_init); - ^ -9 errors generated. compiling main.c... compiling Driver_GPIO.c... compiling system_stm32f10x.c... -".\Objects\tp_sim.axf" - 9 Error(s), 0 Warning(s). +linking... +Program Size: Code=620 RO-data=252 RW-data=0 ZI-data=1024 +".\Objects\tp_sim.axf" - 0 Error(s), 0 Warning(s).