Browse Source

fix many bugs (work done during lab session)

Yohan Simard 3 years ago
parent
commit
599b7f7c6b
41 changed files with 135 additions and 4401 deletions
  1. 6
    12
      .gitignore
  2. 0
    97
      MDK-ARM/DebugConfig/NUCLEO-F103RB_STM32F103RB_1.0.0.dbgconf
  3. 0
    97
      MDK-ARM/DebugConfig/Simulateur_STM32F103RB_1.0.0.dbgconf
  4. 0
    2
      MDK-ARM/NUCLEO-F103RB/ExtDll.iex
  5. 0
    58
      MDK-ARM/NUCLEO-F103RB/NUCLEO-F103RB.build_log.htm
  6. 0
    549
      MDK-ARM/NUCLEO-F103RB/NUCLEO-F103RB.map
  7. 0
    16
      MDK-ARM/NUCLEO-F103RB/NUCLEO-F103RB.sct
  8. BIN
      MDK-ARM/NUCLEO-F103RB/chrono.crf
  9. BIN
      MDK-ARM/NUCLEO-F103RB/main.crf
  10. BIN
      MDK-ARM/NUCLEO-F103RB/mytimer.crf
  11. BIN
      MDK-ARM/NUCLEO-F103RB/stm32f1xx_it.crf
  12. 0
    2
      MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_adc.d
  13. 0
    2
      MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_crc.d
  14. 0
    2
      MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_dac.d
  15. 0
    2
      MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_dma.d
  16. 0
    2
      MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_exti.d
  17. 0
    2
      MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_gpio.d
  18. 0
    2
      MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_i2c.d
  19. 0
    2
      MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_pwr.d
  20. BIN
      MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_rcc.crf
  21. 0
    2
      MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_rtc.d
  22. 0
    2
      MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_spi.d
  23. BIN
      MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_tim.crf
  24. 0
    2
      MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_usart.d
  25. BIN
      MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_utils.crf
  26. BIN
      MDK-ARM/NUCLEO-F103RB/system_stm32f1xx.crf
  27. 0
    3385
      MDK-ARM/Project.uvguix.trocache
  28. 83
    95
      MDK-ARM/Project.uvoptx
  29. 1
    1
      MDK-ARM/Project.uvprojx
  30. 0
    20
      MDK-ARM/RTE/_NUCLEO-F103RB/RTE_Components.h
  31. 0
    21
      MDK-ARM/RTE/_Simulateur/RTE_Components.h
  32. 3
    3
      MyDrivers/ADC.c
  33. 7
    6
      MyDrivers/Timer.c
  34. 1
    1
      MyDrivers/Timer.h
  35. 10
    2
      Services/DCMotor.c
  36. 4
    4
      Services/RFReceiver.c
  37. 5
    1
      Services/ServoMotor.c
  38. 9
    3
      Src/Orientation.c
  39. 1
    1
      Src/Roll.c
  40. 3
    3
      Src/Sail.c
  41. 2
    2
      Src/main.c

+ 6
- 12
.gitignore View File

@@ -1,12 +1,6 @@
1
-/
2
-*.o
3
-*.d
4
-*.crf
5
-!/README.md
6
-!/Src/
7
-!/Services/
8
-!/MyDrivers/
9
-!/LLDrivers/
10
-/MDK-ARM/
11
-!/Inc
12
-!/.gitignore
1
+/MDK-ARM/DebugConfig
2
+/MDK-ARM/RTE
3
+/MDK-ARM/NUCLEO-F103RB
4
+/MDK-ARM/Project.uvguix.*
5
+/MDK-ARM/EventRecorderStub.scvd
6
+/MDK-ARM/startup_stm32f103xb.lst

+ 0
- 97
MDK-ARM/DebugConfig/NUCLEO-F103RB_STM32F103RB_1.0.0.dbgconf View File

@@ -1,97 +0,0 @@
1
-// <<< Use Configuration Wizard in Context Menu >>>
2
-// <h> Debug MCU Configuration
3
-//   <o0.0>    DBG_SLEEP
4
-// <i> Debug Sleep Mode
5
-// <i> 0: (FCLK=On, HCLK=Off) FCLK is clocked by the system clock as previously configured by the software while HCLK is disabled
6
-// <i> 1: (FCLK=On, HCLK=On) HCLK is fed by the same clock that is provided to FCLK
7
-//   <o0.1>    DBG_STOP
8
-// <i> Debug Stop Mode
9
-// <i> 0: (FCLK=Off, HCLK=Off) Clock controller disables all clocks
10
-// <i> 1: (FCLK=On, HCLK=On) FCLK and HCLK are provided by the internal RC oscillator which remains active
11
-//   <o0.2>    DBG_STANDBY
12
-// <i> Debug Standby Mode
13
-// <i> 0: (FCLK=Off, HCLK=Off) The whole digital part is unpowered.
14
-// <i> 1: (FCLK=On, HCLK=On) Digital part is powered and FCLK and HCLK are provided by the internal RC oscillator which remains active
15
-//   <o0.8>    DBG_IWDG_STOP
16
-// <i> Debug independent watchdog stopped when core is halted
17
-// <i> 0: The watchdog counter clock continues even if the core is halted
18
-// <i> 1: The watchdog counter clock is stopped when the core is halted
19
-//   <o0.9>    DBG_WWDG_STOP
20
-// <i> Debug window watchdog stopped when core is halted
21
-// <i> 0: The window watchdog counter clock continues even if the core is halted
22
-// <i> 1: The window watchdog counter clock is stopped when the core is halted
23
-//   <o0.10>   DBG_TIM1_STOP
24
-// <i> Timer 1 counter stopped when core is halted
25
-// <i> 0: The clock of the involved Timer Counter is fed even if the core is halted
26
-// <i> 1: The clock of the involved Timer counter is stopped when the core is halted
27
-//   <o0.11>   DBG_TIM2_STOP
28
-// <i> Timer 2 counter stopped when core is halted
29
-// <i> 0: The clock of the involved Timer Counter is fed even if the core is halted
30
-// <i> 1: The clock of the involved Timer counter is stopped when the core is halted
31
-//   <o0.12>   DBG_TIM3_STOP
32
-// <i> Timer 3 counter stopped when core is halted
33
-// <i> 0: The clock of the involved Timer Counter is fed even if the core is halted
34
-// <i> 1: The clock of the involved Timer counter is stopped when the core is halted
35
-//   <o0.13>   DBG_TIM4_STOP
36
-// <i> Timer 4 counter stopped when core is halted
37
-// <i> 0: The clock of the involved Timer Counter is fed even if the core is halted
38
-// <i> 1: The clock of the involved Timer counter is stopped when the core is halted
39
-//   <o0.14>   DBG_CAN1_STOP
40
-// <i> Debug CAN1 stopped when Core is halted
41
-// <i> 0: Same behavior as in normal mode
42
-// <i> 1: CAN1 receive registers are frozen
43
-//   <o0.15>   DBG_I2C1_SMBUS_TIMEOUT
44
-// <i> I2C1 SMBUS timeout mode stopped when Core is halted
45
-// <i> 0: Same behavior as in normal mode
46
-// <i> 1: The SMBUS timeout is frozen
47
-//   <o0.16>   DBG_I2C2_SMBUS_TIMEOUT
48
-// <i> I2C2 SMBUS timeout mode stopped when Core is halted
49
-// <i> 0: Same behavior as in normal mode
50
-// <i> 1: The SMBUS timeout is frozen
51
-//   <o0.17>   DBG_TIM8_STOP
52
-// <i> Timer 8 counter stopped when core is halted
53
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
54
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
55
-//   <o0.18>   DBG_TIM5_STOP
56
-// <i> Timer 5 counter stopped when core is halted
57
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
58
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
59
-//   <o0.19>   DBG_TIM6_STOP
60
-// <i> Timer 6 counter stopped when core is halted
61
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
62
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
63
-//   <o0.20>   DBG_TIM7_STOP
64
-// <i> Timer 7 counter stopped when core is halted
65
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
66
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
67
-//   <o0.21>   DBG_CAN2_STOP
68
-// <i> Debug CAN2 stopped when Core is halted
69
-// <i> 0: Same behavior as in normal mode
70
-// <i> 1: CAN2 receive registers are frozen
71
-//   <o0.25>   DBG_TIM12_STOP
72
-// <i> Timer 12 counter stopped when core is halted
73
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
74
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
75
-//   <o0.26>   DBG_TIM13_STOP
76
-// <i> Timer 13 counter stopped when core is halted
77
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
78
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
79
-//   <o0.27>   DBG_TIM14_STOP
80
-// <i> Timer 14 counter stopped when core is halted
81
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
82
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
83
-//   <o0.28>   DBG_TIM9_STOP
84
-// <i> Timer 9 counter stopped when core is halted
85
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
86
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
87
-//   <o0.29>   DBG_TIM10_STOP
88
-// <i> Timer 10 counter stopped when core is halted
89
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
90
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
91
-//   <o0.30>   DBG_TIM11_STOP
92
-// <i> Timer 11 counter stopped when core is halted
93
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
94
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
95
-// </h>
96
-DbgMCU_CR = 0x00000007;
97
-// <<< end of configuration section >>>

+ 0
- 97
MDK-ARM/DebugConfig/Simulateur_STM32F103RB_1.0.0.dbgconf View File

@@ -1,97 +0,0 @@
1
-// <<< Use Configuration Wizard in Context Menu >>>
2
-// <h> Debug MCU Configuration
3
-//   <o0.0>    DBG_SLEEP
4
-// <i> Debug Sleep Mode
5
-// <i> 0: (FCLK=On, HCLK=Off) FCLK is clocked by the system clock as previously configured by the software while HCLK is disabled
6
-// <i> 1: (FCLK=On, HCLK=On) HCLK is fed by the same clock that is provided to FCLK
7
-//   <o0.1>    DBG_STOP
8
-// <i> Debug Stop Mode
9
-// <i> 0: (FCLK=Off, HCLK=Off) Clock controller disables all clocks
10
-// <i> 1: (FCLK=On, HCLK=On) FCLK and HCLK are provided by the internal RC oscillator which remains active
11
-//   <o0.2>    DBG_STANDBY
12
-// <i> Debug Standby Mode
13
-// <i> 0: (FCLK=Off, HCLK=Off) The whole digital part is unpowered.
14
-// <i> 1: (FCLK=On, HCLK=On) Digital part is powered and FCLK and HCLK are provided by the internal RC oscillator which remains active
15
-//   <o0.8>    DBG_IWDG_STOP
16
-// <i> Debug independent watchdog stopped when core is halted
17
-// <i> 0: The watchdog counter clock continues even if the core is halted
18
-// <i> 1: The watchdog counter clock is stopped when the core is halted
19
-//   <o0.9>    DBG_WWDG_STOP
20
-// <i> Debug window watchdog stopped when core is halted
21
-// <i> 0: The window watchdog counter clock continues even if the core is halted
22
-// <i> 1: The window watchdog counter clock is stopped when the core is halted
23
-//   <o0.10>   DBG_TIM1_STOP
24
-// <i> Timer 1 counter stopped when core is halted
25
-// <i> 0: The clock of the involved Timer Counter is fed even if the core is halted
26
-// <i> 1: The clock of the involved Timer counter is stopped when the core is halted
27
-//   <o0.11>   DBG_TIM2_STOP
28
-// <i> Timer 2 counter stopped when core is halted
29
-// <i> 0: The clock of the involved Timer Counter is fed even if the core is halted
30
-// <i> 1: The clock of the involved Timer counter is stopped when the core is halted
31
-//   <o0.12>   DBG_TIM3_STOP
32
-// <i> Timer 3 counter stopped when core is halted
33
-// <i> 0: The clock of the involved Timer Counter is fed even if the core is halted
34
-// <i> 1: The clock of the involved Timer counter is stopped when the core is halted
35
-//   <o0.13>   DBG_TIM4_STOP
36
-// <i> Timer 4 counter stopped when core is halted
37
-// <i> 0: The clock of the involved Timer Counter is fed even if the core is halted
38
-// <i> 1: The clock of the involved Timer counter is stopped when the core is halted
39
-//   <o0.14>   DBG_CAN1_STOP
40
-// <i> Debug CAN1 stopped when Core is halted
41
-// <i> 0: Same behavior as in normal mode
42
-// <i> 1: CAN1 receive registers are frozen
43
-//   <o0.15>   DBG_I2C1_SMBUS_TIMEOUT
44
-// <i> I2C1 SMBUS timeout mode stopped when Core is halted
45
-// <i> 0: Same behavior as in normal mode
46
-// <i> 1: The SMBUS timeout is frozen
47
-//   <o0.16>   DBG_I2C2_SMBUS_TIMEOUT
48
-// <i> I2C2 SMBUS timeout mode stopped when Core is halted
49
-// <i> 0: Same behavior as in normal mode
50
-// <i> 1: The SMBUS timeout is frozen
51
-//   <o0.17>   DBG_TIM8_STOP
52
-// <i> Timer 8 counter stopped when core is halted
53
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
54
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
55
-//   <o0.18>   DBG_TIM5_STOP
56
-// <i> Timer 5 counter stopped when core is halted
57
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
58
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
59
-//   <o0.19>   DBG_TIM6_STOP
60
-// <i> Timer 6 counter stopped when core is halted
61
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
62
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
63
-//   <o0.20>   DBG_TIM7_STOP
64
-// <i> Timer 7 counter stopped when core is halted
65
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
66
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
67
-//   <o0.21>   DBG_CAN2_STOP
68
-// <i> Debug CAN2 stopped when Core is halted
69
-// <i> 0: Same behavior as in normal mode
70
-// <i> 1: CAN2 receive registers are frozen
71
-//   <o0.25>   DBG_TIM12_STOP
72
-// <i> Timer 12 counter stopped when core is halted
73
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
74
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
75
-//   <o0.26>   DBG_TIM13_STOP
76
-// <i> Timer 13 counter stopped when core is halted
77
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
78
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
79
-//   <o0.27>   DBG_TIM14_STOP
80
-// <i> Timer 14 counter stopped when core is halted
81
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
82
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
83
-//   <o0.28>   DBG_TIM9_STOP
84
-// <i> Timer 9 counter stopped when core is halted
85
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
86
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
87
-//   <o0.29>   DBG_TIM10_STOP
88
-// <i> Timer 10 counter stopped when core is halted
89
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
90
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
91
-//   <o0.30>   DBG_TIM11_STOP
92
-// <i> Timer 11 counter stopped when core is halted
93
-// <i> 0: The clock of the involved timer counter is fed even if the core is halted, and the outputs behave normally.
94
-// <i> 1: The clock of the involved timer counter is stopped when the core is halted, and the outputs are disabled (as if there were an emergency stop in response to a break event).
95
-// </h>
96
-DbgMCU_CR = 0x00000007;
97
-// <<< end of configuration section >>>

+ 0
- 2
MDK-ARM/NUCLEO-F103RB/ExtDll.iex View File

@@ -1,2 +0,0 @@
1
-[EXTDLL]
2
-Count=0

+ 0
- 58
MDK-ARM/NUCLEO-F103RB/NUCLEO-F103RB.build_log.htm View File

@@ -1,58 +0,0 @@
1
-<html>
2
-<body>
3
-<pre>
4
-<h1>µVision Build Log</h1>
5
-<h2>Tool Versions:</h2>
6
-IDE-Version: µVision V5.31.0.0
7
-Copyright (C) 2020 ARM Ltd and ARM Germany GmbH. All rights reserved.
8
-License Information: Toyoste Biencuit, a, LIC=----
9
- 
10
-Tool Versions:
11
-Toolchain:       MDK-Lite  Version: 5.31.0.0
12
-Toolchain Path:  C:\Keil_v5\ARM\ARMCC\Bin
13
-C Compiler:      Armcc.exe V5.06 update 6 (build 750)
14
-Assembler:       Armasm.exe V5.06 update 6 (build 750)
15
-Linker/Locator:  ArmLink.exe V5.06 update 6 (build 750)
16
-Library Manager: ArmAr.exe V5.06 update 6 (build 750)
17
-Hex Converter:   FromElf.exe V5.06 update 6 (build 750)
18
-CPU DLL:         SARMCM3.DLL V5.31.0.0
19
-Dialog DLL:      DARMSTM.DLL V1.68.0.0
20
-Target DLL:      STLink\ST-LINKIII-KEIL_SWO.dll V3.0.7.0
21
-Dialog DLL:      TARMSTM.DLL V1.66.0.0
22
- 
23
-<h2>Project:</h2>
24
-C:\users\vergnet\My Documents\INSA\4A\Info Mat\projet_voilier\MDK-ARM\Project.uvprojx
25
-Project File Date:  10/19/2020
26
-
27
-<h2>Output:</h2>
28
-*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
29
-Build target 'Simulateur'
30
-linking...
31
-Program Size: Code=1464 RO-data=268 RW-data=28 ZI-data=1028  
32
-"NUCLEO-F103RB\NUCLEO-F103RB.axf" - 0 Error(s), 0 Warning(s).
33
-
34
-<h2>Software Packages used:</h2>
35
-
36
-Package Vendor: ARM
37
-                http://www.keil.com/pack/ARM.CMSIS.5.7.0.pack
38
-                ARM.CMSIS.5.7.0
39
-                CMSIS (Cortex Microcontroller Software Interface Standard)
40
-   * Component: CORE Version: 5.4.0
41
-
42
-Package Vendor: Keil
43
-                http://www.keil.com/pack/Keil.STM32F1xx_DFP.2.3.0.pack
44
-                Keil.STM32F1xx_DFP.2.3.0
45
-                STMicroelectronics STM32F1 Series Device Support, Drivers and Examples
46
-
47
-<h2>Collection of Component include folders:</h2>
48
-  .\RTE\_Simulateur
49
-  C:\ARM\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include
50
-  C:\ARM\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include
51
-
52
-<h2>Collection of Component Files used:</h2>
53
-
54
-   * Component: ARM::CMSIS:CORE:5.4.0
55
-Build Time Elapsed:  00:00:01
56
-</pre>
57
-</body>
58
-</html>

+ 0
- 549
MDK-ARM/NUCLEO-F103RB/NUCLEO-F103RB.map View File

@@ -1,549 +0,0 @@
1
-Component: ARM Compiler 5.06 update 6 (build 750) Tool: armlink [4d35ed]
2
-
3
-==============================================================================
4
-
5
-Section Cross References
6
-
7
-    main.o(i.SystemClock_Config) refers to stm32f1xx_ll_utils.o(i.LL_Init1msTick) for LL_Init1msTick
8
-    main.o(i.SystemClock_Config) refers to stm32f1xx_ll_utils.o(i.LL_SetSystemCoreClock) for LL_SetSystemCoreClock
9
-    main.o(i.main) refers to main.o(i.SystemClock_Config) for SystemClock_Config
10
-    main.o(i.main) refers to chrono.o(i.Chrono_Conf) for Chrono_Conf
11
-    main.o(i.main) refers to chrono.o(i.Chrono_Start) for Chrono_Start
12
-    chrono.o(i.Chrono_Conf) refers to timer.o(i.MyTimer_Conf) for MyTimer_Conf
13
-    chrono.o(i.Chrono_Conf) refers to timer.o(i.MyTimer_IT_Conf) for MyTimer_IT_Conf
14
-    chrono.o(i.Chrono_Conf) refers to timer.o(i.MyTimer_IT_Enable) for MyTimer_IT_Enable
15
-    chrono.o(i.Chrono_Conf) refers to chrono.o(.data) for Chrono_Time
16
-    chrono.o(i.Chrono_Conf) refers to chrono.o(i.Chrono_Task_10ms) for Chrono_Task_10ms
17
-    chrono.o(i.Chrono_Read) refers to chrono.o(.data) for Chrono_Time
18
-    chrono.o(i.Chrono_Reset) refers to timer.o(i.MyTimer_Stop) for MyTimer_Stop
19
-    chrono.o(i.Chrono_Reset) refers to chrono.o(.data) for Chrono_Timer
20
-    chrono.o(i.Chrono_Start) refers to timer.o(i.MyTimer_Start) for MyTimer_Start
21
-    chrono.o(i.Chrono_Start) refers to chrono.o(.data) for Chrono_Timer
22
-    chrono.o(i.Chrono_Stop) refers to timer.o(i.MyTimer_Stop) for MyTimer_Stop
23
-    chrono.o(i.Chrono_Stop) refers to chrono.o(.data) for Chrono_Timer
24
-    chrono.o(i.Chrono_Task_10ms) refers to chrono.o(.data) for Chrono_Time
25
-    timer.o(i.MyTimer_Conf) refers to timer.o(i.LL_APB1_GRP1_EnableClock) for LL_APB1_GRP1_EnableClock
26
-    timer.o(i.MyTimer_Conf) refers to stm32f1xx_ll_tim.o(i.LL_TIM_Init) for LL_TIM_Init
27
-    timer.o(i.MyTimer_Conf) refers to timer.o(i.LL_TIM_DisableIT_UPDATE) for LL_TIM_DisableIT_UPDATE
28
-    timer.o(i.MyTimer_Conf) refers to timer.o(i.LL_TIM_DisableCounter) for LL_TIM_DisableCounter
29
-    timer.o(i.MyTimer_IT_Conf) refers to timer.o(i.LL_TIM_DisableIT_UPDATE) for LL_TIM_DisableIT_UPDATE
30
-    timer.o(i.MyTimer_IT_Conf) refers to timer.o(.data) for Ptr_ItFct_TIM1
31
-    timer.o(i.MyTimer_IT_Disable) refers to timer.o(i.LL_TIM_DisableIT_UPDATE) for LL_TIM_DisableIT_UPDATE
32
-    timer.o(i.MyTimer_Stop) refers to timer.o(i.LL_TIM_DisableCounter) for LL_TIM_DisableCounter
33
-    timer.o(i.TIM1_UP_IRQHandler) refers to timer.o(i.LL_TIM_ClearFlag_UPDATE) for LL_TIM_ClearFlag_UPDATE
34
-    timer.o(i.TIM1_UP_IRQHandler) refers to timer.o(.data) for Ptr_ItFct_TIM1
35
-    timer.o(i.TIM2_IRQHandler) refers to timer.o(i.LL_TIM_ClearFlag_UPDATE) for LL_TIM_ClearFlag_UPDATE
36
-    timer.o(i.TIM2_IRQHandler) refers to timer.o(.data) for Ptr_ItFct_TIM2
37
-    timer.o(i.TIM3_IRQHandler) refers to timer.o(i.LL_TIM_ClearFlag_UPDATE) for LL_TIM_ClearFlag_UPDATE
38
-    timer.o(i.TIM3_IRQHandler) refers to timer.o(.data) for Ptr_ItFct_TIM3
39
-    timer.o(i.TIM4_IRQHandler) refers to timer.o(i.LL_TIM_ClearFlag_UPDATE) for LL_TIM_ClearFlag_UPDATE
40
-    timer.o(i.TIM4_IRQHandler) refers to timer.o(.data) for Ptr_ItFct_TIM4
41
-    stm32f1xx_ll_rcc.o(i.LL_RCC_DeInit) refers to stm32f1xx_ll_rcc.o(i.LL_RCC_PLL_IsReady) for LL_RCC_PLL_IsReady
42
-    stm32f1xx_ll_rcc.o(i.LL_RCC_GetADCClockFreq) refers to main.o(i.assert_failed) for assert_failed
43
-    stm32f1xx_ll_rcc.o(i.LL_RCC_GetADCClockFreq) refers to stm32f1xx_ll_rcc.o(i.RCC_GetSystemClockFreq) for RCC_GetSystemClockFreq
44
-    stm32f1xx_ll_rcc.o(i.LL_RCC_GetADCClockFreq) refers to stm32f1xx_ll_rcc.o(i.RCC_GetHCLKClockFreq) for RCC_GetHCLKClockFreq
45
-    stm32f1xx_ll_rcc.o(i.LL_RCC_GetADCClockFreq) refers to stm32f1xx_ll_rcc.o(i.RCC_GetPCLK2ClockFreq) for RCC_GetPCLK2ClockFreq
46
-    stm32f1xx_ll_rcc.o(i.LL_RCC_GetSystemClocksFreq) refers to stm32f1xx_ll_rcc.o(i.RCC_GetSystemClockFreq) for RCC_GetSystemClockFreq
47
-    stm32f1xx_ll_rcc.o(i.LL_RCC_GetSystemClocksFreq) refers to stm32f1xx_ll_rcc.o(i.RCC_GetHCLKClockFreq) for RCC_GetHCLKClockFreq
48
-    stm32f1xx_ll_rcc.o(i.LL_RCC_GetSystemClocksFreq) refers to stm32f1xx_ll_rcc.o(i.RCC_GetPCLK1ClockFreq) for RCC_GetPCLK1ClockFreq
49
-    stm32f1xx_ll_rcc.o(i.LL_RCC_GetSystemClocksFreq) refers to stm32f1xx_ll_rcc.o(i.RCC_GetPCLK2ClockFreq) for RCC_GetPCLK2ClockFreq
50
-    stm32f1xx_ll_rcc.o(i.LL_RCC_GetUSBClockFreq) refers to main.o(i.assert_failed) for assert_failed
51
-    stm32f1xx_ll_rcc.o(i.LL_RCC_GetUSBClockFreq) refers to stm32f1xx_ll_rcc.o(i.LL_RCC_PLL_IsReady) for LL_RCC_PLL_IsReady
52
-    stm32f1xx_ll_rcc.o(i.LL_RCC_GetUSBClockFreq) refers to stm32f1xx_ll_rcc.o(i.RCC_PLL_GetFreqDomain_SYS) for RCC_PLL_GetFreqDomain_SYS
53
-    stm32f1xx_ll_rcc.o(i.RCC_GetHCLKClockFreq) refers to system_stm32f1xx.o(.constdata) for AHBPrescTable
54
-    stm32f1xx_ll_rcc.o(i.RCC_GetPCLK1ClockFreq) refers to system_stm32f1xx.o(.constdata) for APBPrescTable
55
-    stm32f1xx_ll_rcc.o(i.RCC_GetPCLK2ClockFreq) refers to system_stm32f1xx.o(.constdata) for APBPrescTable
56
-    stm32f1xx_ll_rcc.o(i.RCC_GetSystemClockFreq) refers to stm32f1xx_ll_rcc.o(i.RCC_PLL_GetFreqDomain_SYS) for RCC_PLL_GetFreqDomain_SYS
57
-    stm32f1xx_ll_utils.o(i.LL_PLL_ConfigSystemClock_HSE) refers to main.o(i.assert_failed) for assert_failed
58
-    stm32f1xx_ll_utils.o(i.LL_PLL_ConfigSystemClock_HSE) refers to stm32f1xx_ll_utils.o(i.UTILS_PLL_IsBusy) for UTILS_PLL_IsBusy
59
-    stm32f1xx_ll_utils.o(i.LL_PLL_ConfigSystemClock_HSE) refers to stm32f1xx_ll_utils.o(i.UTILS_GetPLLOutputFrequency) for UTILS_GetPLLOutputFrequency
60
-    stm32f1xx_ll_utils.o(i.LL_PLL_ConfigSystemClock_HSE) refers to stm32f1xx_ll_utils.o(i.LL_RCC_HSE_IsReady) for LL_RCC_HSE_IsReady
61
-    stm32f1xx_ll_utils.o(i.LL_PLL_ConfigSystemClock_HSE) refers to stm32f1xx_ll_utils.o(i.LL_RCC_PLL_ConfigDomain_SYS) for LL_RCC_PLL_ConfigDomain_SYS
62
-    stm32f1xx_ll_utils.o(i.LL_PLL_ConfigSystemClock_HSE) refers to stm32f1xx_ll_utils.o(i.UTILS_EnablePLLAndSwitchSystem) for UTILS_EnablePLLAndSwitchSystem
63
-    stm32f1xx_ll_utils.o(i.LL_PLL_ConfigSystemClock_HSI) refers to stm32f1xx_ll_utils.o(i.UTILS_PLL_IsBusy) for UTILS_PLL_IsBusy
64
-    stm32f1xx_ll_utils.o(i.LL_PLL_ConfigSystemClock_HSI) refers to stm32f1xx_ll_utils.o(i.UTILS_GetPLLOutputFrequency) for UTILS_GetPLLOutputFrequency
65
-    stm32f1xx_ll_utils.o(i.LL_PLL_ConfigSystemClock_HSI) refers to stm32f1xx_ll_utils.o(i.LL_RCC_HSI_IsReady) for LL_RCC_HSI_IsReady
66
-    stm32f1xx_ll_utils.o(i.LL_PLL_ConfigSystemClock_HSI) refers to stm32f1xx_ll_utils.o(i.LL_RCC_PLL_ConfigDomain_SYS) for LL_RCC_PLL_ConfigDomain_SYS
67
-    stm32f1xx_ll_utils.o(i.LL_PLL_ConfigSystemClock_HSI) refers to stm32f1xx_ll_utils.o(i.UTILS_EnablePLLAndSwitchSystem) for UTILS_EnablePLLAndSwitchSystem
68
-    stm32f1xx_ll_utils.o(i.LL_SetSystemCoreClock) refers to system_stm32f1xx.o(.data) for SystemCoreClock
69
-    stm32f1xx_ll_utils.o(i.UTILS_EnablePLLAndSwitchSystem) refers to main.o(i.assert_failed) for assert_failed
70
-    stm32f1xx_ll_utils.o(i.UTILS_EnablePLLAndSwitchSystem) refers to stm32f1xx_ll_utils.o(i.UTILS_SetFlashLatency) for UTILS_SetFlashLatency
71
-    stm32f1xx_ll_utils.o(i.UTILS_EnablePLLAndSwitchSystem) refers to stm32f1xx_ll_utils.o(i.LL_RCC_PLL_IsReady) for LL_RCC_PLL_IsReady
72
-    stm32f1xx_ll_utils.o(i.UTILS_EnablePLLAndSwitchSystem) refers to stm32f1xx_ll_utils.o(i.LL_SetSystemCoreClock) for LL_SetSystemCoreClock
73
-    stm32f1xx_ll_utils.o(i.UTILS_EnablePLLAndSwitchSystem) refers to system_stm32f1xx.o(.constdata) for AHBPrescTable
74
-    stm32f1xx_ll_utils.o(i.UTILS_EnablePLLAndSwitchSystem) refers to system_stm32f1xx.o(.data) for SystemCoreClock
75
-    stm32f1xx_ll_utils.o(i.UTILS_GetPLLOutputFrequency) refers to main.o(i.assert_failed) for assert_failed
76
-    stm32f1xx_ll_utils.o(i.UTILS_PLL_IsBusy) refers to stm32f1xx_ll_utils.o(i.LL_RCC_PLL_IsReady) for LL_RCC_PLL_IsReady
77
-    stm32f1xx_ll_tim.o(i.IC1Config) refers to main.o(i.assert_failed) for assert_failed
78
-    stm32f1xx_ll_tim.o(i.IC2Config) refers to main.o(i.assert_failed) for assert_failed
79
-    stm32f1xx_ll_tim.o(i.IC3Config) refers to main.o(i.assert_failed) for assert_failed
80
-    stm32f1xx_ll_tim.o(i.IC4Config) refers to main.o(i.assert_failed) for assert_failed
81
-    stm32f1xx_ll_tim.o(i.LL_TIM_BDTR_Init) refers to main.o(i.assert_failed) for assert_failed
82
-    stm32f1xx_ll_tim.o(i.LL_TIM_DeInit) refers to main.o(i.assert_failed) for assert_failed
83
-    stm32f1xx_ll_tim.o(i.LL_TIM_DeInit) refers to stm32f1xx_ll_tim.o(i.LL_APB1_GRP1_ForceReset) for LL_APB1_GRP1_ForceReset
84
-    stm32f1xx_ll_tim.o(i.LL_TIM_DeInit) refers to stm32f1xx_ll_tim.o(i.LL_APB1_GRP1_ReleaseReset) for LL_APB1_GRP1_ReleaseReset
85
-    stm32f1xx_ll_tim.o(i.LL_TIM_ENCODER_Init) refers to main.o(i.assert_failed) for assert_failed
86
-    stm32f1xx_ll_tim.o(i.LL_TIM_HALLSENSOR_Init) refers to main.o(i.assert_failed) for assert_failed
87
-    stm32f1xx_ll_tim.o(i.LL_TIM_HALLSENSOR_Init) refers to stm32f1xx_ll_tim.o(i.LL_TIM_OC_SetCompareCH2) for LL_TIM_OC_SetCompareCH2
88
-    stm32f1xx_ll_tim.o(i.LL_TIM_IC_Init) refers to stm32f1xx_ll_tim.o(i.IC1Config) for IC1Config
89
-    stm32f1xx_ll_tim.o(i.LL_TIM_IC_Init) refers to stm32f1xx_ll_tim.o(i.IC2Config) for IC2Config
90
-    stm32f1xx_ll_tim.o(i.LL_TIM_IC_Init) refers to stm32f1xx_ll_tim.o(i.IC3Config) for IC3Config
91
-    stm32f1xx_ll_tim.o(i.LL_TIM_IC_Init) refers to stm32f1xx_ll_tim.o(i.IC4Config) for IC4Config
92
-    stm32f1xx_ll_tim.o(i.LL_TIM_Init) refers to main.o(i.assert_failed) for assert_failed
93
-    stm32f1xx_ll_tim.o(i.LL_TIM_OC_Init) refers to stm32f1xx_ll_tim.o(i.OC1Config) for OC1Config
94
-    stm32f1xx_ll_tim.o(i.LL_TIM_OC_Init) refers to stm32f1xx_ll_tim.o(i.OC2Config) for OC2Config
95
-    stm32f1xx_ll_tim.o(i.LL_TIM_OC_Init) refers to stm32f1xx_ll_tim.o(i.OC3Config) for OC3Config
96
-    stm32f1xx_ll_tim.o(i.LL_TIM_OC_Init) refers to stm32f1xx_ll_tim.o(i.OC4Config) for OC4Config
97
-    stm32f1xx_ll_tim.o(i.OC1Config) refers to main.o(i.assert_failed) for assert_failed
98
-    stm32f1xx_ll_tim.o(i.OC2Config) refers to main.o(i.assert_failed) for assert_failed
99
-    stm32f1xx_ll_tim.o(i.OC2Config) refers to stm32f1xx_ll_tim.o(i.LL_TIM_OC_SetCompareCH2) for LL_TIM_OC_SetCompareCH2
100
-    stm32f1xx_ll_tim.o(i.OC3Config) refers to main.o(i.assert_failed) for assert_failed
101
-    stm32f1xx_ll_tim.o(i.OC4Config) refers to main.o(i.assert_failed) for assert_failed
102
-    system_stm32f1xx.o(i.SystemCoreClockUpdate) refers to system_stm32f1xx.o(.data) for SystemCoreClock
103
-    system_stm32f1xx.o(i.SystemCoreClockUpdate) refers to system_stm32f1xx.o(.constdata) for AHBPrescTable
104
-    startup_stm32f103xb.o(RESET) refers to startup_stm32f103xb.o(STACK) for __initial_sp
105
-    startup_stm32f103xb.o(RESET) refers to startup_stm32f103xb.o(.text) for Reset_Handler
106
-    startup_stm32f103xb.o(RESET) refers to timer.o(i.TIM1_UP_IRQHandler) for TIM1_UP_IRQHandler
107
-    startup_stm32f103xb.o(RESET) refers to timer.o(i.TIM2_IRQHandler) for TIM2_IRQHandler
108
-    startup_stm32f103xb.o(RESET) refers to timer.o(i.TIM3_IRQHandler) for TIM3_IRQHandler
109
-    startup_stm32f103xb.o(RESET) refers to timer.o(i.TIM4_IRQHandler) for TIM4_IRQHandler
110
-    startup_stm32f103xb.o(.text) refers to system_stm32f1xx.o(i.SystemInit) for SystemInit
111
-    startup_stm32f103xb.o(.text) refers to entry.o(.ARM.Collect$$$$00000000) for __main
112
-    entry.o(.ARM.Collect$$$$00000000) refers (Special) to entry10a.o(.ARM.Collect$$$$0000000D) for __rt_final_cpp
113
-    entry.o(.ARM.Collect$$$$00000000) refers (Special) to entry11a.o(.ARM.Collect$$$$0000000F) for __rt_final_exit
114
-    entry.o(.ARM.Collect$$$$00000000) refers (Special) to entry7b.o(.ARM.Collect$$$$00000008) for _main_clock
115
-    entry.o(.ARM.Collect$$$$00000000) refers (Special) to entry8b.o(.ARM.Collect$$$$0000000A) for _main_cpp_init
116
-    entry.o(.ARM.Collect$$$$00000000) refers (Special) to entry9a.o(.ARM.Collect$$$$0000000B) for _main_init
117
-    entry.o(.ARM.Collect$$$$00000000) refers (Special) to entry5.o(.ARM.Collect$$$$00000004) for _main_scatterload
118
-    entry.o(.ARM.Collect$$$$00000000) refers (Special) to entry2.o(.ARM.Collect$$$$00000001) for _main_stk
119
-    entry2.o(.ARM.Collect$$$$00000001) refers to entry2.o(.ARM.Collect$$$$00002712) for __lit__00000000
120
-    entry2.o(.ARM.Collect$$$$00002712) refers to startup_stm32f103xb.o(STACK) for __initial_sp
121
-    entry2.o(__vectab_stack_and_reset_area) refers to startup_stm32f103xb.o(STACK) for __initial_sp
122
-    entry2.o(__vectab_stack_and_reset_area) refers to entry.o(.ARM.Collect$$$$00000000) for __main
123
-    entry5.o(.ARM.Collect$$$$00000004) refers to init.o(.text) for __scatterload
124
-    entry9a.o(.ARM.Collect$$$$0000000B) refers to main.o(i.main) for main
125
-    entry9b.o(.ARM.Collect$$$$0000000C) refers to main.o(i.main) for main
126
-    init.o(.text) refers to entry5.o(.ARM.Collect$$$$00000004) for __main_after_scatterload
127
-
128
-
129
-==============================================================================
130
-
131
-Removing Unused input sections from the image.
132
-
133
-    Removing main.o(.rev16_text), (4 bytes).
134
-    Removing main.o(.revsh_text), (4 bytes).
135
-    Removing main.o(.rrx_text), (6 bytes).
136
-    Removing chrono.o(.rev16_text), (4 bytes).
137
-    Removing chrono.o(.revsh_text), (4 bytes).
138
-    Removing chrono.o(.rrx_text), (6 bytes).
139
-    Removing chrono.o(i.Chrono_Read), (8 bytes).
140
-    Removing chrono.o(i.Chrono_Reset), (32 bytes).
141
-    Removing chrono.o(i.Chrono_Stop), (16 bytes).
142
-    Removing timer.o(.rev16_text), (4 bytes).
143
-    Removing timer.o(.revsh_text), (4 bytes).
144
-    Removing timer.o(.rrx_text), (6 bytes).
145
-    Removing timer.o(i.MyTimer_IT_Disable), (12 bytes).
146
-    Removing timer.o(i.MyTimer_Stop), (12 bytes).
147
-    Removing timer.o(.constdata), (35 bytes).
148
-    Removing stm32f1xx_ll_rcc.o(.rev16_text), (4 bytes).
149
-    Removing stm32f1xx_ll_rcc.o(.revsh_text), (4 bytes).
150
-    Removing stm32f1xx_ll_rcc.o(.rrx_text), (6 bytes).
151
-    Removing stm32f1xx_ll_rcc.o(i.LL_RCC_DeInit), (152 bytes).
152
-    Removing stm32f1xx_ll_rcc.o(i.LL_RCC_GetADCClockFreq), (124 bytes).
153
-    Removing stm32f1xx_ll_rcc.o(i.LL_RCC_GetSystemClocksFreq), (36 bytes).
154
-    Removing stm32f1xx_ll_rcc.o(i.LL_RCC_GetUSBClockFreq), (120 bytes).
155
-    Removing stm32f1xx_ll_rcc.o(i.LL_RCC_PLL_IsReady), (16 bytes).
156
-    Removing stm32f1xx_ll_rcc.o(i.RCC_GetHCLKClockFreq), (32 bytes).
157
-    Removing stm32f1xx_ll_rcc.o(i.RCC_GetPCLK1ClockFreq), (36 bytes).
158
-    Removing stm32f1xx_ll_rcc.o(i.RCC_GetPCLK2ClockFreq), (36 bytes).
159
-    Removing stm32f1xx_ll_rcc.o(i.RCC_GetSystemClockFreq), (60 bytes).
160
-    Removing stm32f1xx_ll_rcc.o(i.RCC_PLL_GetFreqDomain_SYS), (88 bytes).
161
-    Removing stm32f1xx_ll_utils.o(.rev16_text), (4 bytes).
162
-    Removing stm32f1xx_ll_utils.o(.revsh_text), (4 bytes).
163
-    Removing stm32f1xx_ll_utils.o(.rrx_text), (6 bytes).
164
-    Removing stm32f1xx_ll_utils.o(i.LL_PLL_ConfigSystemClock_HSE), (260 bytes).
165
-    Removing stm32f1xx_ll_utils.o(i.LL_PLL_ConfigSystemClock_HSI), (104 bytes).
166
-    Removing stm32f1xx_ll_utils.o(i.LL_RCC_HSE_IsReady), (16 bytes).
167
-    Removing stm32f1xx_ll_utils.o(i.LL_RCC_HSI_IsReady), (16 bytes).
168
-    Removing stm32f1xx_ll_utils.o(i.LL_RCC_PLL_ConfigDomain_SYS), (28 bytes).
169
-    Removing stm32f1xx_ll_utils.o(i.LL_RCC_PLL_IsReady), (16 bytes).
170
-    Removing stm32f1xx_ll_utils.o(i.LL_mDelay), (40 bytes).
171
-    Removing stm32f1xx_ll_utils.o(i.UTILS_EnablePLLAndSwitchSystem), (416 bytes).
172
-    Removing stm32f1xx_ll_utils.o(i.UTILS_GetPLLOutputFrequency), (228 bytes).
173
-    Removing stm32f1xx_ll_utils.o(i.UTILS_PLL_IsBusy), (16 bytes).
174
-    Removing stm32f1xx_ll_utils.o(i.UTILS_SetFlashLatency), (80 bytes).
175
-    Removing stm32f1xx_ll_tim.o(.rev16_text), (4 bytes).
176
-    Removing stm32f1xx_ll_tim.o(.revsh_text), (4 bytes).
177
-    Removing stm32f1xx_ll_tim.o(.rrx_text), (6 bytes).
178
-    Removing stm32f1xx_ll_tim.o(i.IC1Config), (376 bytes).
179
-    Removing stm32f1xx_ll_tim.o(i.IC2Config), (376 bytes).
180
-    Removing stm32f1xx_ll_tim.o(i.IC3Config), (380 bytes).
181
-    Removing stm32f1xx_ll_tim.o(i.IC4Config), (380 bytes).
182
-    Removing stm32f1xx_ll_tim.o(i.LL_APB1_GRP1_ForceReset), (16 bytes).
183
-    Removing stm32f1xx_ll_tim.o(i.LL_APB1_GRP1_ReleaseReset), (16 bytes).
184
-    Removing stm32f1xx_ll_tim.o(i.LL_TIM_BDTR_Init), (312 bytes).
185
-    Removing stm32f1xx_ll_tim.o(i.LL_TIM_BDTR_StructInit), (18 bytes).
186
-    Removing stm32f1xx_ll_tim.o(i.LL_TIM_DeInit), (192 bytes).
187
-    Removing stm32f1xx_ll_tim.o(i.LL_TIM_ENCODER_Init), (688 bytes).
188
-    Removing stm32f1xx_ll_tim.o(i.LL_TIM_ENCODER_StructInit), (36 bytes).
189
-    Removing stm32f1xx_ll_tim.o(i.LL_TIM_HALLSENSOR_Init), (396 bytes).
190
-    Removing stm32f1xx_ll_tim.o(i.LL_TIM_HALLSENSOR_StructInit), (12 bytes).
191
-    Removing stm32f1xx_ll_tim.o(i.LL_TIM_IC_Init), (92 bytes).
192
-    Removing stm32f1xx_ll_tim.o(i.LL_TIM_IC_StructInit), (18 bytes).
193
-    Removing stm32f1xx_ll_tim.o(i.LL_TIM_OC_Init), (92 bytes).
194
-    Removing stm32f1xx_ll_tim.o(i.LL_TIM_OC_SetCompareCH2), (4 bytes).
195
-    Removing stm32f1xx_ll_tim.o(i.LL_TIM_OC_StructInit), (20 bytes).
196
-    Removing stm32f1xx_ll_tim.o(i.LL_TIM_StructInit), (18 bytes).
197
-    Removing stm32f1xx_ll_tim.o(i.OC1Config), (404 bytes).
198
-    Removing stm32f1xx_ll_tim.o(i.OC2Config), (404 bytes).
199
-    Removing stm32f1xx_ll_tim.o(i.OC3Config), (404 bytes).
200
-    Removing stm32f1xx_ll_tim.o(i.OC4Config), (372 bytes).
201
-    Removing stm32f1xx_ll_tim.o(.constdata), (35 bytes).
202
-    Removing system_stm32f1xx.o(.rev16_text), (4 bytes).
203
-    Removing system_stm32f1xx.o(.revsh_text), (4 bytes).
204
-    Removing system_stm32f1xx.o(.rrx_text), (6 bytes).
205
-    Removing system_stm32f1xx.o(i.SystemCoreClockUpdate), (164 bytes).
206
-    Removing system_stm32f1xx.o(.constdata), (24 bytes).
207
-    Removing startup_stm32f103xb.o(HEAP), (512 bytes).
208
-
209
-75 unused section(s) (total 7894 bytes) removed from the image.
210
-
211
-==============================================================================
212
-
213
-Image Symbol Table
214
-
215
-    Local Symbols
216
-
217
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
218
-
219
-    ../Src/main.c                            0x00000000   Number         0  main.o ABSOLUTE
220
-    ../Src/system_stm32f1xx.c                0x00000000   Number         0  system_stm32f1xx.o ABSOLUTE
221
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry8a.o ABSOLUTE
222
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry7b.o ABSOLUTE
223
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry7a.o ABSOLUTE
224
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry5.o ABSOLUTE
225
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry11b.o ABSOLUTE
226
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry2.o ABSOLUTE
227
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry10a.o ABSOLUTE
228
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry.o ABSOLUTE
229
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry11a.o ABSOLUTE
230
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry10b.o ABSOLUTE
231
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry9b.o ABSOLUTE
232
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry9a.o ABSOLUTE
233
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry8b.o ABSOLUTE
234
-    ..\LLDrivers\src\stm32f1xx_ll_rcc.c      0x00000000   Number         0  stm32f1xx_ll_rcc.o ABSOLUTE
235
-    ..\LLDrivers\src\stm32f1xx_ll_tim.c      0x00000000   Number         0  stm32f1xx_ll_tim.o ABSOLUTE
236
-    ..\LLDrivers\src\stm32f1xx_ll_utils.c    0x00000000   Number         0  stm32f1xx_ll_utils.o ABSOLUTE
237
-    ..\MyDrivers\ADC.c                       0x00000000   Number         0  adc.o ABSOLUTE
238
-    ..\MyDrivers\GPIO.c                      0x00000000   Number         0  gpio.o ABSOLUTE
239
-    ..\MyDrivers\Timer.c                     0x00000000   Number         0  timer.o ABSOLUTE
240
-    ..\MyDrivers\USART.c                     0x00000000   Number         0  usart.o ABSOLUTE
241
-    ..\Services\Accelerometer.c              0x00000000   Number         0  accelerometer.o ABSOLUTE
242
-    ..\Services\Chrono.c                     0x00000000   Number         0  chrono.o ABSOLUTE
243
-    ..\Services\DCMotor.c                    0x00000000   Number         0  dcmotor.o ABSOLUTE
244
-    ..\Services\IncrementalEncoder.c         0x00000000   Number         0  incrementalencoder.o ABSOLUTE
245
-    ..\Services\RFEmitter.c                  0x00000000   Number         0  rfemitter.o ABSOLUTE
246
-    ..\Services\RFReceiver.c                 0x00000000   Number         0  rfreceiver.o ABSOLUTE
247
-    ..\Services\ServoMotor.c                 0x00000000   Number         0  servomotor.o ABSOLUTE
248
-    ..\Services\Voltage.c                    0x00000000   Number         0  voltage.o ABSOLUTE
249
-    ..\Src\Display.c                         0x00000000   Number         0  display.o ABSOLUTE
250
-    ..\Src\Orientation.c                     0x00000000   Number         0  orientation.o ABSOLUTE
251
-    ..\Src\Roll.c                            0x00000000   Number         0  roll.o ABSOLUTE
252
-    ..\Src\Sail.c                            0x00000000   Number         0  sail.o ABSOLUTE
253
-    ..\Src\main.c                            0x00000000   Number         0  main.o ABSOLUTE
254
-    ..\Src\system_stm32f1xx.c                0x00000000   Number         0  system_stm32f1xx.o ABSOLUTE
255
-    ..\\LLDrivers\\src\\stm32f1xx_ll_rcc.c   0x00000000   Number         0  stm32f1xx_ll_rcc.o ABSOLUTE
256
-    ..\\LLDrivers\\src\\stm32f1xx_ll_tim.c   0x00000000   Number         0  stm32f1xx_ll_tim.o ABSOLUTE
257
-    ..\\LLDrivers\\src\\stm32f1xx_ll_utils.c 0x00000000   Number         0  stm32f1xx_ll_utils.o ABSOLUTE
258
-    ..\\MyDrivers\\Timer.c                   0x00000000   Number         0  timer.o ABSOLUTE
259
-    ..\\Services\\Chrono.c                   0x00000000   Number         0  chrono.o ABSOLUTE
260
-    dc.s                                     0x00000000   Number         0  dc.o ABSOLUTE
261
-    handlers.s                               0x00000000   Number         0  handlers.o ABSOLUTE
262
-    init.s                                   0x00000000   Number         0  init.o ABSOLUTE
263
-    startup_stm32f103xb.s                    0x00000000   Number         0  startup_stm32f103xb.o ABSOLUTE
264
-    RESET                                    0x08000000   Section      236  startup_stm32f103xb.o(RESET)
265
-    .ARM.Collect$$$$00000000                 0x080000ec   Section        0  entry.o(.ARM.Collect$$$$00000000)
266
-    .ARM.Collect$$$$00000001                 0x080000ec   Section        4  entry2.o(.ARM.Collect$$$$00000001)
267
-    .ARM.Collect$$$$00000004                 0x080000f0   Section        4  entry5.o(.ARM.Collect$$$$00000004)
268
-    .ARM.Collect$$$$00000008                 0x080000f4   Section        0  entry7b.o(.ARM.Collect$$$$00000008)
269
-    .ARM.Collect$$$$0000000A                 0x080000f4   Section        0  entry8b.o(.ARM.Collect$$$$0000000A)
270
-    .ARM.Collect$$$$0000000B                 0x080000f4   Section        8  entry9a.o(.ARM.Collect$$$$0000000B)
271
-    .ARM.Collect$$$$0000000D                 0x080000fc   Section        0  entry10a.o(.ARM.Collect$$$$0000000D)
272
-    .ARM.Collect$$$$0000000F                 0x080000fc   Section        0  entry11a.o(.ARM.Collect$$$$0000000F)
273
-    .ARM.Collect$$$$00002712                 0x080000fc   Section        4  entry2.o(.ARM.Collect$$$$00002712)
274
-    __lit__00000000                          0x080000fc   Data           4  entry2.o(.ARM.Collect$$$$00002712)
275
-    .text                                    0x08000100   Section       36  startup_stm32f103xb.o(.text)
276
-    .text                                    0x08000124   Section       36  init.o(.text)
277
-    i.Chrono_Conf                            0x08000148   Section        0  chrono.o(i.Chrono_Conf)
278
-    i.Chrono_Start                           0x0800018c   Section        0  chrono.o(i.Chrono_Start)
279
-    i.Chrono_Task_10ms                       0x0800019c   Section        0  chrono.o(i.Chrono_Task_10ms)
280
-    i.LL_APB1_GRP1_EnableClock               0x080001e4   Section        0  timer.o(i.LL_APB1_GRP1_EnableClock)
281
-    LL_APB1_GRP1_EnableClock                 0x080001e5   Thumb Code    24  timer.o(i.LL_APB1_GRP1_EnableClock)
282
-    i.LL_Init1msTick                         0x08000200   Section        0  stm32f1xx_ll_utils.o(i.LL_Init1msTick)
283
-    i.LL_SetSystemCoreClock                  0x0800021c   Section        0  stm32f1xx_ll_utils.o(i.LL_SetSystemCoreClock)
284
-    i.LL_TIM_ClearFlag_UPDATE                0x08000228   Section        0  timer.o(i.LL_TIM_ClearFlag_UPDATE)
285
-    LL_TIM_ClearFlag_UPDATE                  0x08000229   Thumb Code     8  timer.o(i.LL_TIM_ClearFlag_UPDATE)
286
-    i.LL_TIM_DisableCounter                  0x08000230   Section        0  timer.o(i.LL_TIM_DisableCounter)
287
-    LL_TIM_DisableCounter                    0x08000231   Thumb Code    10  timer.o(i.LL_TIM_DisableCounter)
288
-    i.LL_TIM_DisableIT_UPDATE                0x0800023a   Section        0  timer.o(i.LL_TIM_DisableIT_UPDATE)
289
-    LL_TIM_DisableIT_UPDATE                  0x0800023b   Thumb Code    10  timer.o(i.LL_TIM_DisableIT_UPDATE)
290
-    i.LL_TIM_Init                            0x08000244   Section        0  stm32f1xx_ll_tim.o(i.LL_TIM_Init)
291
-    i.MyTimer_Conf                           0x08000358   Section        0  timer.o(i.MyTimer_Conf)
292
-    i.MyTimer_IT_Conf                        0x080003dc   Section        0  timer.o(i.MyTimer_IT_Conf)
293
-    i.MyTimer_IT_Enable                      0x080004a4   Section        0  timer.o(i.MyTimer_IT_Enable)
294
-    i.MyTimer_Start                          0x080004b2   Section        0  timer.o(i.MyTimer_Start)
295
-    i.SystemClock_Config                     0x080004c0   Section        0  main.o(i.SystemClock_Config)
296
-    i.SystemInit                             0x080005b0   Section        0  system_stm32f1xx.o(i.SystemInit)
297
-    i.TIM1_UP_IRQHandler                     0x08000608   Section        0  timer.o(i.TIM1_UP_IRQHandler)
298
-    i.TIM2_IRQHandler                        0x08000620   Section        0  timer.o(i.TIM2_IRQHandler)
299
-    i.TIM3_IRQHandler                        0x08000638   Section        0  timer.o(i.TIM3_IRQHandler)
300
-    i.TIM4_IRQHandler                        0x08000650   Section        0  timer.o(i.TIM4_IRQHandler)
301
-    i.__scatterload_copy                     0x08000668   Section       14  handlers.o(i.__scatterload_copy)
302
-    i.__scatterload_null                     0x08000676   Section        2  handlers.o(i.__scatterload_null)
303
-    i.__scatterload_zeroinit                 0x08000678   Section       14  handlers.o(i.__scatterload_zeroinit)
304
-    i.assert_failed                          0x08000686   Section        0  main.o(i.assert_failed)
305
-    i.main                                   0x0800068c   Section        0  main.o(i.main)
306
-    .data                                    0x20000000   Section        8  chrono.o(.data)
307
-    Chrono_Time                              0x20000000   Data           3  chrono.o(.data)
308
-    Chrono_Timer                             0x20000004   Data           4  chrono.o(.data)
309
-    .data                                    0x20000008   Section       16  timer.o(.data)
310
-    .data                                    0x20000018   Section        4  system_stm32f1xx.o(.data)
311
-    STACK                                    0x20000020   Section     1024  startup_stm32f103xb.o(STACK)
312
-
313
-    Global Symbols
314
-
315
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
316
-
317
-    BuildAttributes$$THM_ISAv4$P$D$K$B$S$PE$A:L22UL41UL21$X:L11$S22US41US21$IEEE1$IW$USESV6$~STKCKD$USESV7$~SHL$OSPACE$EBA8$MICROLIB$REQ8$PRES8$EABIv2 0x00000000   Number         0  anon$$obj.o ABSOLUTE
318
-    __ARM_use_no_argv                        0x00000000   Number         0  main.o ABSOLUTE
319
-    __cpp_initialize__aeabi_                  - Undefined Weak Reference
320
-    __cxa_finalize                            - Undefined Weak Reference
321
-    __decompress                              - Undefined Weak Reference
322
-    _clock_init                               - Undefined Weak Reference
323
-    _microlib_exit                            - Undefined Weak Reference
324
-    __Vectors_Size                           0x000000ec   Number         0  startup_stm32f103xb.o ABSOLUTE
325
-    __Vectors                                0x08000000   Data           4  startup_stm32f103xb.o(RESET)
326
-    __Vectors_End                            0x080000ec   Data           0  startup_stm32f103xb.o(RESET)
327
-    __main                                   0x080000ed   Thumb Code     0  entry.o(.ARM.Collect$$$$00000000)
328
-    _main_stk                                0x080000ed   Thumb Code     0  entry2.o(.ARM.Collect$$$$00000001)
329
-    _main_scatterload                        0x080000f1   Thumb Code     0  entry5.o(.ARM.Collect$$$$00000004)
330
-    __main_after_scatterload                 0x080000f5   Thumb Code     0  entry5.o(.ARM.Collect$$$$00000004)
331
-    _main_clock                              0x080000f5   Thumb Code     0  entry7b.o(.ARM.Collect$$$$00000008)
332
-    _main_cpp_init                           0x080000f5   Thumb Code     0  entry8b.o(.ARM.Collect$$$$0000000A)
333
-    _main_init                               0x080000f5   Thumb Code     0  entry9a.o(.ARM.Collect$$$$0000000B)
334
-    __rt_final_cpp                           0x080000fd   Thumb Code     0  entry10a.o(.ARM.Collect$$$$0000000D)
335
-    __rt_final_exit                          0x080000fd   Thumb Code     0  entry11a.o(.ARM.Collect$$$$0000000F)
336
-    Reset_Handler                            0x08000101   Thumb Code     8  startup_stm32f103xb.o(.text)
337
-    NMI_Handler                              0x08000109   Thumb Code     2  startup_stm32f103xb.o(.text)
338
-    HardFault_Handler                        0x0800010b   Thumb Code     2  startup_stm32f103xb.o(.text)
339
-    MemManage_Handler                        0x0800010d   Thumb Code     2  startup_stm32f103xb.o(.text)
340
-    BusFault_Handler                         0x0800010f   Thumb Code     2  startup_stm32f103xb.o(.text)
341
-    UsageFault_Handler                       0x08000111   Thumb Code     2  startup_stm32f103xb.o(.text)
342
-    SVC_Handler                              0x08000113   Thumb Code     2  startup_stm32f103xb.o(.text)
343
-    DebugMon_Handler                         0x08000115   Thumb Code     2  startup_stm32f103xb.o(.text)
344
-    PendSV_Handler                           0x08000117   Thumb Code     2  startup_stm32f103xb.o(.text)
345
-    SysTick_Handler                          0x08000119   Thumb Code     2  startup_stm32f103xb.o(.text)
346
-    ADC1_2_IRQHandler                        0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
347
-    CAN1_RX1_IRQHandler                      0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
348
-    CAN1_SCE_IRQHandler                      0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
349
-    DMA1_Channel1_IRQHandler                 0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
350
-    DMA1_Channel2_IRQHandler                 0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
351
-    DMA1_Channel3_IRQHandler                 0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
352
-    DMA1_Channel4_IRQHandler                 0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
353
-    DMA1_Channel5_IRQHandler                 0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
354
-    DMA1_Channel6_IRQHandler                 0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
355
-    DMA1_Channel7_IRQHandler                 0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
356
-    EXTI0_IRQHandler                         0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
357
-    EXTI15_10_IRQHandler                     0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
358
-    EXTI1_IRQHandler                         0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
359
-    EXTI2_IRQHandler                         0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
360
-    EXTI3_IRQHandler                         0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
361
-    EXTI4_IRQHandler                         0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
362
-    EXTI9_5_IRQHandler                       0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
363
-    FLASH_IRQHandler                         0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
364
-    I2C1_ER_IRQHandler                       0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
365
-    I2C1_EV_IRQHandler                       0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
366
-    I2C2_ER_IRQHandler                       0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
367
-    I2C2_EV_IRQHandler                       0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
368
-    PVD_IRQHandler                           0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
369
-    RCC_IRQHandler                           0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
370
-    RTC_Alarm_IRQHandler                     0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
371
-    RTC_IRQHandler                           0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
372
-    SPI1_IRQHandler                          0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
373
-    SPI2_IRQHandler                          0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
374
-    TAMPER_IRQHandler                        0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
375
-    TIM1_BRK_IRQHandler                      0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
376
-    TIM1_CC_IRQHandler                       0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
377
-    TIM1_TRG_COM_IRQHandler                  0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
378
-    USART1_IRQHandler                        0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
379
-    USART2_IRQHandler                        0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
380
-    USART3_IRQHandler                        0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
381
-    USBWakeUp_IRQHandler                     0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
382
-    USB_HP_CAN1_TX_IRQHandler                0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
383
-    USB_LP_CAN1_RX0_IRQHandler               0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
384
-    WWDG_IRQHandler                          0x0800011b   Thumb Code     0  startup_stm32f103xb.o(.text)
385
-    __scatterload                            0x08000125   Thumb Code    28  init.o(.text)
386
-    __scatterload_rt2                        0x08000125   Thumb Code     0  init.o(.text)
387
-    Chrono_Conf                              0x08000149   Thumb Code    54  chrono.o(i.Chrono_Conf)
388
-    Chrono_Start                             0x0800018d   Thumb Code    12  chrono.o(i.Chrono_Start)
389
-    Chrono_Task_10ms                         0x0800019d   Thumb Code    68  chrono.o(i.Chrono_Task_10ms)
390
-    LL_Init1msTick                           0x08000201   Thumb Code    28  stm32f1xx_ll_utils.o(i.LL_Init1msTick)
391
-    LL_SetSystemCoreClock                    0x0800021d   Thumb Code     6  stm32f1xx_ll_utils.o(i.LL_SetSystemCoreClock)
392
-    LL_TIM_Init                              0x08000245   Thumb Code   228  stm32f1xx_ll_tim.o(i.LL_TIM_Init)
393
-    MyTimer_Conf                             0x08000359   Thumb Code   118  timer.o(i.MyTimer_Conf)
394
-    MyTimer_IT_Conf                          0x080003dd   Thumb Code   166  timer.o(i.MyTimer_IT_Conf)
395
-    MyTimer_IT_Enable                        0x080004a5   Thumb Code    14  timer.o(i.MyTimer_IT_Enable)
396
-    MyTimer_Start                            0x080004b3   Thumb Code    14  timer.o(i.MyTimer_Start)
397
-    SystemClock_Config                       0x080004c1   Thumb Code   226  main.o(i.SystemClock_Config)
398
-    SystemInit                               0x080005b1   Thumb Code    70  system_stm32f1xx.o(i.SystemInit)
399
-    TIM1_UP_IRQHandler                       0x08000609   Thumb Code    16  timer.o(i.TIM1_UP_IRQHandler)
400
-    TIM2_IRQHandler                          0x08000621   Thumb Code    18  timer.o(i.TIM2_IRQHandler)
401
-    TIM3_IRQHandler                          0x08000639   Thumb Code    16  timer.o(i.TIM3_IRQHandler)
402
-    TIM4_IRQHandler                          0x08000651   Thumb Code    16  timer.o(i.TIM4_IRQHandler)
403
-    __scatterload_copy                       0x08000669   Thumb Code    14  handlers.o(i.__scatterload_copy)
404
-    __scatterload_null                       0x08000677   Thumb Code     2  handlers.o(i.__scatterload_null)
405
-    __scatterload_zeroinit                   0x08000679   Thumb Code    14  handlers.o(i.__scatterload_zeroinit)
406
-    assert_failed                            0x08000687   Thumb Code     4  main.o(i.assert_failed)
407
-    main                                     0x0800068d   Thumb Code    18  main.o(i.main)
408
-    Region$$Table$$Base                      0x080006a4   Number         0  anon$$obj.o(Region$$Table)
409
-    Region$$Table$$Limit                     0x080006c4   Number         0  anon$$obj.o(Region$$Table)
410
-    Ptr_ItFct_TIM1                           0x20000008   Data           4  timer.o(.data)
411
-    Ptr_ItFct_TIM2                           0x2000000c   Data           4  timer.o(.data)
412
-    Ptr_ItFct_TIM3                           0x20000010   Data           4  timer.o(.data)
413
-    Ptr_ItFct_TIM4                           0x20000014   Data           4  timer.o(.data)
414
-    SystemCoreClock                          0x20000018   Data           4  system_stm32f1xx.o(.data)
415
-    __initial_sp                             0x20000420   Data           0  startup_stm32f103xb.o(STACK)
416
-
417
-
418
-
419
-==============================================================================
420
-
421
-Memory Map of the image
422
-
423
-  Image Entry point : 0x080000ed
424
-
425
-  Load Region LR_IROM1 (Base: 0x08000000, Size: 0x000006e0, Max: 0x00020000, ABSOLUTE)
426
-
427
-    Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x000006c4, Max: 0x00020000, ABSOLUTE)
428
-
429
-    Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
430
-
431
-    0x08000000   0x08000000   0x000000ec   Data   RO          753    RESET               startup_stm32f103xb.o
432
-    0x080000ec   0x080000ec   0x00000000   Code   RO          758  * .ARM.Collect$$$$00000000  mc_w.l(entry.o)
433
-    0x080000ec   0x080000ec   0x00000004   Code   RO          761    .ARM.Collect$$$$00000001  mc_w.l(entry2.o)
434
-    0x080000f0   0x080000f0   0x00000004   Code   RO          764    .ARM.Collect$$$$00000004  mc_w.l(entry5.o)
435
-    0x080000f4   0x080000f4   0x00000000   Code   RO          766    .ARM.Collect$$$$00000008  mc_w.l(entry7b.o)
436
-    0x080000f4   0x080000f4   0x00000000   Code   RO          768    .ARM.Collect$$$$0000000A  mc_w.l(entry8b.o)
437
-    0x080000f4   0x080000f4   0x00000008   Code   RO          769    .ARM.Collect$$$$0000000B  mc_w.l(entry9a.o)
438
-    0x080000fc   0x080000fc   0x00000000   Code   RO          771    .ARM.Collect$$$$0000000D  mc_w.l(entry10a.o)
439
-    0x080000fc   0x080000fc   0x00000000   Code   RO          773    .ARM.Collect$$$$0000000F  mc_w.l(entry11a.o)
440
-    0x080000fc   0x080000fc   0x00000004   Code   RO          762    .ARM.Collect$$$$00002712  mc_w.l(entry2.o)
441
-    0x08000100   0x08000100   0x00000024   Code   RO          754    .text               startup_stm32f103xb.o
442
-    0x08000124   0x08000124   0x00000024   Code   RO          775    .text               mc_w.l(init.o)
443
-    0x08000148   0x08000148   0x00000044   Code   RO          117    i.Chrono_Conf       chrono.o
444
-    0x0800018c   0x0800018c   0x00000010   Code   RO          120    i.Chrono_Start      chrono.o
445
-    0x0800019c   0x0800019c   0x00000048   Code   RO          122    i.Chrono_Task_10ms  chrono.o
446
-    0x080001e4   0x080001e4   0x0000001c   Code   RO          239    i.LL_APB1_GRP1_EnableClock  timer.o
447
-    0x08000200   0x08000200   0x0000001c   Code   RO          461    i.LL_Init1msTick    stm32f1xx_ll_utils.o
448
-    0x0800021c   0x0800021c   0x0000000c   Code   RO          468    i.LL_SetSystemCoreClock  stm32f1xx_ll_utils.o
449
-    0x08000228   0x08000228   0x00000008   Code   RO          240    i.LL_TIM_ClearFlag_UPDATE  timer.o
450
-    0x08000230   0x08000230   0x0000000a   Code   RO          241    i.LL_TIM_DisableCounter  timer.o
451
-    0x0800023a   0x0800023a   0x0000000a   Code   RO          242    i.LL_TIM_DisableIT_UPDATE  timer.o
452
-    0x08000244   0x08000244   0x00000114   Code   RO          573    i.LL_TIM_Init       stm32f1xx_ll_tim.o
453
-    0x08000358   0x08000358   0x00000084   Code   RO          243    i.MyTimer_Conf      timer.o
454
-    0x080003dc   0x080003dc   0x000000c8   Code   RO          244    i.MyTimer_IT_Conf   timer.o
455
-    0x080004a4   0x080004a4   0x0000000e   Code   RO          246    i.MyTimer_IT_Enable  timer.o
456
-    0x080004b2   0x080004b2   0x0000000e   Code   RO          247    i.MyTimer_Start     timer.o
457
-    0x080004c0   0x080004c0   0x000000f0   Code   RO            4    i.SystemClock_Config  main.o
458
-    0x080005b0   0x080005b0   0x00000058   Code   RO          718    i.SystemInit        system_stm32f1xx.o
459
-    0x08000608   0x08000608   0x00000018   Code   RO          249    i.TIM1_UP_IRQHandler  timer.o
460
-    0x08000620   0x08000620   0x00000018   Code   RO          250    i.TIM2_IRQHandler   timer.o
461
-    0x08000638   0x08000638   0x00000018   Code   RO          251    i.TIM3_IRQHandler   timer.o
462
-    0x08000650   0x08000650   0x00000018   Code   RO          252    i.TIM4_IRQHandler   timer.o
463
-    0x08000668   0x08000668   0x0000000e   Code   RO          779    i.__scatterload_copy  mc_w.l(handlers.o)
464
-    0x08000676   0x08000676   0x00000002   Code   RO          780    i.__scatterload_null  mc_w.l(handlers.o)
465
-    0x08000678   0x08000678   0x0000000e   Code   RO          781    i.__scatterload_zeroinit  mc_w.l(handlers.o)
466
-    0x08000686   0x08000686   0x00000004   Code   RO            5    i.assert_failed     main.o
467
-    0x0800068a   0x0800068a   0x00000002   PAD
468
-    0x0800068c   0x0800068c   0x00000018   Code   RO            6    i.main              main.o
469
-    0x080006a4   0x080006a4   0x00000020   Data   RO          777    Region$$Table       anon$$obj.o
470
-
471
-
472
-    Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x080006c4, Size: 0x00000420, Max: 0x00005000, ABSOLUTE)
473
-
474
-    Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
475
-
476
-    0x20000000   0x080006c4   0x00000008   Data   RW          123    .data               chrono.o
477
-    0x20000008   0x080006cc   0x00000010   Data   RW          254    .data               timer.o
478
-    0x20000018   0x080006dc   0x00000004   Data   RW          720    .data               system_stm32f1xx.o
479
-    0x2000001c   0x080006e0   0x00000004   PAD
480
-    0x20000020        -       0x00000400   Zero   RW          751    STACK               startup_stm32f103xb.o
481
-
482
-
483
-==============================================================================
484
-
485
-Image component sizes
486
-
487
-
488
-      Code (inc. data)   RO Data    RW Data    ZI Data      Debug   Object Name
489
-
490
-       156         22          0          8          0       2000   chrono.o
491
-       268         20          0          0          0     356672   main.o
492
-        36          8        236          0       1024        780   startup_stm32f103xb.o
493
-       276         48          0          0          0      28994   stm32f1xx_ll_tim.o
494
-        40          6          0          0          0       2105   stm32f1xx_ll_utils.o
495
-        88         18          0          4          0       1171   system_stm32f1xx.o
496
-       512         82          0         16          0      59169   timer.o
497
-
498
-    ----------------------------------------------------------------------
499
-      1378        204        268         28       1028     450891   Object Totals
500
-         0          0         32          0          0          0   (incl. Generated)
501
-         2          0          0          0          4          0   (incl. Padding)
502
-
503
-    ----------------------------------------------------------------------
504
-
505
-      Code (inc. data)   RO Data    RW Data    ZI Data      Debug   Library Member Name
506
-
507
-         0          0          0          0          0          0   entry.o
508
-         0          0          0          0          0          0   entry10a.o
509
-         0          0          0          0          0          0   entry11a.o
510
-         8          4          0          0          0          0   entry2.o
511
-         4          0          0          0          0          0   entry5.o
512
-         0          0          0          0          0          0   entry7b.o
513
-         0          0          0          0          0          0   entry8b.o
514
-         8          4          0          0          0          0   entry9a.o
515
-        30          0          0          0          0          0   handlers.o
516
-        36          8          0          0          0         68   init.o
517
-
518
-    ----------------------------------------------------------------------
519
-        86         16          0          0          0         68   Library Totals
520
-         0          0          0          0          0          0   (incl. Padding)
521
-
522
-    ----------------------------------------------------------------------
523
-
524
-      Code (inc. data)   RO Data    RW Data    ZI Data      Debug   Library Name
525
-
526
-        86         16          0          0          0         68   mc_w.l
527
-
528
-    ----------------------------------------------------------------------
529
-        86         16          0          0          0         68   Library Totals
530
-
531
-    ----------------------------------------------------------------------
532
-
533
-==============================================================================
534
-
535
-
536
-      Code (inc. data)   RO Data    RW Data    ZI Data      Debug   
537
-
538
-      1464        220        268         28       1028     450071   Grand Totals
539
-      1464        220        268         28       1028     450071   ELF Image Totals
540
-      1464        220        268         28          0          0   ROM Totals
541
-
542
-==============================================================================
543
-
544
-    Total RO  Size (Code + RO Data)                 1732 (   1.69kB)
545
-    Total RW  Size (RW Data + ZI Data)              1056 (   1.03kB)
546
-    Total ROM Size (Code + RO Data + RW Data)       1760 (   1.72kB)
547
-
548
-==============================================================================
549
-

+ 0
- 16
MDK-ARM/NUCLEO-F103RB/NUCLEO-F103RB.sct View File

@@ -1,16 +0,0 @@
1
-; *************************************************************
2
-; *** Scatter-Loading Description File generated by uVision ***
3
-; *************************************************************
4
-
5
-LR_IROM1 0x08000000 0x00020000  {    ; load region size_region
6
-  ER_IROM1 0x08000000 0x00020000  {  ; load address = execution address
7
-   *.o (RESET, +First)
8
-   *(InRoot$$Sections)
9
-   .ANY (+RO)
10
-   .ANY (+XO)
11
-  }
12
-  RW_IRAM1 0x20000000 0x00005000  {  ; RW data
13
-   .ANY (+RW +ZI)
14
-  }
15
-}
16
-

BIN
MDK-ARM/NUCLEO-F103RB/chrono.crf View File


BIN
MDK-ARM/NUCLEO-F103RB/main.crf View File


BIN
MDK-ARM/NUCLEO-F103RB/mytimer.crf View File


BIN
MDK-ARM/NUCLEO-F103RB/stm32f1xx_it.crf View File


+ 0
- 2
MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_adc.d View File

@@ -1,2 +0,0 @@
1
-nucleo-f103rb\stm32f1xx_ll_adc.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_adc.c
2
-nucleo-f103rb\stm32f1xx_ll_adc.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_adc.h

+ 0
- 2
MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_crc.d View File

@@ -1,2 +0,0 @@
1
-nucleo-f103rb\stm32f1xx_ll_crc.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_crc.c
2
-nucleo-f103rb\stm32f1xx_ll_crc.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_crc.h

+ 0
- 2
MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_dac.d View File

@@ -1,2 +0,0 @@
1
-nucleo-f103rb\stm32f1xx_ll_dac.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_dac.c
2
-nucleo-f103rb\stm32f1xx_ll_dac.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_dac.h

+ 0
- 2
MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_dma.d View File

@@ -1,2 +0,0 @@
1
-nucleo-f103rb\stm32f1xx_ll_dma.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_dma.c
2
-nucleo-f103rb\stm32f1xx_ll_dma.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_dma.h

+ 0
- 2
MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_exti.d View File

@@ -1,2 +0,0 @@
1
-nucleo-f103rb\stm32f1xx_ll_exti.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_exti.c
2
-nucleo-f103rb\stm32f1xx_ll_exti.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_exti.h

+ 0
- 2
MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_gpio.d View File

@@ -1,2 +0,0 @@
1
-nucleo-f103rb\stm32f1xx_ll_gpio.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_gpio.c
2
-nucleo-f103rb\stm32f1xx_ll_gpio.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_gpio.h

+ 0
- 2
MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_i2c.d View File

@@ -1,2 +0,0 @@
1
-nucleo-f103rb\stm32f1xx_ll_i2c.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_i2c.c
2
-nucleo-f103rb\stm32f1xx_ll_i2c.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_i2c.h

+ 0
- 2
MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_pwr.d View File

@@ -1,2 +0,0 @@
1
-nucleo-f103rb\stm32f1xx_ll_pwr.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_pwr.c
2
-nucleo-f103rb\stm32f1xx_ll_pwr.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_pwr.h

BIN
MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_rcc.crf View File


+ 0
- 2
MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_rtc.d View File

@@ -1,2 +0,0 @@
1
-nucleo-f103rb\stm32f1xx_ll_rtc.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_rtc.c
2
-nucleo-f103rb\stm32f1xx_ll_rtc.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_rtc.h

+ 0
- 2
MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_spi.d View File

@@ -1,2 +0,0 @@
1
-nucleo-f103rb\stm32f1xx_ll_spi.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_spi.c
2
-nucleo-f103rb\stm32f1xx_ll_spi.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_spi.h

BIN
MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_tim.crf View File


+ 0
- 2
MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_usart.d View File

@@ -1,2 +0,0 @@
1
-nucleo-f103rb\stm32f1xx_ll_usart.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_usart.c
2
-nucleo-f103rb\stm32f1xx_ll_usart.o: ../../../../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_ll_usart.h

BIN
MDK-ARM/NUCLEO-F103RB/stm32f1xx_ll_utils.crf View File


BIN
MDK-ARM/NUCLEO-F103RB/system_stm32f1xx.crf View File


+ 0
- 3385
MDK-ARM/Project.uvguix.trocache
File diff suppressed because it is too large
View File


+ 83
- 95
MDK-ARM/Project.uvoptx View File

@@ -75,7 +75,7 @@
75 75
       <OPTFL>
76 76
         <tvExp>1</tvExp>
77 77
         <tvExpOptDlg>0</tvExpOptDlg>
78
-        <IsCurrentTarget>0</IsCurrentTarget>
78
+        <IsCurrentTarget>1</IsCurrentTarget>
79 79
       </OPTFL>
80 80
       <CpuCode>18</CpuCode>
81 81
       <DebugOpt>
@@ -103,7 +103,7 @@
103 103
         <bEvRecOn>1</bEvRecOn>
104 104
         <bSchkAxf>0</bSchkAxf>
105 105
         <bTchkAxf>0</bTchkAxf>
106
-        <nTsel>5</nTsel>
106
+        <nTsel>0</nTsel>
107 107
         <sDll></sDll>
108 108
         <sDllPa></sDllPa>
109 109
         <sDlgDll></sDlgDll>
@@ -114,7 +114,7 @@
114 114
         <tDlgDll></tDlgDll>
115 115
         <tDlgPa></tDlgPa>
116 116
         <tIfile></tIfile>
117
-        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
117
+        <pMon>BIN\UL2CM3.DLL</pMon>
118 118
       </DebugOpt>
119 119
       <TargetDriverDllRegistry>
120 120
         <SetRegEntry>
@@ -130,7 +130,7 @@
130 130
         <SetRegEntry>
131 131
           <Number>0</Number>
132 132
           <Key>DLGTARM</Key>
133
-          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=100,127,658,622,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name>
133
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=204,363,702,652,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=1045,583,1603,1080,0)(121=971,583,1529,1080,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=200,173,988,1026,0)(131=405,227,1193,1080,0)(132=161,47,949,900,0)(133=1013,172,1801,1025,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=320,247,1120,1026,0)(151=1120,301,1920,1080,0)</Name>
134 134
         </SetRegEntry>
135 135
         <SetRegEntry>
136 136
           <Number>0</Number>
@@ -145,7 +145,7 @@
145 145
         <SetRegEntry>
146 146
           <Number>0</Number>
147 147
           <Key>UL2CM3</Key>
148
-          <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM))</Name>
148
+          <Name>-UAny -O206 -S8 -C0 -P00 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)</Name>
149 149
         </SetRegEntry>
150 150
         <SetRegEntry>
151 151
           <Number>0</Number>
@@ -157,41 +157,87 @@
157 157
         <Bp>
158 158
           <Number>0</Number>
159 159
           <Type>0</Type>
160
-          <LineNumber>47</LineNumber>
161
-          <EnabledFlag>1</EnabledFlag>
162
-          <Address>134219058</Address>
160
+          <LineNumber>41</LineNumber>
161
+          <EnabledFlag>0</EnabledFlag>
162
+          <Address>134220664</Address>
163 163
           <ByteObject>0</ByteObject>
164 164
           <HtxType>0</HtxType>
165 165
           <ManyObjects>0</ManyObjects>
166 166
           <SizeOfObject>0</SizeOfObject>
167 167
           <BreakByAccess>0</BreakByAccess>
168 168
           <BreakIfRCount>1</BreakIfRCount>
169
-          <Filename>../Src/main.c</Filename>
169
+          <Filename>..\Services\Accelerometer.c</Filename>
170 170
           <ExecCommand></ExecCommand>
171
-          <Expression>\\NUCLEO_F103RB\../Src/main.c\47</Expression>
171
+          <Expression>\\NUCLEO_F103RB\../Services/Accelerometer.c\41</Expression>
172 172
         </Bp>
173 173
         <Bp>
174 174
           <Number>1</Number>
175 175
           <Type>0</Type>
176
-          <LineNumber>44</LineNumber>
177
-          <EnabledFlag>1</EnabledFlag>
178
-          <Address>134219052</Address>
176
+          <LineNumber>33</LineNumber>
177
+          <EnabledFlag>0</EnabledFlag>
178
+          <Address>134231164</Address>
179
+          <ByteObject>0</ByteObject>
180
+          <HtxType>0</HtxType>
181
+          <ManyObjects>0</ManyObjects>
182
+          <SizeOfObject>0</SizeOfObject>
183
+          <BreakByAccess>0</BreakByAccess>
184
+          <BreakIfRCount>1</BreakIfRCount>
185
+          <Filename>..\Services\Accelerometer.c</Filename>
186
+          <ExecCommand></ExecCommand>
187
+          <Expression>\\NUCLEO_F103RB\../Services/Accelerometer.c\33</Expression>
188
+        </Bp>
189
+        <Bp>
190
+          <Number>2</Number>
191
+          <Type>0</Type>
192
+          <LineNumber>33</LineNumber>
193
+          <EnabledFlag>0</EnabledFlag>
194
+          <Address>134231194</Address>
179 195
           <ByteObject>0</ByteObject>
180 196
           <HtxType>0</HtxType>
181 197
           <ManyObjects>0</ManyObjects>
182 198
           <SizeOfObject>0</SizeOfObject>
183 199
           <BreakByAccess>0</BreakByAccess>
184 200
           <BreakIfRCount>1</BreakIfRCount>
185
-          <Filename>../Src/main.c</Filename>
201
+          <Filename>..\Src\Sail.c</Filename>
186 202
           <ExecCommand></ExecCommand>
187
-          <Expression>\\NUCLEO_F103RB\../Src/main.c\44</Expression>
203
+          <Expression>\\NUCLEO_F103RB\../Src/Sail.c\33</Expression>
188 204
         </Bp>
189 205
       </Breakpoint>
190 206
       <WatchWindow1>
191 207
         <Ww>
192 208
           <count>0</count>
193 209
           <WinNumber>1</WinNumber>
194
-          <ItemText>Main_Time</ItemText>
210
+          <ItemText>windAngle,0x0A</ItemText>
211
+        </Ww>
212
+        <Ww>
213
+          <count>1</count>
214
+          <WinNumber>1</WinNumber>
215
+          <ItemText>angleDeg,0x0A</ItemText>
216
+        </Ww>
217
+        <Ww>
218
+          <count>2</count>
219
+          <WinNumber>1</WinNumber>
220
+          <ItemText>volts</ItemText>
221
+        </Ww>
222
+        <Ww>
223
+          <count>3</count>
224
+          <WinNumber>1</WinNumber>
225
+          <ItemText>angleRad</ItemText>
226
+        </Ww>
227
+        <Ww>
228
+          <count>4</count>
229
+          <WinNumber>1</WinNumber>
230
+          <ItemText>value,0x0A</ItemText>
231
+        </Ww>
232
+        <Ww>
233
+          <count>5</count>
234
+          <WinNumber>1</WinNumber>
235
+          <ItemText>speed,0x0A</ItemText>
236
+        </Ww>
237
+        <Ww>
238
+          <count>6</count>
239
+          <WinNumber>1</WinNumber>
240
+          <ItemText>TIMx-&gt;CCR2</ItemText>
195 241
         </Ww>
196 242
       </WatchWindow1>
197 243
       <Tracepoint>
@@ -200,7 +246,7 @@
200 246
       <DebugFlag>
201 247
         <trace>0</trace>
202 248
         <periodic>1</periodic>
203
-        <aLwin>1</aLwin>
249
+        <aLwin>0</aLwin>
204 250
         <aCover>0</aCover>
205 251
         <aSer1>0</aSer1>
206 252
         <aSer2>0</aSer2>
@@ -236,6 +282,12 @@
236 282
       <pszMrulep></pszMrulep>
237 283
       <pSingCmdsp></pSingCmdsp>
238 284
       <pMultCmdsp></pMultCmdsp>
285
+      <SystemViewers>
286
+        <Entry>
287
+          <Name>System Viewer\ADC2</Name>
288
+          <WinId>35905</WinId>
289
+        </Entry>
290
+      </SystemViewers>
239 291
       <DebugDescription>
240 292
         <Enable>1</Enable>
241 293
         <EnableFlashSeq>0</EnableFlashSeq>
@@ -300,7 +352,7 @@
300 352
       <OPTFL>
301 353
         <tvExp>1</tvExp>
302 354
         <tvExpOptDlg>0</tvExpOptDlg>
303
-        <IsCurrentTarget>1</IsCurrentTarget>
355
+        <IsCurrentTarget>0</IsCurrentTarget>
304 356
       </OPTFL>
305 357
       <CpuCode>18</CpuCode>
306 358
       <DebugOpt>
@@ -345,7 +397,7 @@
345 397
         <SetRegEntry>
346 398
           <Number>0</Number>
347 399
           <Key>DLGDARM</Key>
348
-          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=1554,213,1920,450,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=129,555,687,1080,0)(121=1509,217,1920,660,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=150,46,938,969,0)(133=1148,116,1732,908,0)(160=1046,190,1640,699,1)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=130,96,930,1019,0)(151=127,38,927,961,0)</Name>
400
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=1554,213,1920,450,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=129,555,687,1080,0)(121=924,444,1482,969,1)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=150,46,938,969,0)(133=-13,526,775,1449,1)(160=1046,190,1640,699,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=130,96,930,1019,0)(151=127,38,927,961,0)</Name>
349 401
         </SetRegEntry>
350 402
         <SetRegEntry>
351 403
           <Number>0</Number>
@@ -382,89 +434,25 @@
382 434
         <Bp>
383 435
           <Number>0</Number>
384 436
           <Type>0</Type>
385
-          <LineNumber>20</LineNumber>
437
+          <LineNumber>51</LineNumber>
386 438
           <EnabledFlag>1</EnabledFlag>
387
-          <Address>134226220</Address>
439
+          <Address>134221038</Address>
388 440
           <ByteObject>0</ByteObject>
389 441
           <HtxType>0</HtxType>
390 442
           <ManyObjects>0</ManyObjects>
391 443
           <SizeOfObject>0</SizeOfObject>
392 444
           <BreakByAccess>0</BreakByAccess>
393 445
           <BreakIfRCount>1</BreakIfRCount>
394
-          <Filename>..\Services\RFEmitter.c</Filename>
446
+          <Filename>..\Src\Display.c</Filename>
395 447
           <ExecCommand></ExecCommand>
396
-          <Expression>\\NUCLEO_F103RB\../Services/RFEmitter.c\20</Expression>
397
-        </Bp>
398
-        <Bp>
399
-          <Number>1</Number>
400
-          <Type>0</Type>
401
-          <LineNumber>43</LineNumber>
402
-          <EnabledFlag>1</EnabledFlag>
403
-          <Address>134231406</Address>
404
-          <ByteObject>0</ByteObject>
405
-          <HtxType>0</HtxType>
406
-          <ManyObjects>0</ManyObjects>
407
-          <SizeOfObject>0</SizeOfObject>
408
-          <BreakByAccess>0</BreakByAccess>
409
-          <BreakIfRCount>1</BreakIfRCount>
410
-          <Filename>../Src/main.c</Filename>
411
-          <ExecCommand></ExecCommand>
412
-          <Expression>\\NUCLEO_F103RB\../Src/main.c\43</Expression>
413
-        </Bp>
414
-        <Bp>
415
-          <Number>2</Number>
416
-          <Type>0</Type>
417
-          <LineNumber>82</LineNumber>
418
-          <EnabledFlag>1</EnabledFlag>
419
-          <Address>134231536</Address>
420
-          <ByteObject>0</ByteObject>
421
-          <HtxType>0</HtxType>
422
-          <ManyObjects>0</ManyObjects>
423
-          <SizeOfObject>0</SizeOfObject>
424
-          <BreakByAccess>0</BreakByAccess>
425
-          <BreakIfRCount>1</BreakIfRCount>
426
-          <Filename>../Src/main.c</Filename>
427
-          <ExecCommand></ExecCommand>
428
-          <Expression>\\NUCLEO_F103RB\../Src/main.c\82</Expression>
429
-        </Bp>
430
-        <Bp>
431
-          <Number>3</Number>
432
-          <Type>0</Type>
433
-          <LineNumber>44</LineNumber>
434
-          <EnabledFlag>1</EnabledFlag>
435
-          <Address>0</Address>
436
-          <ByteObject>0</ByteObject>
437
-          <HtxType>0</HtxType>
438
-          <ManyObjects>0</ManyObjects>
439
-          <SizeOfObject>0</SizeOfObject>
440
-          <BreakByAccess>0</BreakByAccess>
441
-          <BreakIfRCount>0</BreakIfRCount>
442
-          <Filename>../Src/main.c</Filename>
443
-          <ExecCommand></ExecCommand>
444
-          <Expression></Expression>
445
-        </Bp>
446
-        <Bp>
447
-          <Number>4</Number>
448
-          <Type>0</Type>
449
-          <LineNumber>87</LineNumber>
450
-          <EnabledFlag>1</EnabledFlag>
451
-          <Address>0</Address>
452
-          <ByteObject>0</ByteObject>
453
-          <HtxType>0</HtxType>
454
-          <ManyObjects>0</ManyObjects>
455
-          <SizeOfObject>0</SizeOfObject>
456
-          <BreakByAccess>0</BreakByAccess>
457
-          <BreakIfRCount>0</BreakIfRCount>
458
-          <Filename>../Src/main.c</Filename>
459
-          <ExecCommand></ExecCommand>
460
-          <Expression></Expression>
448
+          <Expression>\\NUCLEO_F103RB\../Src/Display.c\51</Expression>
461 449
         </Bp>
462 450
       </Breakpoint>
463 451
       <WatchWindow1>
464 452
         <Ww>
465 453
           <count>0</count>
466 454
           <WinNumber>1</WinNumber>
467
-          <ItemText>msCounter,0x0A</ItemText>
455
+          <ItemText>secCounter</ItemText>
468 456
         </Ww>
469 457
         <Ww>
470 458
           <count>1</count>
@@ -515,8 +503,8 @@
515 503
         <periodic>1</periodic>
516 504
         <aLwin>0</aLwin>
517 505
         <aCover>0</aCover>
518
-        <aSer1>0</aSer1>
519
-        <aSer2>0</aSer2>
506
+        <aSer1>1</aSer1>
507
+        <aSer2>1</aSer2>
520 508
         <aPa>0</aPa>
521 509
         <viewmode>1</viewmode>
522 510
         <vrSel>0</vrSel>
@@ -525,12 +513,12 @@
525 513
         <AscS1>0</AscS1>
526 514
         <AscS2>0</AscS2>
527 515
         <AscS3>0</AscS3>
528
-        <aSer3>0</aSer3>
516
+        <aSer3>1</aSer3>
529 517
         <eProf>0</eProf>
530
-        <aLa>0</aLa>
518
+        <aLa>1</aLa>
531 519
         <aPa1>0</aPa1>
532 520
         <AscS4>0</AscS4>
533
-        <aSer4>0</aSer4>
521
+        <aSer4>1</aSer4>
534 522
         <StkLoc>0</StkLoc>
535 523
         <TrcWin>0</TrcWin>
536 524
         <newCpu>0</newCpu>
@@ -553,7 +541,7 @@
553 541
         <Wi>
554 542
           <IntNumber>0</IntNumber>
555 543
           <FirstString>((PORTB &amp; 0x00000100) &gt;&gt; 8 &amp; 0x100) &gt;&gt; 8</FirstString>
556
-          <SecondString>FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028504F5254422026203078303030303031303029203E3E2038000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F1700000000000000000000000000000000000000AE110008</SecondString>
544
+          <SecondString>FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028504F5254422026203078303030303031303029203E3E2038000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F1200000000000000000000000000000000000000AE110008</SecondString>
557 545
         </Wi>
558 546
       </LogicAnalyzers>
559 547
       <SystemViewers>
@@ -634,7 +622,7 @@
634 622
       <GroupNumber>1</GroupNumber>
635 623
       <FileNumber>5</FileNumber>
636 624
       <FileType>1</FileType>
637
-      <tvExp>0</tvExp>
625
+      <tvExp>1</tvExp>
638 626
       <tvExpOptDlg>0</tvExpOptDlg>
639 627
       <bDave2>0</bDave2>
640 628
       <PathWithFileName>..\Src\Sail.c</PathWithFileName>

+ 1
- 1
MDK-ARM/Project.uvprojx View File

@@ -10,7 +10,7 @@
10 10
       <TargetName>NUCLEO-F103RB</TargetName>
11 11
       <ToolsetNumber>0x4</ToolsetNumber>
12 12
       <ToolsetName>ARM-ADS</ToolsetName>
13
-      <pCCUsed>5060422::V5.06 update 4 (build 422)::ARMCC</pCCUsed>
13
+      <pCCUsed>5060750::V5.06 update 6 (build 750)::ARMCC</pCCUsed>
14 14
       <uAC6>8</uAC6>
15 15
       <TargetOption>
16 16
         <TargetCommonOption>

+ 0
- 20
MDK-ARM/RTE/_NUCLEO-F103RB/RTE_Components.h View File

@@ -1,20 +0,0 @@
1
-
2
-/*
3
- * Auto generated Run-Time-Environment Component Configuration File
4
- *      *** Do not modify ! ***
5
- *
6
- * Project: 'Project' 
7
- * Target:  'NUCLEO-F103RB' 
8
- */
9
-
10
-#ifndef RTE_COMPONENTS_H
11
-#define RTE_COMPONENTS_H
12
-
13
-
14
-/*
15
- * Define the Device Header File: 
16
- */
17
-#define CMSIS_device_header "stm32f10x.h"
18
-
19
-
20
-#endif /* RTE_COMPONENTS_H */

+ 0
- 21
MDK-ARM/RTE/_Simulateur/RTE_Components.h View File

@@ -1,21 +0,0 @@
1
-
2
-/*
3
- * Auto generated Run-Time-Environment Configuration File
4
- *      *** Do not modify ! ***
5
- *
6
- * Project: 'Project' 
7
- * Target:  'Simulateur' 
8
- */
9
-
10
-#ifndef RTE_COMPONENTS_H
11
-#define RTE_COMPONENTS_H
12
-
13
-
14
-/*
15
- * Define the Device Header File: 
16
- */
17
-#define CMSIS_device_header "stm32f10x.h"
18
-
19
-
20
-
21
-#endif /* RTE_COMPONENTS_H */

+ 3
- 3
MyDrivers/ADC.c View File

@@ -19,8 +19,8 @@ void ADC_conf(ADC_TypeDef *adc)
19 19
 	adc->SQR1 &= ADC_SQR1_L; 
20 20
 	
21 21
 	 // Calibration
22
-	adc->CR2 |= ADC_CR2_CAL_Msk;
23
-	while ((adc->CR2 & ADC_CR2_CAL_Msk));	
22
+//	adc->CR2 |= ADC_CR2_CAL_Msk;
23
+//	while ((adc->CR2 & ADC_CR2_CAL_Msk));	
24 24
 }
25 25
 
26 26
 
@@ -43,7 +43,7 @@ uint16_t ADC_readRaw(ADC_TypeDef *adc, int channel)
43 43
 
44 44
 float ADC_convertToVolt(uint16_t value)
45 45
 {
46
-	return ((double) value) / MAX_CONVERTED_VALUE * MAX_VOLTS;
46
+	return ((float) value) / MAX_CONVERTED_VALUE * MAX_VOLTS;
47 47
 }
48 48
 
49 49
 

+ 7
- 6
MyDrivers/Timer.c View File

@@ -214,12 +214,13 @@ void PWMi_conf(TIM_TypeDef * TIMx, int channel){
214 214
 
215 215
 int PWMi_getPeriod(TIM_TypeDef * TIMx) {
216 216
 	
217
-	return TIMx -> CCR1;
217
+	return TIMx->CCR1;
218 218
 }
219 219
 
220
-int PWMi_getDutyCycle(TIM_TypeDef * TIMx) {
221
-	
222
-	return TIMx -> CCR2;
220
+float PWMi_getDutyCycle(TIM_TypeDef * TIMx) {
221
+	const int arr = LL_TIM_GetAutoReload(TIMx);
222
+	float duty_cycle = (float)TIMx->CCR2 / (float)arr;
223
+	return duty_cycle;
223 224
 }
224 225
 
225 226
 /****************************************************************************
@@ -278,7 +279,7 @@ float Timer_pwmo_getDutyCycle(TIM_TypeDef * timer, int channel)
278 279
 
279 280
 void Timer_encoder_conf(TIM_TypeDef * timer)
280 281
 {
281
-	Timer_conf(timer, 359, 0);
282
+	Timer_conf(timer, 719, 0);
282 283
 	LL_TIM_ENCODER_InitTypeDef init_struct;
283 284
 	LL_TIM_ENCODER_StructInit(&init_struct);
284 285
 	
@@ -289,7 +290,7 @@ void Timer_encoder_conf(TIM_TypeDef * timer)
289 290
 
290 291
 int Timer_encoder_getAngle(TIM_TypeDef * timer)
291 292
 {
292
-	return LL_TIM_GetCounter(timer);
293
+	return LL_TIM_GetCounter(timer)/2;
293 294
 }
294 295
 
295 296
 enum CounterDirection Timer_encoder_getDirection(TIM_TypeDef * timer)

+ 1
- 1
MyDrivers/Timer.h View File

@@ -61,7 +61,7 @@ void Timer_stop(TIM_TypeDef * timer);
61 61
 
62 62
 void PWMi_conf(TIM_TypeDef * timer, int channel);
63 63
 
64
-int PWMi_getDutyCycle(TIM_TypeDef * timer);
64
+float PWMi_getDutyCycle(TIM_TypeDef * timer);
65 65
 
66 66
 int PWMi_getPeriod(TIM_TypeDef * TIMx);
67 67
 

+ 10
- 2
Services/DCMotor.c View File

@@ -2,15 +2,23 @@
2 2
 #include "math.h"
3 3
 
4 4
 void DCMotor_conf(TIM_TypeDef * timer, int channel, GPIO_TypeDef * gpio, int pin)
5
-{
5
+{	
6 6
 	//On règle la vitesse en valeur absolue, ici à 0
7 7
 	Timer_pwmo_conf(timer, channel, 50, 0);
8 8
 	
9
+	// Configuration du GPIO
10
+	GPIO_conf(GPIOA, LL_GPIO_PIN_1, LL_GPIO_MODE_ALTERNATE, LL_GPIO_OUTPUT_PUSHPULL, LL_GPIO_PULL_UP);
11
+
12
+	
9 13
 	//On règle le sens du moteur, ici sens direct (?)
10
-	GPIO_conf(gpio, pin, LL_GPIO_MODE_OUTPUT, LL_GPIO_OUTPUT_OPENDRAIN, LL_GPIO_PULL_DOWN);
14
+	GPIO_conf(gpio, pin, LL_GPIO_MODE_OUTPUT, LL_GPIO_OUTPUT_PUSHPULL, LL_GPIO_PULL_DOWN);
11 15
 	GPIO_setPin(gpio, pin, 0);
16
+	
17
+	Timer_start(timer);
12 18
 }
13 19
 
20
+
21
+
14 22
 void DCMotor_setSpeed(TIM_TypeDef * timer, int channel, GPIO_TypeDef * gpio, int pin, float speed)
15 23
 {
16 24
 	const int dir = (speed > 0.) ? 1 : 0;

+ 4
- 4
Services/RFReceiver.c View File

@@ -7,9 +7,9 @@ void RFReceiver_conf(TIM_TypeDef * timer, int channel)
7 7
 
8 8
 float RFReceiver_getData(TIM_TypeDef * timer)
9 9
 {
10
-	const int duty_cycle = PWMi_getDutyCycle(timer);
11
-	const int period = PWMi_getPeriod(timer);
12
-	const float duree_impulsion = duty_cycle * period;
10
+	const float duty_cycle = PWMi_getDutyCycle(timer);
11
+//	const int period = PWMi_getPeriod(timer);
12
+//	const float duree_impulsion = duty_cycle * period;
13 13
 	
14
-	return (duree_impulsion -1) * 200 - 100;
14
+	return duty_cycle;
15 15
 }

+ 5
- 1
Services/ServoMotor.c View File

@@ -13,9 +13,13 @@ void ServoMotor_start(TIM_TypeDef * timer)
13 13
 	Timer_start(timer);
14 14
 }
15 15
 
16
+float convertAngleToDutyCycle(int angle) {
17
+	return ((float) angle) / 90.0 / 20 + 0.05;
18
+}
19
+
16 20
 void ServoMotor_setAngle(TIM_TypeDef * timer, int channel, int angle)
17 21
 {
18
-	Timer_pwmo_setDutyCycle(timer, channel, ((float) angle) / 359.0);
22
+	Timer_pwmo_setDutyCycle(timer, channel, convertAngleToDutyCycle(angle));
19 23
 }
20 24
 
21 25
 int ServoMotor_getAngle(TIM_TypeDef * timer, int channel)

+ 9
- 3
Src/Orientation.c View File

@@ -1,7 +1,11 @@
1 1
 #include "Orientation.h"
2 2
 #include "math.h"
3 3
 
4
-#define THRESHOLD 30
4
+#define THRESHOLD 0
5
+
6
+const float MIN_DUTY_CYCLE = 0.05;
7
+const float ZERO_DUTY_CYCLE = 0.075;
8
+const float MAX_DUTY_CYCLE = 0.1;
5 9
 
6 10
 TIM_TypeDef * RECEIVER_TIMER = TIM4;
7 11
 const int RECEIVER_CHANNEL = LL_TIM_CHANNEL_CH1;
@@ -19,10 +23,12 @@ void Orientation_conf()
19 23
 
20 24
 void Orientation_background()
21 25
 {
22
-	const float speed = RFReceiver_getData(RECEIVER_TIMER);
26
+	const float duty_cycle = RFReceiver_getData(RECEIVER_TIMER);
27
+	
28
+	const float speed = (duty_cycle - ZERO_DUTY_CYCLE) / (MAX_DUTY_CYCLE - ZERO_DUTY_CYCLE);
23 29
 	
24 30
 	//Si la vitesse (en valeur absolue) ne dépasse pas un certain seuil, on ne démarre pas le moteur
25
-	if (THRESHOLD < fabs(speed)) {
31
+	if (THRESHOLD > fabs(speed)) {
26 32
 		DCMotor_setSpeed(DCMOTOR_TIMER, DCMOTOR_CHANNEL, DCMOTOR_GPIO, DCMOTOR_PIN, 0);
27 33
 	}
28 34
 	else { 

+ 1
- 1
Src/Roll.c View File

@@ -31,7 +31,7 @@ int Roll_getEmergencyState(void)
31 31
 
32 32
 void Roll_background(void)
33 33
 {
34
-	const int xAngle = Accelerometer_getAngle(ROLL_ADC, ROLL_X_CHANNEL);
34
+	const int xAngle = Accelerometer_getAngle(ROLL_ADC, ROLL_Y_CHANNEL);
35 35
 	//const int yAngle = Accelerometer_getAngle(ROLL_ADC, ROLL_Y_CHANNEL);
36 36
 	
37 37
 	const int currentState = abs(xAngle) >= 40;

+ 3
- 3
Src/Sail.c View File

@@ -30,10 +30,10 @@ void Sail_start()
30 30
 
31 31
 int windToSailAngle(int windAngle)
32 32
 {
33
-	if (windAngle > 180)
33
+	if (windAngle < 180)
34 34
 		return 90 * (windAngle - 45) / 135;
35 35
 	else
36
-		return 360 - 90 * ((360 - windAngle) - 45) / 135;
36
+		return 90 * ((360 - windAngle) - 45) / 135;
37 37
 }
38 38
 
39 39
 int Sail_getSailAngle(void) 
@@ -48,7 +48,7 @@ void Sail_background()
48 48
 		return;
49 49
 	
50 50
 	const int windAngle = IncrementalEncoder_getAngle(ENCODER_TIMER);
51
-
51
+	
52 52
 	if (windAngle < 45 || windAngle > 315) 
53 53
 			ServoMotor_setAngle(MOTOR_TIMER, MOTOR_CHANNEL, 0);
54 54
 	else

+ 2
- 2
Src/main.c View File

@@ -84,7 +84,7 @@ int main(void)
84 84
 	Scheduler_start();
85 85
 
86 86
   while (1) {
87
-		Display_background(secCounter);
87
+//		Display_background(secCounter);
88 88
   }
89 89
 	
90 90
 	
@@ -133,7 +133,7 @@ void SystemClock_Config(void)
133 133
   /* Enable HSE oscillator */
134 134
 	// ********* Commenter la ligne ci-dessous pour MCBSTM32 *****************
135 135
 	// ********* Conserver la ligne si Nucléo*********************************
136
-  LL_RCC_HSE_EnableBypass();
136
+//  LL_RCC_HSE_EnableBypass();
137 137
   LL_RCC_HSE_Enable();
138 138
   while(LL_RCC_HSE_IsReady() != 1)
139 139
   {

Loading…
Cancel
Save