diff --git a/drivers/Driver_GPIO.c b/drivers/Driver_GPIO.c index 6b5184a..e5a32c1 100644 --- a/drivers/Driver_GPIO.c +++ b/drivers/Driver_GPIO.c @@ -14,9 +14,6 @@ void MyGPIO_Init(MyGPIO_Struct_TypeDef * GPIOStructPtr) { } // Configuration de la broche GPIO - uint32_t tempreg = 0; - uint32_t temp = 0; - if (GPIOStructPtr->GPIO_Pin < 8) { // CRL Configure les GPIO de 0 à 7 GPIOStructPtr->GPIO->CRL &= ~(0xF << (4 * GPIOStructPtr->GPIO_Pin)); // Efface les 4 bits correspondant à la broche GPIO, on calcule la position à partir du début en multipliant par 4 (eg. 4 * GPIO5 = 20), on fais un masque avec 0b1111 (0xF) ensuite pour mettre à 0 les bits présents GPIOStructPtr->GPIO->CRL |= (GPIOStructPtr->GPIO_Conf << (4 * GPIOStructPtr->GPIO_Pin)); // Ajoute la configuration pour la broche GPIO @@ -33,9 +30,6 @@ void MyGPIO_Init(MyGPIO_Struct_TypeDef * GPIOStructPtr) { } } - - - int MyGPIO_Read(GPIO_TypeDef * GPIO, char GPIO_Pin) { int bitstatus; diff --git a/projet_1/Objects/main.o b/projet_1/Objects/main.o deleted file mode 100644 index 2a37026..0000000 Binary files a/projet_1/Objects/main.o and /dev/null differ diff --git a/projet_1/Objects/tp_board.dep b/projet_1/Objects/tp_board.dep index 910f31a..c8d3daa 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)(0x6416FB13)(-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)(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) 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)(0x6416FB22) -F (..\drivers\Driver_GPIO.c)(0x641732D9)(-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)(0x6416FB22) +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 (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)(0x6416FB22)() +F (..\drivers\Driver_GPIO.h)(0x641736B7)() 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 deleted file mode 100644 index 89ee1af..0000000 Binary files a/projet_1/Objects/tp_sim.axf and /dev/null differ diff --git a/projet_1/Objects/tp_sim.build_log.htm b/projet_1/Objects/tp_sim.build_log.htm index 3bbc32c..65ce604 100644 --- a/projet_1/Objects/tp_sim.build_log.htm +++ b/projet_1/Objects/tp_sim.build_log.htm @@ -28,12 +28,38 @@ 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... -linking... -Program Size: Code=620 RO-data=252 RW-data=0 ZI-data=1024 -".\Objects\tp_sim.axf" - 0 Error(s), 0 Warning(s). +".\Objects\tp_sim.axf" - 9 Error(s), 0 Warning(s).