Browse Source

fin TP (on espère)

alejeune 1 year ago
parent
commit
e6ac888a18

+ 23
- 2
FileInclude/MyADC.c View File

@@ -2,10 +2,30 @@
2 2
 #include "MyTimer.h"
3 3
 #include "Driver_GPIO.h"
4 4
 #define NULL 0
5
+//#define nombreChannel 1
5 6
 
6
-	
7 7
 void initADC(int channel){
8
- //coucou
8
+	
9
+	// activer la clock de l'ADC 1
10
+	RCC->APB2ENR |= RCC_APB2ENR_ADC1EN;
11
+	RCC->CFGR |= 0x8000;
12
+	ADC1->CR2 |= ADC_CR2_ADON;
13
+	
14
+	// Choix du channel
15
+	ADC1->SQR3 |= channel << 0;// on est sur le premier car on a qu'un seul channel
16
+}
17
+
18
+void startADC(void) {
19
+	ADC1->CR2 |= ADC_CR2_ADON;
20
+}
21
+
22
+int read(void) {
23
+	int value ;
24
+	// Recuperer le bit de End of conversion
25
+	while (!(ADC1->SR & (0x01 << 1))); 
26
+	//on veut masquer les 12 bits les plus bas donc on prend le not de 0x0f >> 12 (111000000000)
27
+	value = ADC1->DR & (~(0x0f << 12));
28
+	return value;
9 29
 }
10 30
 
11 31
 
@@ -13,3 +33,4 @@ void initADC(int channel){
13 33
 
14 34
 
15 35
 
36
+

+ 4
- 0
FileInclude/MyADC.h View File

@@ -5,4 +5,8 @@
5 5
 // initialise tout ce au'il y a a faire pour l'ADC:
6 6
 void initADC(int channel);
7 7
 
8
+void startADC(void);
9
+
10
+int read(void);
11
+
8 12
 #endif

+ 137
- 110
Listings/Projet1_Simulation.map View File

@@ -4,10 +4,14 @@ Component: ARM Compiler 5.06 update 7 (build 960) Tool: armlink [4d3601]
4 4
 
5 5
 Section Cross References
6 6
 
7
+    prinicpal.o(i.Callback) refers to myadc.o(i.startADC) for startADC
8
+    prinicpal.o(i.Callback) refers to myadc.o(i.read) for read
9
+    prinicpal.o(i.Callback) refers to prinicpal.o(.data) for a
7 10
     prinicpal.o(i.main) refers to mytimer.o(i.MyTimer_Base_Init) for MyTimer_Base_Init
8
-    prinicpal.o(i.main) refers to mytimer.o(i.MyTimer_PWM) for MyTimer_PWM
11
+    prinicpal.o(i.main) refers to myadc.o(i.initADC) for initADC
12
+    prinicpal.o(i.main) refers to mytimer.o(i.MyTimer_ActiveIT) for MyTimer_ActiveIT
9 13
     prinicpal.o(i.main) refers to mytimer.o(i.MyTimer_Base_Start) for MyTimer_Base_Start
10
-    prinicpal.o(i.main) refers to mytimer.o(i.Set_PWM_PRCT) for Set_PWM_PRCT
14
+    prinicpal.o(i.main) refers to prinicpal.o(i.Callback) for Callback
11 15
     mytimer.o(i.MyTimer_ActiveIT) refers to mytimer.o(.data) for ptr1
12 16
     mytimer.o(i.MyTimer_PWM) refers to driver_gpio.o(i.MyGPIO_Init) for MyGPIO_Init
13 17
     mytimer.o(i.TIM1_UP_IRQHandler) refers to mytimer.o(.data) for ptr1
@@ -53,6 +57,7 @@ Removing Unused input sections from the image.
53 57
     Removing driver_gpio.o(.rev16_text), (4 bytes).
54 58
     Removing driver_gpio.o(.revsh_text), (4 bytes).
55 59
     Removing driver_gpio.o(.rrx_text), (6 bytes).
60
+    Removing driver_gpio.o(i.MyGPIO_Init), (180 bytes).
56 61
     Removing driver_gpio.o(i.MyGPIO_Read), (12 bytes).
57 62
     Removing driver_gpio.o(i.MyGPIO_Reset), (14 bytes).
58 63
     Removing driver_gpio.o(i.MyGPIO_Set), (12 bytes).
@@ -60,8 +65,12 @@ Removing Unused input sections from the image.
60 65
     Removing mytimer.o(.rev16_text), (4 bytes).
61 66
     Removing mytimer.o(.revsh_text), (4 bytes).
62 67
     Removing mytimer.o(.rrx_text), (6 bytes).
63
-    Removing mytimer.o(i.MyTimer_ActiveIT), (176 bytes).
64 68
     Removing mytimer.o(i.MyTimer_Base_Stop), (10 bytes).
69
+    Removing mytimer.o(i.MyTimer_PWM), (464 bytes).
70
+    Removing mytimer.o(i.Set_PWM_PRCT), (56 bytes).
71
+    Removing myadc.o(.rev16_text), (4 bytes).
72
+    Removing myadc.o(.revsh_text), (4 bytes).
73
+    Removing myadc.o(.rrx_text), (6 bytes).
65 74
     Removing startup_stm32f10x_md.o(HEAP), (512 bytes).
66 75
     Removing system_stm32f10x.o(.rev16_text), (4 bytes).
67 76
     Removing system_stm32f10x.o(.revsh_text), (4 bytes).
@@ -69,7 +78,7 @@ Removing Unused input sections from the image.
69 78
     Removing system_stm32f10x.o(i.SystemCoreClockUpdate), (164 bytes).
70 79
     Removing system_stm32f10x.o(.data), (20 bytes).
71 80
 
72
-21 unused section(s) (total 988 bytes) removed from the image.
81
+26 unused section(s) (total 1526 bytes) removed from the image.
73 82
 
74 83
 ==============================================================================
75 84
 
@@ -79,22 +88,24 @@ Image Symbol Table
79 88
 
80 89
     Symbol Name                              Value     Ov Type        Size  Object(Section)
81 90
 
82
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry9a.o ABSOLUTE
83
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry7a.o ABSOLUTE
84
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry8b.o ABSOLUTE
85 91
     ../clib/microlib/init/entry.s            0x00000000   Number         0  entry12b.o ABSOLUTE
86
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry8a.o ABSOLUTE
87
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry7b.o ABSOLUTE
88
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry5.o ABSOLUTE
89
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry.o ABSOLUTE
90
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry2.o ABSOLUTE
91
-    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry12a.o ABSOLUTE
92 92
     ../clib/microlib/init/entry.s            0x00000000   Number         0  entry11b.o ABSOLUTE
93 93
     ../clib/microlib/init/entry.s            0x00000000   Number         0  entry11a.o ABSOLUTE
94 94
     ../clib/microlib/init/entry.s            0x00000000   Number         0  entry10b.o ABSOLUTE
95 95
     ../clib/microlib/init/entry.s            0x00000000   Number         0  entry10a.o ABSOLUTE
96 96
     ../clib/microlib/init/entry.s            0x00000000   Number         0  entry9b.o ABSOLUTE
97
+    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry12a.o ABSOLUTE
98
+    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry9a.o ABSOLUTE
99
+    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry8b.o ABSOLUTE
100
+    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry8a.o ABSOLUTE
101
+    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry7b.o ABSOLUTE
102
+    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry7a.o ABSOLUTE
103
+    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry.o ABSOLUTE
104
+    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry5.o ABSOLUTE
105
+    ../clib/microlib/init/entry.s            0x00000000   Number         0  entry2.o ABSOLUTE
106
+    FileInclude\MyADC.c                      0x00000000   Number         0  myadc.o ABSOLUTE
97 107
     FileInclude\MyTimer.c                    0x00000000   Number         0  mytimer.o ABSOLUTE
108
+    FileInclude\\MyADC.c                     0x00000000   Number         0  myadc.o ABSOLUTE
98 109
     FileInclude\\MyTimer.c                   0x00000000   Number         0  mytimer.o ABSOLUTE
99 110
     RTE\Device\STM32F103RB\startup_stm32f10x_md.s 0x00000000   Number         0  startup_stm32f10x_md.o ABSOLUTE
100 111
     RTE\Device\STM32F103RB\system_stm32f10x.c 0x00000000   Number         0  system_stm32f10x.o ABSOLUTE
@@ -120,26 +131,29 @@ Image Symbol Table
120 131
     __lit__00000000                          0x08000100   Data           4  entry2.o(.ARM.Collect$$$$00002712)
121 132
     .text                                    0x08000104   Section       36  startup_stm32f10x_md.o(.text)
122 133
     .text                                    0x08000128   Section       36  init.o(.text)
123
-    i.MyGPIO_Init                            0x0800014c   Section        0  driver_gpio.o(i.MyGPIO_Init)
124
-    i.MyTimer_Base_Init                      0x08000200   Section        0  mytimer.o(i.MyTimer_Base_Init)
125
-    i.MyTimer_Base_Start                     0x0800026c   Section        0  mytimer.o(i.MyTimer_Base_Start)
126
-    i.MyTimer_PWM                            0x08000278   Section        0  mytimer.o(i.MyTimer_PWM)
127
-    i.SetSysClock                            0x08000448   Section        0  system_stm32f10x.o(i.SetSysClock)
128
-    SetSysClock                              0x08000449   Thumb Code     8  system_stm32f10x.o(i.SetSysClock)
129
-    i.SetSysClockTo72                        0x08000450   Section        0  system_stm32f10x.o(i.SetSysClockTo72)
130
-    SetSysClockTo72                          0x08000451   Thumb Code   214  system_stm32f10x.o(i.SetSysClockTo72)
131
-    i.Set_PWM_PRCT                           0x08000530   Section        0  mytimer.o(i.Set_PWM_PRCT)
132
-    i.SystemInit                             0x08000568   Section        0  system_stm32f10x.o(i.SystemInit)
133
-    i.TIM1_UP_IRQHandler                     0x080005c8   Section        0  mytimer.o(i.TIM1_UP_IRQHandler)
134
-    i.TIM2_IRQHandler                        0x080005ec   Section        0  mytimer.o(i.TIM2_IRQHandler)
135
-    i.TIM3_IRQHandler                        0x08000610   Section        0  mytimer.o(i.TIM3_IRQHandler)
136
-    i.TIM4_IRQHandler                        0x08000634   Section        0  mytimer.o(i.TIM4_IRQHandler)
137
-    i.__scatterload_copy                     0x08000658   Section       14  handlers.o(i.__scatterload_copy)
138
-    i.__scatterload_null                     0x08000666   Section        2  handlers.o(i.__scatterload_null)
139
-    i.__scatterload_zeroinit                 0x08000668   Section       14  handlers.o(i.__scatterload_zeroinit)
140
-    i.main                                   0x08000676   Section        0  prinicpal.o(i.main)
141
-    .data                                    0x20000000   Section       16  mytimer.o(.data)
142
-    STACK                                    0x20000010   Section     1024  startup_stm32f10x_md.o(STACK)
134
+    i.Callback                               0x0800014c   Section        0  prinicpal.o(i.Callback)
135
+    i.MyTimer_ActiveIT                       0x08000160   Section        0  mytimer.o(i.MyTimer_ActiveIT)
136
+    i.MyTimer_Base_Init                      0x08000210   Section        0  mytimer.o(i.MyTimer_Base_Init)
137
+    i.MyTimer_Base_Start                     0x0800027c   Section        0  mytimer.o(i.MyTimer_Base_Start)
138
+    i.SetSysClock                            0x08000286   Section        0  system_stm32f10x.o(i.SetSysClock)
139
+    SetSysClock                              0x08000287   Thumb Code     8  system_stm32f10x.o(i.SetSysClock)
140
+    i.SetSysClockTo72                        0x08000290   Section        0  system_stm32f10x.o(i.SetSysClockTo72)
141
+    SetSysClockTo72                          0x08000291   Thumb Code   214  system_stm32f10x.o(i.SetSysClockTo72)
142
+    i.SystemInit                             0x08000370   Section        0  system_stm32f10x.o(i.SystemInit)
143
+    i.TIM1_UP_IRQHandler                     0x080003d0   Section        0  mytimer.o(i.TIM1_UP_IRQHandler)
144
+    i.TIM2_IRQHandler                        0x080003f4   Section        0  mytimer.o(i.TIM2_IRQHandler)
145
+    i.TIM3_IRQHandler                        0x08000418   Section        0  mytimer.o(i.TIM3_IRQHandler)
146
+    i.TIM4_IRQHandler                        0x0800043c   Section        0  mytimer.o(i.TIM4_IRQHandler)
147
+    i.__scatterload_copy                     0x08000460   Section       14  handlers.o(i.__scatterload_copy)
148
+    i.__scatterload_null                     0x0800046e   Section        2  handlers.o(i.__scatterload_null)
149
+    i.__scatterload_zeroinit                 0x08000470   Section       14  handlers.o(i.__scatterload_zeroinit)
150
+    i.initADC                                0x08000480   Section        0  myadc.o(i.initADC)
151
+    i.main                                   0x080004bc   Section        0  prinicpal.o(i.main)
152
+    i.read                                   0x080004f8   Section        0  myadc.o(i.read)
153
+    i.startADC                               0x08000520   Section        0  myadc.o(i.startADC)
154
+    .data                                    0x20000000   Section        4  prinicpal.o(.data)
155
+    .data                                    0x20000004   Section       16  mytimer.o(.data)
156
+    STACK                                    0x20000018   Section     1024  startup_stm32f10x_md.o(STACK)
143 157
 
144 158
     Global Symbols
145 159
 
@@ -217,27 +231,30 @@ Image Symbol Table
217 231
     WWDG_IRQHandler                          0x0800011f   Thumb Code     0  startup_stm32f10x_md.o(.text)
218 232
     __scatterload                            0x08000129   Thumb Code    28  init.o(.text)
219 233
     __scatterload_rt2                        0x08000129   Thumb Code     0  init.o(.text)
220
-    MyGPIO_Init                              0x0800014d   Thumb Code   166  driver_gpio.o(i.MyGPIO_Init)
221
-    MyTimer_Base_Init                        0x08000201   Thumb Code    98  mytimer.o(i.MyTimer_Base_Init)
222
-    MyTimer_Base_Start                       0x0800026d   Thumb Code    10  mytimer.o(i.MyTimer_Base_Start)
223
-    MyTimer_PWM                              0x08000279   Thumb Code   448  mytimer.o(i.MyTimer_PWM)
224
-    Set_PWM_PRCT                             0x08000531   Thumb Code    56  mytimer.o(i.Set_PWM_PRCT)
225
-    SystemInit                               0x08000569   Thumb Code    78  system_stm32f10x.o(i.SystemInit)
226
-    TIM1_UP_IRQHandler                       0x080005c9   Thumb Code    28  mytimer.o(i.TIM1_UP_IRQHandler)
227
-    TIM2_IRQHandler                          0x080005ed   Thumb Code    32  mytimer.o(i.TIM2_IRQHandler)
228
-    TIM3_IRQHandler                          0x08000611   Thumb Code    28  mytimer.o(i.TIM3_IRQHandler)
229
-    TIM4_IRQHandler                          0x08000635   Thumb Code    28  mytimer.o(i.TIM4_IRQHandler)
230
-    __scatterload_copy                       0x08000659   Thumb Code    14  handlers.o(i.__scatterload_copy)
231
-    __scatterload_null                       0x08000667   Thumb Code     2  handlers.o(i.__scatterload_null)
232
-    __scatterload_zeroinit                   0x08000669   Thumb Code    14  handlers.o(i.__scatterload_zeroinit)
233
-    main                                     0x08000677   Thumb Code    56  prinicpal.o(i.main)
234
-    Region$$Table$$Base                      0x080006b0   Number         0  anon$$obj.o(Region$$Table)
235
-    Region$$Table$$Limit                     0x080006d0   Number         0  anon$$obj.o(Region$$Table)
236
-    ptr1                                     0x20000000   Data           4  mytimer.o(.data)
237
-    ptr2                                     0x20000004   Data           4  mytimer.o(.data)
238
-    ptr3                                     0x20000008   Data           4  mytimer.o(.data)
239
-    ptr4                                     0x2000000c   Data           4  mytimer.o(.data)
240
-    __initial_sp                             0x20000410   Data           0  startup_stm32f10x_md.o(STACK)
234
+    Callback                                 0x0800014d   Thumb Code    16  prinicpal.o(i.Callback)
235
+    MyTimer_ActiveIT                         0x08000161   Thumb Code   148  mytimer.o(i.MyTimer_ActiveIT)
236
+    MyTimer_Base_Init                        0x08000211   Thumb Code    98  mytimer.o(i.MyTimer_Base_Init)
237
+    MyTimer_Base_Start                       0x0800027d   Thumb Code    10  mytimer.o(i.MyTimer_Base_Start)
238
+    SystemInit                               0x08000371   Thumb Code    78  system_stm32f10x.o(i.SystemInit)
239
+    TIM1_UP_IRQHandler                       0x080003d1   Thumb Code    28  mytimer.o(i.TIM1_UP_IRQHandler)
240
+    TIM2_IRQHandler                          0x080003f5   Thumb Code    32  mytimer.o(i.TIM2_IRQHandler)
241
+    TIM3_IRQHandler                          0x08000419   Thumb Code    28  mytimer.o(i.TIM3_IRQHandler)
242
+    TIM4_IRQHandler                          0x0800043d   Thumb Code    28  mytimer.o(i.TIM4_IRQHandler)
243
+    __scatterload_copy                       0x08000461   Thumb Code    14  handlers.o(i.__scatterload_copy)
244
+    __scatterload_null                       0x0800046f   Thumb Code     2  handlers.o(i.__scatterload_null)
245
+    __scatterload_zeroinit                   0x08000471   Thumb Code    14  handlers.o(i.__scatterload_zeroinit)
246
+    initADC                                  0x08000481   Thumb Code    50  myadc.o(i.initADC)
247
+    main                                     0x080004bd   Thumb Code    56  prinicpal.o(i.main)
248
+    read                                     0x080004f9   Thumb Code    36  myadc.o(i.read)
249
+    startADC                                 0x08000521   Thumb Code    14  myadc.o(i.startADC)
250
+    Region$$Table$$Base                      0x08000534   Number         0  anon$$obj.o(Region$$Table)
251
+    Region$$Table$$Limit                     0x08000554   Number         0  anon$$obj.o(Region$$Table)
252
+    a                                        0x20000000   Data           4  prinicpal.o(.data)
253
+    ptr1                                     0x20000004   Data           4  mytimer.o(.data)
254
+    ptr2                                     0x20000008   Data           4  mytimer.o(.data)
255
+    ptr3                                     0x2000000c   Data           4  mytimer.o(.data)
256
+    ptr4                                     0x20000010   Data           4  mytimer.o(.data)
257
+    __initial_sp                             0x20000418   Data           0  startup_stm32f10x_md.o(STACK)
241 258
 
242 259
 
243 260
 
@@ -245,54 +262,64 @@ Image Symbol Table
245 262
 
246 263
 Memory Map of the image
247 264
 
248
-  Image Entry point : 0x080000ed
265
+  Image Entry point : 0x08000105
249 266
 
250
-  Load Region LR_IROM1 (Base: 0x08000000, Size: 0x000006e0, Max: 0x00020000, ABSOLUTE)
267
+  Load Region LR_1 (Base: 0x08000000, Size: 0x00000568, Max: 0xffffffff, ABSOLUTE)
251 268
 
252
-    Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x000006d0, Max: 0x00020000, ABSOLUTE)
269
+    Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000554, Max: 0xffffffff, ABSOLUTE)
253 270
 
254 271
     Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
255 272
 
256
-    0x08000000   0x08000000   0x000000ec   Data   RO          200    RESET               startup_stm32f10x_md.o
257
-    0x080000ec   0x080000ec   0x00000000   Code   RO          251  * .ARM.Collect$$$$00000000  mc_w.l(entry.o)
258
-    0x080000ec   0x080000ec   0x00000004   Code   RO          254    .ARM.Collect$$$$00000001  mc_w.l(entry2.o)
259
-    0x080000f0   0x080000f0   0x00000004   Code   RO          257    .ARM.Collect$$$$00000004  mc_w.l(entry5.o)
260
-    0x080000f4   0x080000f4   0x00000000   Code   RO          259    .ARM.Collect$$$$00000008  mc_w.l(entry7b.o)
261
-    0x080000f4   0x080000f4   0x00000000   Code   RO          261    .ARM.Collect$$$$0000000A  mc_w.l(entry8b.o)
262
-    0x080000f4   0x080000f4   0x00000008   Code   RO          262    .ARM.Collect$$$$0000000B  mc_w.l(entry9a.o)
263
-    0x080000fc   0x080000fc   0x00000004   Code   RO          269    .ARM.Collect$$$$0000000E  mc_w.l(entry12b.o)
264
-    0x08000100   0x08000100   0x00000000   Code   RO          264    .ARM.Collect$$$$0000000F  mc_w.l(entry10a.o)
265
-    0x08000100   0x08000100   0x00000000   Code   RO          266    .ARM.Collect$$$$00000011  mc_w.l(entry11a.o)
266
-    0x08000100   0x08000100   0x00000004   Code   RO          255    .ARM.Collect$$$$00002712  mc_w.l(entry2.o)
267
-    0x08000104   0x08000104   0x00000024   Code   RO          201    .text               startup_stm32f10x_md.o
268
-    0x08000128   0x08000128   0x00000024   Code   RO          270    .text               mc_w.l(init.o)
269
-    0x0800014c   0x0800014c   0x000000b4   Code   RO           63    i.MyGPIO_Init       driver_gpio.o
270
-    0x08000200   0x08000200   0x0000006c   Code   RO          115    i.MyTimer_Base_Init  mytimer.o
271
-    0x0800026c   0x0800026c   0x0000000a   Code   RO          116    i.MyTimer_Base_Start  mytimer.o
272
-    0x08000276   0x08000276   0x00000002   PAD
273
-    0x08000278   0x08000278   0x000001d0   Code   RO          118    i.MyTimer_PWM       mytimer.o
274
-    0x08000448   0x08000448   0x00000008   Code   RO          208    i.SetSysClock       system_stm32f10x.o
275
-    0x08000450   0x08000450   0x000000e0   Code   RO          209    i.SetSysClockTo72   system_stm32f10x.o
276
-    0x08000530   0x08000530   0x00000038   Code   RO          119    i.Set_PWM_PRCT      mytimer.o
277
-    0x08000568   0x08000568   0x00000060   Code   RO          211    i.SystemInit        system_stm32f10x.o
278
-    0x080005c8   0x080005c8   0x00000024   Code   RO          120    i.TIM1_UP_IRQHandler  mytimer.o
279
-    0x080005ec   0x080005ec   0x00000024   Code   RO          121    i.TIM2_IRQHandler   mytimer.o
280
-    0x08000610   0x08000610   0x00000024   Code   RO          122    i.TIM3_IRQHandler   mytimer.o
281
-    0x08000634   0x08000634   0x00000024   Code   RO          123    i.TIM4_IRQHandler   mytimer.o
282
-    0x08000658   0x08000658   0x0000000e   Code   RO          274    i.__scatterload_copy  mc_w.l(handlers.o)
283
-    0x08000666   0x08000666   0x00000002   Code   RO          275    i.__scatterload_null  mc_w.l(handlers.o)
284
-    0x08000668   0x08000668   0x0000000e   Code   RO          276    i.__scatterload_zeroinit  mc_w.l(handlers.o)
285
-    0x08000676   0x08000676   0x00000038   Code   RO            4    i.main              prinicpal.o
286
-    0x080006ae   0x080006ae   0x00000002   PAD
287
-    0x080006b0   0x080006b0   0x00000020   Data   RO          272    Region$$Table       anon$$obj.o
288
-
289
-
290
-    Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x080006d0, Size: 0x00000410, Max: 0x00005000, ABSOLUTE)
273
+    0x08000000   0x08000000   0x000000ec   Data   RO          251    RESET               startup_stm32f10x_md.o
274
+    0x080000ec   0x080000ec   0x00000000   Code   RO          302  * .ARM.Collect$$$$00000000  mc_w.l(entry.o)
275
+    0x080000ec   0x080000ec   0x00000004   Code   RO          305    .ARM.Collect$$$$00000001  mc_w.l(entry2.o)
276
+    0x080000f0   0x080000f0   0x00000004   Code   RO          308    .ARM.Collect$$$$00000004  mc_w.l(entry5.o)
277
+    0x080000f4   0x080000f4   0x00000000   Code   RO          310    .ARM.Collect$$$$00000008  mc_w.l(entry7b.o)
278
+    0x080000f4   0x080000f4   0x00000000   Code   RO          312    .ARM.Collect$$$$0000000A  mc_w.l(entry8b.o)
279
+    0x080000f4   0x080000f4   0x00000008   Code   RO          313    .ARM.Collect$$$$0000000B  mc_w.l(entry9a.o)
280
+    0x080000fc   0x080000fc   0x00000004   Code   RO          320    .ARM.Collect$$$$0000000E  mc_w.l(entry12b.o)
281
+    0x08000100   0x08000100   0x00000000   Code   RO          315    .ARM.Collect$$$$0000000F  mc_w.l(entry10a.o)
282
+    0x08000100   0x08000100   0x00000000   Code   RO          317    .ARM.Collect$$$$00000011  mc_w.l(entry11a.o)
283
+    0x08000100   0x08000100   0x00000004   Code   RO          306    .ARM.Collect$$$$00002712  mc_w.l(entry2.o)
284
+    0x08000104   0x08000104   0x00000024   Code   RO          252  * .text               startup_stm32f10x_md.o
285
+    0x08000128   0x08000128   0x00000024   Code   RO          321    .text               mc_w.l(init.o)
286
+    0x0800014c   0x0800014c   0x00000014   Code   RO            4    i.Callback          prinicpal.o
287
+    0x08000160   0x08000160   0x000000b0   Code   RO          126    i.MyTimer_ActiveIT  mytimer.o
288
+    0x08000210   0x08000210   0x0000006c   Code   RO          127    i.MyTimer_Base_Init  mytimer.o
289
+    0x0800027c   0x0800027c   0x0000000a   Code   RO          128    i.MyTimer_Base_Start  mytimer.o
290
+    0x08000286   0x08000286   0x00000008   Code   RO          259    i.SetSysClock       system_stm32f10x.o
291
+    0x0800028e   0x0800028e   0x00000002   PAD
292
+    0x08000290   0x08000290   0x000000e0   Code   RO          260    i.SetSysClockTo72   system_stm32f10x.o
293
+    0x08000370   0x08000370   0x00000060   Code   RO          262    i.SystemInit        system_stm32f10x.o
294
+    0x080003d0   0x080003d0   0x00000024   Code   RO          132    i.TIM1_UP_IRQHandler  mytimer.o
295
+    0x080003f4   0x080003f4   0x00000024   Code   RO          133    i.TIM2_IRQHandler   mytimer.o
296
+    0x08000418   0x08000418   0x00000024   Code   RO          134    i.TIM3_IRQHandler   mytimer.o
297
+    0x0800043c   0x0800043c   0x00000024   Code   RO          135    i.TIM4_IRQHandler   mytimer.o
298
+    0x08000460   0x08000460   0x0000000e   Code   RO          325    i.__scatterload_copy  mc_w.l(handlers.o)
299
+    0x0800046e   0x0800046e   0x00000002   Code   RO          326    i.__scatterload_null  mc_w.l(handlers.o)
300
+    0x08000470   0x08000470   0x0000000e   Code   RO          327    i.__scatterload_zeroinit  mc_w.l(handlers.o)
301
+    0x0800047e   0x0800047e   0x00000002   PAD
302
+    0x08000480   0x08000480   0x0000003c   Code   RO          213    i.initADC           myadc.o
303
+    0x080004bc   0x080004bc   0x0000003c   Code   RO            5    i.main              prinicpal.o
304
+    0x080004f8   0x080004f8   0x00000028   Code   RO          214    i.read              myadc.o
305
+    0x08000520   0x08000520   0x00000014   Code   RO          215    i.startADC          myadc.o
306
+    0x08000534   0x08000534   0x00000020   Data   RO          323    Region$$Table       anon$$obj.o
307
+
308
+
309
+    Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000554, Size: 0x00000014, Max: 0xffffffff, ABSOLUTE)
310
+
311
+    Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
312
+
313
+    0x20000000   0x08000554   0x00000004   Data   RW            6    .data               prinicpal.o
314
+    0x20000004   0x08000558   0x00000010   Data   RW          136    .data               mytimer.o
315
+
316
+
317
+    Execution Region ER_ZI (Exec base: 0x20000014, Load base: 0x08000568, Size: 0x00000404, Max: 0xffffffff, ABSOLUTE)
291 318
 
292 319
     Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
293 320
 
294
-    0x20000000   0x080006d0   0x00000010   Data   RW          124    .data               mytimer.o
295
-    0x20000010        -       0x00000400   Zero   RW          198    STACK               startup_stm32f10x_md.o
321
+    0x20000014   0x08000568   0x00000004   PAD
322
+    0x20000018        -       0x00000400   Zero   RW          249    STACK               startup_stm32f10x_md.o
296 323
 
297 324
 
298 325
 ==============================================================================
@@ -302,16 +329,16 @@ Image component sizes
302 329
 
303 330
       Code (inc. data)   RO Data    RW Data    ZI Data      Debug   Object Name
304 331
 
305
-       180         14          0          0          0       1658   driver_gpio.o
306
-       782         54          0         16          0       5979   mytimer.o
307
-        56          0          0          0          0     207723   prinicpal.o
308
-        36          8        236          0       1024        804   startup_stm32f10x_md.o
309
-       328         28          0          0          0       1949   system_stm32f10x.o
332
+       120         20          0          0          0       1284   myadc.o
333
+       438         66          0         16          0       4557   mytimer.o
334
+        80          8          0          4          0     208330   prinicpal.o
335
+        36          8        236          0       1024        808   startup_stm32f10x_md.o
336
+       328         28          0          0          0       1973   system_stm32f10x.o
310 337
 
311 338
     ----------------------------------------------------------------------
312
-      1386        104        268         16       1024     218113   Object Totals
339
+      1004        130        268         20       1028     216952   Object Totals
313 340
          0          0         32          0          0          0   (incl. Generated)
314
-         4          0          0          0          0          0   (incl. Padding)
341
+         2          0          0          0          4          0   (incl. Padding)
315 342
 
316 343
     ----------------------------------------------------------------------
317 344
 
@@ -330,8 +357,8 @@ Image component sizes
330 357
         36          8          0          0          0         68   init.o
331 358
 
332 359
     ----------------------------------------------------------------------
333
-        90         16          0          0          0         68   Library Totals
334
-         0          0          0          0          0          0   (incl. Padding)
360
+        92         16          0          0          0         68   Library Totals
361
+         2          0          0          0          0          0   (incl. Padding)
335 362
 
336 363
     ----------------------------------------------------------------------
337 364
 
@@ -340,7 +367,7 @@ Image component sizes
340 367
         90         16          0          0          0         68   mc_w.l
341 368
 
342 369
     ----------------------------------------------------------------------
343
-        90         16          0          0          0         68   Library Totals
370
+        92         16          0          0          0         68   Library Totals
344 371
 
345 372
     ----------------------------------------------------------------------
346 373
 
@@ -349,15 +376,15 @@ Image component sizes
349 376
 
350 377
       Code (inc. data)   RO Data    RW Data    ZI Data      Debug   
351 378
 
352
-      1476        120        268         16       1024     217761   Grand Totals
353
-      1476        120        268         16       1024     217761   ELF Image Totals
354
-      1476        120        268         16          0          0   ROM Totals
379
+      1096        146        268         20       1028     216548   Grand Totals
380
+      1096        146        268         20       1028     216548   ELF Image Totals
381
+      1096        146        268         20          0          0   ROM Totals
355 382
 
356 383
 ==============================================================================
357 384
 
358
-    Total RO  Size (Code + RO Data)                 1744 (   1.70kB)
359
-    Total RW  Size (RW Data + ZI Data)              1040 (   1.02kB)
360
-    Total ROM Size (Code + RO Data + RW Data)       1760 (   1.72kB)
385
+    Total RO  Size (Code + RO Data)                 1364 (   1.33kB)
386
+    Total RW  Size (RW Data + ZI Data)              1048 (   1.02kB)
387
+    Total ROM Size (Code + RO Data + RW Data)       1384 (   1.35kB)
361 388
 
362 389
 ==============================================================================
363 390
 

+ 6
- 6
Listings/startup_stm32f10x_md.lst View File

@@ -465,12 +465,12 @@ ARM Macro Assembler    Page 8
465 465
               00000000 
466 466
 Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
467 467
 ork --depend=.\objects\startup_stm32f10x_md.d -o.\objects\startup_stm32f10x_md.
468
-o -I.\RTE\Device\STM32F103RB -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\
469
-CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_D
470
-FP\2.3.0\Device\Include --predefine="__EVAL SETA 1" --predefine="__MICROLIB SET
471
-A 1" --predefine="__UVISION_VERSION SETA 534" --predefine="_RTE_ SETA 1" --pred
472
-efine="STM32F10X_MD SETA 1" --predefine="_RTE_ SETA 1" --list=.\listings\startu
473
-p_stm32f10x_md.lst RTE\Device\STM32F103RB\startup_stm32f10x_md.s
468
+o -I.\RTE\Device\STM32F103RB -I.\RTE\_SImulation -IC:\Programdata\Keil\Arm\Pack
469
+s\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32
470
+F1xx_DFP\2.3.0\Device\Include --predefine="__EVAL SETA 1" --predefine="__MICROL
471
+IB SETA 1" --predefine="__UVISION_VERSION SETA 534" --predefine="_RTE_ SETA 1" 
472
+--predefine="STM32F10X_MD SETA 1" --predefine="_RTE_ SETA 1" --list=.\listings\
473
+startup_stm32f10x_md.lst RTE\Device\STM32F103RB\startup_stm32f10x_md.s
474 474
 
475 475
 
476 476
 

+ 15
- 1
Objects/Projet1_SImulation.dep View File

@@ -1,6 +1,6 @@
1 1
 Dependencies for Project 'Projet1', Target 'SImulation': (DO NOT MODIFY !)
2 2
 CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC
3
-F (.\Sources\prinicpal.c)(0x63402527)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude

-I.\RTE\Device\STM32F103RB

-I.\RTE\_SImulation

-IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\prinicpal.o --omf_browse .\objects\prinicpal.crf --depend .\objects\prinicpal.d)
3
+F (.\Sources\prinicpal.c)(0x63495DAA)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude

-I.\RTE\Device\STM32F103RB

-I.\RTE\_SImulation

-IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\prinicpal.o --omf_browse .\objects\prinicpal.crf --depend .\objects\prinicpal.d)
4 4
 I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
5 5
 I (.\RTE\_SImulation\RTE_Components.h)(0x63284DB0)
6 6
 I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582)
@@ -11,6 +11,7 @@ I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.
11 11
 I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC)
12 12
 I (.\FileInclude\Driver_GPIO.h)(0x63315001)
13 13
 I (.\FileInclude\MyTimer.h)(0x6340244A)
14
+I (.\FileInclude\MyADC.h)(0x63495643)
14 15
 F (U:\Documents\4ir\S1\Microcontroleur\Drivers\FileInclude\Driver_GPIO.c)(0x633153E6)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude

-I.\RTE\Device\STM32F103RB

-I.\RTE\_SImulation

-IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\driver_gpio.o --omf_browse .\objects\driver_gpio.crf --depend .\objects\driver_gpio.d)
15 16
 I (U:\Documents\4ir\S1\Microcontroleur\Drivers\FileInclude\Driver_GPIO.h)(0x63315001)
16 17
 I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
@@ -33,6 +34,19 @@ I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.
33 34
 I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC)
34 35
 I (FileInclude\Driver_GPIO.h)(0x63315001)
35 36
 F (.\FileInclude\MyTimer.h)(0x6340244A)()
37
+F (.\FileInclude\MyADC.c)(0x63495C37)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude

-I.\RTE\Device\STM32F103RB

-I.\RTE\_SImulation

-IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\myadc.o --omf_browse .\objects\myadc.crf --depend .\objects\myadc.d)
38
+I (FileInclude\MyADC.h)(0x63495643)
39
+I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
40
+I (.\RTE\_SImulation\RTE_Components.h)(0x63284DB0)
41
+I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582)
42
+I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122)
43
+I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582)
44
+I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22)
45
+I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582)
46
+I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC)
47
+I (FileInclude\MyTimer.h)(0x6340244A)
48
+I (FileInclude\Driver_GPIO.h)(0x63315001)
49
+F (.\FileInclude\MyADC.h)(0x63495643)()
36 50
 F (RTE\Device\STM32F103RB\RTE_Device.h)(0x59283406)()
37 51
 F (RTE\Device\STM32F103RB\startup_stm32f10x_md.s)(0x58258CCC)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1"

-I.\RTE\Device\STM32F103RB

-I.\RTE\_SImulation

-IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

--pd "__UVISION_VERSION SETA 534" --pd "_RTE_ SETA 1" --pd "STM32F10X_MD SETA 1" --pd "_RTE_ SETA 1"

--list .\listings\startup_stm32f10x_md.lst --xref -o .\objects\startup_stm32f10x_md.o --depend .\objects\startup_stm32f10x_md.d)
38 52
 F (RTE\Device\STM32F103RB\system_stm32f10x.c)(0x58258CCC)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude

-I.\RTE\Device\STM32F103RB

-I.\RTE\_SImulation

-IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\system_stm32f10x.o --omf_browse .\objects\system_stm32f10x.crf --depend .\objects\system_stm32f10x.d)

BIN
Objects/Projet1_Simulation.axf View File


+ 12
- 11
Objects/Projet1_Simulation.build_log.htm View File

@@ -17,23 +17,24 @@ Library Manager: ArmAr.exe V5.06 update 7 (build 960)
17 17
 Hex Converter:   FromElf.exe V5.06 update 7 (build 960)
18 18
 CPU DLL:         SARMCM3.DLL V5.34.0.0
19 19
 Dialog DLL:      DARMSTM.DLL V1.68.0.0
20
-Target DLL:      STLink\ST-LINKIII-KEIL_SWO.dll V3.0.8.0
20
+Target DLL:      UL2CM3.DLL V1.163.9.0
21 21
 Dialog DLL:      TARMSTM.DLL V1.66.0.0
22 22
  
23 23
 <h2>Project:</h2>
24
-U:\Documents\4ir\S1\Microcontroleur\Timer\Projet1.uvprojx
25
-Project File Date:  10/02/2022
24
+U:\Documents\4ir\S1\Microcontroleur\TP_Voilier\Projet1.uvprojx
25
+Project File Date:  10/14/2022
26 26
 
27 27
 <h2>Output:</h2>
28 28
 *** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
29
-Rebuild target 'Réel'
29
+Rebuild target 'SImulation'
30 30
 assembling startup_stm32f10x_md.s...
31 31
 compiling Driver_GPIO.c...
32
-compiling prinicpal.c...
33
-compiling MyTimer.c...
34 32
 compiling system_stm32f10x.c...
33
+compiling MyTimer.c...
34
+compiling prinicpal.c...
35
+compiling MyADC.c...
35 36
 linking...
36
-Program Size: Code=1476 RO-data=268 RW-data=16 ZI-data=1024  
37
+Program Size: Code=1096 RO-data=268 RW-data=20 ZI-data=1028  
37 38
 ".\Objects\Projet1_Simulation.axf" - 0 Error(s), 0 Warning(s).
38 39
 
39 40
 <h2>Software Packages used:</h2>
@@ -52,7 +53,7 @@ Package Vendor: Keil
52 53
 
53 54
 <h2>Collection of Component include folders:</h2>
54 55
   .\RTE\Device\STM32F103RB
55
-  .\RTE\_R_el
56
+  .\RTE\_SImulation
56 57
   C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include
57 58
   C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include
58 59
 
@@ -61,11 +62,11 @@ Package Vendor: Keil
61 62
    * Component: ARM::CMSIS:CORE:5.4.0
62 63
 
63 64
    * Component: Keil::Device:Startup:1.0.0
64
-      Include file:  RTE_Driver\Config\RTE_Device.h
65 65
       Source file:   Device\Source\ARM\STM32F1xx_OPT.s
66
-      Source file:   Device\Source\ARM\startup_stm32f10x_md.s
67 66
       Source file:   Device\Source\system_stm32f10x.c
68
-Build Time Elapsed:  00:00:01
67
+      Include file:  RTE_Driver\Config\RTE_Device.h
68
+      Source file:   Device\Source\ARM\startup_stm32f10x_md.s
69
+Build Time Elapsed:  00:00:02
69 70
 </pre>
70 71
 </body>
71 72
 </html>

+ 60
- 54
Objects/Projet1_Simulation.htm View File

@@ -3,11 +3,11 @@
3 3
 <title>Static Call Graph - [.\Objects\Projet1_Simulation.axf]</title></head>
4 4
 <body><HR>
5 5
 <H1>Static Call Graph for image .\Objects\Projet1_Simulation.axf</H1><HR>
6
-<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060960: Last Updated: Fri Oct 07 15:10:37 2022
6
+<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060960: Last Updated: Fri Oct 14 15:01:44 2022
7 7
 <BR><P>
8
-<H3>Maximum Stack Usage =         52 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
8
+<H3>Maximum Stack Usage =         28 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
9 9
 Call chain for Maximum Stack Depth:</H3>
10
-main &rArr; MyTimer_PWM &rArr; MyGPIO_Init
10
+SystemInit &rArr; SetSysClock &rArr; SetSysClockTo72
11 11
 <P>
12 12
 <H3>
13 13
 Mutually Recursive functions
@@ -30,6 +30,7 @@ Function Pointers
30 30
  <LI><a href="#[4]">BusFault_Handler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
31 31
  <LI><a href="#[1f]">CAN1_RX1_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
32 32
  <LI><a href="#[20]">CAN1_SCE_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
33
+ <LI><a href="#[38]">Callback</a> from prinicpal.o(i.Callback) referenced from prinicpal.o(i.main)
33 34
  <LI><a href="#[15]">DMA1_Channel1_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
34 35
  <LI><a href="#[16]">DMA1_Channel2_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
35 36
  <LI><a href="#[17]">DMA1_Channel3_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
@@ -58,7 +59,7 @@ Function Pointers
58 59
  <LI><a href="#[f]">RCC_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
59 60
  <LI><a href="#[33]">RTCAlarm_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
60 61
  <LI><a href="#[d]">RTC_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
61
- <LI><a href="#[0]">Reset_Handler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
62
+ <LI><a href="#[39]">Reset_Handler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
62 63
  <LI><a href="#[2d]">SPI1_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
63 64
  <LI><a href="#[2e]">SPI2_IRQHandler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
64 65
  <LI><a href="#[6]">SVC_Handler</a> from startup_stm32f10x_md.o(.text) referenced from startup_stm32f10x_md.o(RESET)
@@ -90,31 +91,30 @@ Global Symbols
90 91
 <P><STRONG><a name="[37]"></a>__main</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry.o(.ARM.Collect$$$$00000000))
91 92
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(.text)
92 93
 </UL>
93
-<P><STRONG><a name="[42]"></a>_main_stk</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry2.o(.ARM.Collect$$$$00000001))
94
+<P><STRONG><a name="[45]"></a>_main_stk</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry2.o(.ARM.Collect$$$$00000001))
94 95
 
95
-<P><STRONG><a name="[38]"></a>_main_scatterload</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry5.o(.ARM.Collect$$$$00000004))
96
-<BR><BR>[Calls]<UL><LI><a href="#[39]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__scatterload
96
+<P><STRONG><a name="[3a]"></a>_main_scatterload</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry5.o(.ARM.Collect$$$$00000004))
97
+<BR><BR>[Calls]<UL><LI><a href="#[3b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__scatterload
97 98
 </UL>
98 99
 
99
-<P><STRONG><a name="[3a]"></a>__main_after_scatterload</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry5.o(.ARM.Collect$$$$00000004))
100
-<BR><BR>[Called By]<UL><LI><a href="#[39]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__scatterload
100
+<P><STRONG><a name="[3c]"></a>__main_after_scatterload</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry5.o(.ARM.Collect$$$$00000004))
101
+<BR><BR>[Called By]<UL><LI><a href="#[3b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__scatterload
101 102
 </UL>
102 103
 
103
-<P><STRONG><a name="[43]"></a>_main_clock</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry7b.o(.ARM.Collect$$$$00000008))
104
+<P><STRONG><a name="[46]"></a>_main_clock</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry7b.o(.ARM.Collect$$$$00000008))
104 105
 
105
-<P><STRONG><a name="[44]"></a>_main_cpp_init</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry8b.o(.ARM.Collect$$$$0000000A))
106
+<P><STRONG><a name="[47]"></a>_main_cpp_init</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry8b.o(.ARM.Collect$$$$0000000A))
106 107
 
107
-<P><STRONG><a name="[45]"></a>_main_init</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry9a.o(.ARM.Collect$$$$0000000B))
108
+<P><STRONG><a name="[48]"></a>_main_init</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry9a.o(.ARM.Collect$$$$0000000B))
108 109
 
109
-<P><STRONG><a name="[46]"></a>__rt_lib_shutdown_fini</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry12b.o(.ARM.Collect$$$$0000000E))
110
+<P><STRONG><a name="[49]"></a>__rt_lib_shutdown_fini</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry12b.o(.ARM.Collect$$$$0000000E))
110 111
 
111
-<P><STRONG><a name="[47]"></a>__rt_final_cpp</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry10a.o(.ARM.Collect$$$$0000000F))
112
+<P><STRONG><a name="[4a]"></a>__rt_final_cpp</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry10a.o(.ARM.Collect$$$$0000000F))
112 113
 
113
-<P><STRONG><a name="[48]"></a>__rt_final_exit</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry11a.o(.ARM.Collect$$$$00000011))
114
+<P><STRONG><a name="[4b]"></a>__rt_final_exit</STRONG> (Thumb, 0 bytes, Stack size unknown bytes, entry11a.o(.ARM.Collect$$$$00000011))
115
+
116
+<P><STRONG><a name="[39]"></a>Reset_Handler</STRONG> (Thumb, 8 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
114 117
 
115
-<P><STRONG><a name="[0]"></a>Reset_Handler</STRONG> (Thumb, 8 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
116
-<BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
117
-</UL>
118 118
 <P><STRONG><a name="[1]"></a>NMI_Handler</STRONG> (Thumb, 2 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
119 119
 <BR><BR>[Calls]<UL><LI><a href="#[1]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;NMI_Handler
120 120
 </UL>
@@ -299,46 +299,40 @@ Global Symbols
299 299
 <P><STRONG><a name="[a]"></a>WWDG_IRQHandler</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
300 300
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
301 301
 </UL>
302
-<P><STRONG><a name="[39]"></a>__scatterload</STRONG> (Thumb, 28 bytes, Stack size 0 bytes, init.o(.text))
303
-<BR><BR>[Calls]<UL><LI><a href="#[3a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__main_after_scatterload
302
+<P><STRONG><a name="[3b]"></a>__scatterload</STRONG> (Thumb, 28 bytes, Stack size 0 bytes, init.o(.text))
303
+<BR><BR>[Calls]<UL><LI><a href="#[3c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__main_after_scatterload
304 304
 </UL>
305
-<BR>[Called By]<UL><LI><a href="#[38]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_main_scatterload
305
+<BR>[Called By]<UL><LI><a href="#[3a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_main_scatterload
306 306
 </UL>
307 307
 
308
-<P><STRONG><a name="[49]"></a>__scatterload_rt2</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, init.o(.text), UNUSED)
308
+<P><STRONG><a name="[4c]"></a>__scatterload_rt2</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, init.o(.text), UNUSED)
309 309
 
310
-<P><STRONG><a name="[3c]"></a>MyGPIO_Init</STRONG> (Thumb, 166 bytes, Stack size 12 bytes, driver_gpio.o(i.MyGPIO_Init))
311
-<BR><BR>[Stack]<UL><LI>Max Depth = 12<LI>Call Chain = MyGPIO_Init
310
+<P><STRONG><a name="[38]"></a>Callback</STRONG> (Thumb, 16 bytes, Stack size 8 bytes, prinicpal.o(i.Callback))
311
+<BR><BR>[Stack]<UL><LI>Max Depth = 8<LI>Call Chain = Callback
312 312
 </UL>
313
-<BR>[Called By]<UL><LI><a href="#[3b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_PWM
313
+<BR>[Calls]<UL><LI><a href="#[3d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;startADC
314
+<LI><a href="#[3e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;read
314 315
 </UL>
315
-
316
-<P><STRONG><a name="[3f]"></a>MyTimer_Base_Init</STRONG> (Thumb, 98 bytes, Stack size 0 bytes, mytimer.o(i.MyTimer_Base_Init))
317
-<BR><BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
316
+<BR>[Address Reference Count : 1]<UL><LI> prinicpal.o(i.main)
318 317
 </UL>
319
-
320
-<P><STRONG><a name="[40]"></a>MyTimer_Base_Start</STRONG> (Thumb, 10 bytes, Stack size 0 bytes, mytimer.o(i.MyTimer_Base_Start))
321
-<BR><BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
322
-</UL>
323
-
324
-<P><STRONG><a name="[3b]"></a>MyTimer_PWM</STRONG> (Thumb, 448 bytes, Stack size 24 bytes, mytimer.o(i.MyTimer_PWM))
325
-<BR><BR>[Stack]<UL><LI>Max Depth = 36<LI>Call Chain = MyTimer_PWM &rArr; MyGPIO_Init
326
-</UL>
327
-<BR>[Calls]<UL><LI><a href="#[3c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyGPIO_Init
318
+<P><STRONG><a name="[43]"></a>MyTimer_ActiveIT</STRONG> (Thumb, 148 bytes, Stack size 8 bytes, mytimer.o(i.MyTimer_ActiveIT))
319
+<BR><BR>[Stack]<UL><LI>Max Depth = 8<LI>Call Chain = MyTimer_ActiveIT
328 320
 </UL>
329 321
 <BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
330 322
 </UL>
331 323
 
332
-<P><STRONG><a name="[41]"></a>Set_PWM_PRCT</STRONG> (Thumb, 56 bytes, Stack size 12 bytes, mytimer.o(i.Set_PWM_PRCT))
333
-<BR><BR>[Stack]<UL><LI>Max Depth = 12<LI>Call Chain = Set_PWM_PRCT
324
+<P><STRONG><a name="[41]"></a>MyTimer_Base_Init</STRONG> (Thumb, 98 bytes, Stack size 0 bytes, mytimer.o(i.MyTimer_Base_Init))
325
+<BR><BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
334 326
 </UL>
335
-<BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
327
+
328
+<P><STRONG><a name="[44]"></a>MyTimer_Base_Start</STRONG> (Thumb, 10 bytes, Stack size 0 bytes, mytimer.o(i.MyTimer_Base_Start))
329
+<BR><BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
336 330
 </UL>
337 331
 
338 332
 <P><STRONG><a name="[36]"></a>SystemInit</STRONG> (Thumb, 78 bytes, Stack size 8 bytes, system_stm32f10x.o(i.SystemInit))
339 333
 <BR><BR>[Stack]<UL><LI>Max Depth = 28<LI>Call Chain = SystemInit &rArr; SetSysClock &rArr; SetSysClockTo72
340 334
 </UL>
341
-<BR>[Calls]<UL><LI><a href="#[3d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SetSysClock
335
+<BR>[Calls]<UL><LI><a href="#[3f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SetSysClock
342 336
 </UL>
343 337
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(.text)
344 338
 </UL>
@@ -362,37 +356,49 @@ Global Symbols
362 356
 </UL>
363 357
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
364 358
 </UL>
365
-<P><STRONG><a name="[4a]"></a>__scatterload_copy</STRONG> (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_copy), UNUSED)
359
+<P><STRONG><a name="[4d]"></a>__scatterload_copy</STRONG> (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_copy), UNUSED)
366 360
 
367
-<P><STRONG><a name="[4b]"></a>__scatterload_null</STRONG> (Thumb, 2 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_null), UNUSED)
361
+<P><STRONG><a name="[4e]"></a>__scatterload_null</STRONG> (Thumb, 2 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_null), UNUSED)
368 362
 
369
-<P><STRONG><a name="[4c]"></a>__scatterload_zeroinit</STRONG> (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_zeroinit), UNUSED)
363
+<P><STRONG><a name="[4f]"></a>__scatterload_zeroinit</STRONG> (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_zeroinit), UNUSED)
364
+
365
+<P><STRONG><a name="[42]"></a>initADC</STRONG> (Thumb, 50 bytes, Stack size 0 bytes, myadc.o(i.initADC))
366
+<BR><BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
367
+</UL>
370 368
 
371 369
 <P><STRONG><a name="[35]"></a>main</STRONG> (Thumb, 56 bytes, Stack size 16 bytes, prinicpal.o(i.main))
372
-<BR><BR>[Stack]<UL><LI>Max Depth = 52<LI>Call Chain = main &rArr; MyTimer_PWM &rArr; MyGPIO_Init
370
+<BR><BR>[Stack]<UL><LI>Max Depth = 24<LI>Call Chain = main &rArr; MyTimer_ActiveIT
373 371
 </UL>
374
-<BR>[Calls]<UL><LI><a href="#[41]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Set_PWM_PRCT
375
-<LI><a href="#[3b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_PWM
376
-<LI><a href="#[40]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_Base_Start
377
-<LI><a href="#[3f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_Base_Init
372
+<BR>[Calls]<UL><LI><a href="#[42]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;initADC
373
+<LI><a href="#[44]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_Base_Start
374
+<LI><a href="#[41]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_Base_Init
375
+<LI><a href="#[43]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_ActiveIT
378 376
 </UL>
379 377
 <BR>[Address Reference Count : 1]<UL><LI> entry9a.o(.ARM.Collect$$$$0000000B)
380
-</UL><P>
378
+</UL>
379
+<P><STRONG><a name="[3e]"></a>read</STRONG> (Thumb, 36 bytes, Stack size 0 bytes, myadc.o(i.read))
380
+<BR><BR>[Called By]<UL><LI><a href="#[38]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Callback
381
+</UL>
382
+
383
+<P><STRONG><a name="[3d]"></a>startADC</STRONG> (Thumb, 14 bytes, Stack size 0 bytes, myadc.o(i.startADC))
384
+<BR><BR>[Called By]<UL><LI><a href="#[38]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Callback
385
+</UL>
386
+<P>
381 387
 <H3>
382 388
 Local Symbols
383 389
 </H3>
384
-<P><STRONG><a name="[3d]"></a>SetSysClock</STRONG> (Thumb, 8 bytes, Stack size 8 bytes, system_stm32f10x.o(i.SetSysClock))
390
+<P><STRONG><a name="[3f]"></a>SetSysClock</STRONG> (Thumb, 8 bytes, Stack size 8 bytes, system_stm32f10x.o(i.SetSysClock))
385 391
 <BR><BR>[Stack]<UL><LI>Max Depth = 20<LI>Call Chain = SetSysClock &rArr; SetSysClockTo72
386 392
 </UL>
387
-<BR>[Calls]<UL><LI><a href="#[3e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SetSysClockTo72
393
+<BR>[Calls]<UL><LI><a href="#[40]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SetSysClockTo72
388 394
 </UL>
389 395
 <BR>[Called By]<UL><LI><a href="#[36]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SystemInit
390 396
 </UL>
391 397
 
392
-<P><STRONG><a name="[3e]"></a>SetSysClockTo72</STRONG> (Thumb, 214 bytes, Stack size 12 bytes, system_stm32f10x.o(i.SetSysClockTo72))
398
+<P><STRONG><a name="[40]"></a>SetSysClockTo72</STRONG> (Thumb, 214 bytes, Stack size 12 bytes, system_stm32f10x.o(i.SetSysClockTo72))
393 399
 <BR><BR>[Stack]<UL><LI>Max Depth = 12<LI>Call Chain = SetSysClockTo72
394 400
 </UL>
395
-<BR>[Called By]<UL><LI><a href="#[3d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SetSysClock
401
+<BR>[Called By]<UL><LI><a href="#[3f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SetSysClock
396 402
 </UL>
397 403
 <P>
398 404
 <H3>

+ 2
- 2
Objects/Projet1_Simulation.lnp View File

@@ -2,9 +2,9 @@
2 2
 ".\objects\prinicpal.o"
3 3
 ".\objects\driver_gpio.o"
4 4
 ".\objects\mytimer.o"
5
+".\objects\myadc.o"
5 6
 ".\objects\startup_stm32f10x_md.o"
6 7
 ".\objects\system_stm32f10x.o"
7
---library_type=microlib --strict --scatter ".\Objects\Projet1_Simulation.sct"
8
---summary_stderr --info summarysizes --map --load_addr_map_info --xref --callgraph --symbols
8
+--library_type=microlib --ro-base 0x08000000 --entry 0x08000000 --rw-base 0x20000000 --entry Reset_Handler --first __Vectors --strict --summary_stderr --info summarysizes --map --load_addr_map_info --xref --callgraph --symbols
9 9
 --info sizes --info totals --info unused --info veneers
10 10
 --list ".\Listings\Projet1_Simulation.map" -o .\Objects\Projet1_Simulation.axf

BIN
Objects/driver_gpio.crf View File


+ 1
- 1
Objects/driver_gpio.d View File

@@ -1,7 +1,7 @@
1 1
 .\objects\driver_gpio.o: U:\Documents\4ir\S1\Microcontroleur\Drivers\FileInclude\Driver_GPIO.c
2 2
 .\objects\driver_gpio.o: U:\Documents\4ir\S1\Microcontroleur\Drivers\FileInclude\Driver_GPIO.h
3 3
 .\objects\driver_gpio.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h
4
-.\objects\driver_gpio.o: .\RTE\_R_el\RTE_Components.h
4
+.\objects\driver_gpio.o: .\RTE\_SImulation\RTE_Components.h
5 5
 .\objects\driver_gpio.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h
6 6
 .\objects\driver_gpio.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h
7 7
 .\objects\driver_gpio.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h

BIN
Objects/driver_gpio.o View File


BIN
Objects/myadc.crf View File


+ 12
- 0
Objects/myadc.d View File

@@ -0,0 +1,12 @@
1
+.\objects\myadc.o: FileInclude\MyADC.c
2
+.\objects\myadc.o: FileInclude\MyADC.h
3
+.\objects\myadc.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h
4
+.\objects\myadc.o: .\RTE\_SImulation\RTE_Components.h
5
+.\objects\myadc.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h
6
+.\objects\myadc.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h
7
+.\objects\myadc.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h
8
+.\objects\myadc.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h
9
+.\objects\myadc.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h
10
+.\objects\myadc.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h
11
+.\objects\myadc.o: FileInclude\MyTimer.h
12
+.\objects\myadc.o: FileInclude\Driver_GPIO.h

BIN
Objects/myadc.o View File


BIN
Objects/mytimer.crf View File


+ 1
- 1
Objects/mytimer.d View File

@@ -1,7 +1,7 @@
1 1
 .\objects\mytimer.o: FileInclude\MyTimer.c
2 2
 .\objects\mytimer.o: FileInclude\MyTimer.h
3 3
 .\objects\mytimer.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h
4
-.\objects\mytimer.o: .\RTE\_R_el\RTE_Components.h
4
+.\objects\mytimer.o: .\RTE\_SImulation\RTE_Components.h
5 5
 .\objects\mytimer.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h
6 6
 .\objects\mytimer.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h
7 7
 .\objects\mytimer.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h

BIN
Objects/mytimer.o View File


BIN
Objects/prinicpal.crf View File


+ 2
- 1
Objects/prinicpal.d View File

@@ -1,6 +1,6 @@
1 1
 .\objects\prinicpal.o: Sources\prinicpal.c
2 2
 .\objects\prinicpal.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h
3
-.\objects\prinicpal.o: .\RTE\_R_el\RTE_Components.h
3
+.\objects\prinicpal.o: .\RTE\_SImulation\RTE_Components.h
4 4
 .\objects\prinicpal.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h
5 5
 .\objects\prinicpal.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h
6 6
 .\objects\prinicpal.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h
@@ -9,3 +9,4 @@
9 9
 .\objects\prinicpal.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h
10 10
 .\objects\prinicpal.o: .\FileInclude\Driver_GPIO.h
11 11
 .\objects\prinicpal.o: .\FileInclude\MyTimer.h
12
+.\objects\prinicpal.o: .\FileInclude\MyADC.h

BIN
Objects/prinicpal.o View File


BIN
Objects/startup_stm32f10x_md.o View File


BIN
Objects/system_stm32f10x.crf View File


+ 1
- 1
Objects/system_stm32f10x.d View File

@@ -1,6 +1,6 @@
1 1
 .\objects\system_stm32f10x.o: RTE\Device\STM32F103RB\system_stm32f10x.c
2 2
 .\objects\system_stm32f10x.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h
3
-.\objects\system_stm32f10x.o: .\RTE\_R_el\RTE_Components.h
3
+.\objects\system_stm32f10x.o: .\RTE\_SImulation\RTE_Components.h
4 4
 .\objects\system_stm32f10x.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h
5 5
 .\objects\system_stm32f10x.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h
6 6
 .\objects\system_stm32f10x.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h

BIN
Objects/system_stm32f10x.o View File


+ 60
- 60
Projet1.uvguix.alejeune
File diff suppressed because it is too large
View File


+ 27
- 3
Projet1.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>
@@ -125,7 +125,7 @@
125 125
         <SetRegEntry>
126 126
           <Number>0</Number>
127 127
           <Key>DLGDARM</Key>
128
-          <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=60,88,280,548,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=676,514,1097,941,0)(121=-1,-1,-1,-1,0)(122=704,251,1125,678,0)(123=-1,-1,-1,-1,0)(140=848,409,1536,749,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=885,128,1479,879,0)(131=1134,338,1728,1089,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)(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=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name>
128
+          <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=61,96,281,556,0)(111=60,88,280,548,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=676,514,1097,941,0)(121=-1,-1,-1,-1,0)(122=704,251,1125,678,0)(123=-1,-1,-1,-1,0)(140=848,409,1536,749,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=885,128,1479,879,0)(131=1134,338,1728,1089,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)(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=1246,187,1849,938,0)(151=-1,-1,-1,-1,0)</Name>
129 129
         </SetRegEntry>
130 130
         <SetRegEntry>
131 131
           <Number>0</Number>
@@ -257,7 +257,7 @@
257 257
       <OPTFL>
258 258
         <tvExp>1</tvExp>
259 259
         <tvExpOptDlg>0</tvExpOptDlg>
260
-        <IsCurrentTarget>1</IsCurrentTarget>
260
+        <IsCurrentTarget>0</IsCurrentTarget>
261 261
       </OPTFL>
262 262
       <CpuCode>18</CpuCode>
263 263
       <DebugOpt>
@@ -450,6 +450,30 @@
450 450
       <RteFlg>0</RteFlg>
451 451
       <bShared>0</bShared>
452 452
     </File>
453
+    <File>
454
+      <GroupNumber>2</GroupNumber>
455
+      <FileNumber>5</FileNumber>
456
+      <FileType>1</FileType>
457
+      <tvExp>0</tvExp>
458
+      <tvExpOptDlg>0</tvExpOptDlg>
459
+      <bDave2>0</bDave2>
460
+      <PathWithFileName>.\FileInclude\MyADC.c</PathWithFileName>
461
+      <FilenameWithoutPath>MyADC.c</FilenameWithoutPath>
462
+      <RteFlg>0</RteFlg>
463
+      <bShared>0</bShared>
464
+    </File>
465
+    <File>
466
+      <GroupNumber>2</GroupNumber>
467
+      <FileNumber>6</FileNumber>
468
+      <FileType>5</FileType>
469
+      <tvExp>0</tvExp>
470
+      <tvExpOptDlg>0</tvExpOptDlg>
471
+      <bDave2>0</bDave2>
472
+      <PathWithFileName>.\FileInclude\MyADC.h</PathWithFileName>
473
+      <FilenameWithoutPath>MyADC.h</FilenameWithoutPath>
474
+      <RteFlg>0</RteFlg>
475
+      <bShared>0</bShared>
476
+    </File>
453 477
   </Group>
454 478
 
455 479
   <Group>

+ 20
- 0
Projet1.uvprojx View File

@@ -408,6 +408,16 @@
408 408
               <FileType>5</FileType>
409 409
               <FilePath>.\FileInclude\MyTimer.h</FilePath>
410 410
             </File>
411
+            <File>
412
+              <FileName>MyADC.c</FileName>
413
+              <FileType>1</FileType>
414
+              <FilePath>.\FileInclude\MyADC.c</FilePath>
415
+            </File>
416
+            <File>
417
+              <FileName>MyADC.h</FileName>
418
+              <FileType>5</FileType>
419
+              <FilePath>.\FileInclude\MyADC.h</FilePath>
420
+            </File>
411 421
           </Files>
412 422
         </Group>
413 423
         <Group>
@@ -820,6 +830,16 @@
820 830
               <FileType>5</FileType>
821 831
               <FilePath>.\FileInclude\MyTimer.h</FilePath>
822 832
             </File>
833
+            <File>
834
+              <FileName>MyADC.c</FileName>
835
+              <FileType>1</FileType>
836
+              <FilePath>.\FileInclude\MyADC.c</FilePath>
837
+            </File>
838
+            <File>
839
+              <FileName>MyADC.h</FileName>
840
+              <FileType>5</FileType>
841
+              <FilePath>.\FileInclude\MyADC.h</FilePath>
842
+            </File>
823 843
           </Files>
824 844
         </Group>
825 845
         <Group>

+ 30
- 3
Sources/prinicpal.c View File

@@ -1,10 +1,20 @@
1 1
 #include "stm32f10x.h"
2 2
 #include <Driver_GPIO.h>
3 3
 #include <MyTimer.h>
4
+#include <MyADC.h>
5
+
6
+int a ;
7
+
8
+ void Callback(void){
9
+	 startADC();	
10
+		a=read();
11
+	}
12
+
4 13
 
5 14
 int main (void)
6 15
 {
7
-	char channel = 1;
16
+	//char channel = 1;
17
+
8 18
 	// Configuration du timer
9 19
 	MyTimer_Struct_TypeDef TIM;
10 20
 	MyTimer_Struct_TypeDef * Data = &TIM;
@@ -13,11 +23,28 @@ int main (void)
13 23
 	Data->PSC = 548;
14 24
 	MyTimer_Base_Init(Data);
15 25
 	
16
-	MyTimer_PWM(Data->Timer, channel);
26
+	//MyTimer_PWM(Data->Timer, channel);
17 27
 
28
+	
29
+	
30
+//	Set_PWM_PRCT(Data->Timer, channel, 20); 
31
+	
32
+	
33
+	
34
+	initADC(1);
35
+	
36
+	
37
+	
38
+	
39
+	MyTimer_ActiveIT ( TIM2 , 1, &Callback);	
40
+	
18 41
 	MyTimer_Base_Start(TIM2);
19 42
 	
20
-	Set_PWM_PRCT(Data->Timer, channel, 20);
43
+
44
+	
45
+	
46
+	
47
+
21 48
 	do {
22 49
 		}
23 50
 	while (1);

Loading…
Cancel
Save