diff --git a/Etape_2.uvoptx b/Etape_2.uvoptx
index 0841409..f2cec2a 100644
--- a/Etape_2.uvoptx
+++ b/Etape_2.uvoptx
@@ -75,7 +75,7 @@
1
0
- 1
+ 0
18
@@ -125,7 +125,7 @@
0
DLGDARM
- (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=15,39,661,712,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=1040,425,1461,852,1)(121=1499,392,1920,819,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=18,101,612,852,0)(131=255,99,849,850,0)(132=49,93,643,844,0)(133=-1105,32,-511,783,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)
+ (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=15,39,661,712,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=1397,118,1818,545,0)(121=1499,392,1920,819,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=18,101,612,852,0)(131=255,99,849,850,0)(132=49,93,643,844,0)(133=0,32,594,783,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)
0
@@ -142,25 +142,25 @@
0
0
- 100
+ 204
1
- 134222484
+ 134222900
0
0
0
0
0
1
- .\Principale.asm
+ .\FonctionEtape2.asm
- \\Simu_Etape0\Principale.asm\100
+ \\Simu_Etape0\FonctionEtape2.asm\204
1
0
- 70
+ 51
1
- 134222470
+ 134222440
0
0
0
@@ -169,199 +169,7 @@
1
.\Principale.asm
- \\Simu_Etape0\Principale.asm\70
-
-
- 2
- 0
- 73
- 1
- 134222480
- 0
- 0
- 0
- 0
- 0
- 1
- .\Principale.asm
-
- \\Simu_Etape0\Principale.asm\73
-
-
- 3
- 0
- 47
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- .\FonctionEtape.asm
-
-
-
-
- 4
- 0
- 51
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- .\FonctionEtape.asm
-
-
-
-
- 5
- 0
- 47
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- .\FonctionEtape2.asm
-
-
-
-
- 6
- 0
- 51
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- .\FonctionEtape2.asm
-
-
-
-
- 7
- 0
- 134
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- .\FonctionEtape2.asm
-
-
-
-
- 8
- 0
- 173
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- .\FonctionEtape2.asm
-
-
-
-
- 9
- 0
- 174
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- .\FonctionEtape2.asm
-
-
-
-
- 10
- 0
- 45
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- .\Principale.asm
-
-
-
-
- 11
- 0
- 48
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- .\Principale.asm
-
-
-
-
- 12
- 0
- 95
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- .\Principale.asm
-
-
-
-
- 13
- 0
- 47
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- REG_UTILES.inc
-
-
+ \\Simu_Etape0\Principale.asm\51
@@ -390,7 +198,7 @@
0
1
- 1
+ 0
0
0
0
@@ -430,12 +238,12 @@
0
(portA & 0x20 & 0x20) >> 0
- FF000000000000000000000000000000E0FFEF4001000000000000000000000000000000706F7274412026203078323000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F1400000000000000000000000000000000000000E4120008
+ FF000000000000000000000000000000E0FFEF4001000000000000000000000000000000706F7274412026203078323000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F0600000000000000000000000000000000000000E4120008
1
(portA & 0x80 & 0x80) >> 0
- 00800000000000000000000000000000E0FFEF4001000000000000000000000000000000706F7274412026203078383000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F140000000000000000000000000000000000000062120008
+ 00800000000000000000000000000000E0FFEF4001000000000000000000000000000000706F7274412026203078383000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F060000000000000000000000000000000000000062120008
@@ -502,7 +310,7 @@
1
0
- 0
+ 1
18
@@ -570,12 +378,45 @@
-UAny -O206 -S8 -C0 -P00 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_CL.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F107VC$Flash\STM32F10x_CL.FLM)
-
+
+
+ 0
+ 0
+ 67
+ 1
+ 134222690
+ 0
+ 0
+ 0
+ 0
+ 0
+ 1
+ .\Principale.asm
+
+ \\Reel_Etape0\Principale.asm\67
+
+
+ 1
+ 0
+ 60
+ 1
+ 134222668
+ 0
+ 0
+ 0
+ 0
+ 0
+ 1
+ .\Principale.asm
+
+ \\Reel_Etape0\Principale.asm\60
+
+
1
0
- 0x40010BF0
+ 0x40010800
0
@@ -585,7 +426,7 @@
0
0
- 0
+ 1
0
0
0
@@ -621,6 +462,12 @@
+
+
+ System Viewer\GPIOA
+ 35905
+
+
1
0
diff --git a/Etape_2.uvprojx b/Etape_2.uvprojx
index ae8db7a..819b966 100644
--- a/Etape_2.uvprojx
+++ b/Etape_2.uvprojx
@@ -10,13 +10,13 @@
Simulé
0x4
ARM-ADS
- 6190000::V6.19::ARMCLANG
+ 6160000::V6.16::ARMCLANG
1
STM32F103RB
STMicroelectronics
- Keil.STM32F1xx_DFP.2.4.0
+ Keil.STM32F1xx_DFP.2.3.0
http://www.keil.com/pack/
IRAM(0x20000000,0x5000) IROM(0x08000000,0x20000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE
@@ -186,7 +186,6 @@
0
0
0
- 0
0
0
8
@@ -429,7 +428,7 @@
STM32F107VC
STMicroelectronics
- Keil.STM32F1xx_DFP.2.4.0
+ Keil.STM32F1xx_DFP.2.3.0
http://www.keil.com/pack/
IRAM(0x20000000,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE
@@ -599,7 +598,6 @@
0
0
0
- 0
0
0
8
@@ -856,7 +854,7 @@
RTE\Device\STM32F103RB\RTE_Device.h
-
+
@@ -864,7 +862,7 @@
RTE\Device\STM32F103RB\startup_stm32f10x_md.s
-
+
@@ -878,7 +876,7 @@
RTE\Device\STM32F103RB\system_stm32f10x.c
-
+
@@ -886,7 +884,7 @@
RTE\Device\STM32F107VC\RTE_Device.h
-
+
@@ -894,7 +892,7 @@
RTE\Device\STM32F107VC\startup_stm32f10x_cl.s
-
+
@@ -908,7 +906,7 @@
RTE\Device\STM32F107VC\system_stm32f10x.c
-
+
diff --git a/FonctionEtape2.asm b/FonctionEtape2.asm
index f1f328f..8d1a714 100644
--- a/FonctionEtape2.asm
+++ b/FonctionEtape2.asm
@@ -148,14 +148,14 @@ PoidFortOKJUMP ;Fin Si
BNE WHILE_NBBIT
ADD R2, R2, #1 ;On incrémente NBLed
- CMP R2, #47 ;SI NBLED==47 alors on arrête la boucle
+ CMP R2, #48 ;SI NBLED==47 alors on arrête la boucle
BNE WHILE_NBLED
MOV R0, #SCLK ;Argument SCLK
BL Reset_X; ;Reset_X(SCLK)
LDR R0,=DataSend;Adresse de DataSend
MOV R1,#0 ; DataSend
- STRB R1,[R0,#0] ;DataSend=0
+ STRB R1,[R0] ;DataSend=0
B . ;while(1)
PoidFortOKIF
@@ -198,11 +198,11 @@ REG_PoidFortOKJUMP ;Fin Si
MOV R0, #SCLK ;Argument SCLK
BL Set_X; ;Set_X(SCLK)
ADD R4, R4, #1 ;On incrémente NBBit
- CMP R4, #11 ;SI NBBIT==11 alors on arrête la boucle
+ CMP R4, #12 ;SI NBBIT==11 alors on arrête la boucle
BNE REG_WHILE_NBBIT
ADD R2, R2, #1 ;On incrémente NBLed
- CMP R2, #47 ;SI NBLED==47 alors on arrête la boucle
+ CMP R2, #48 ;SI NBLED==47 alors on arrête la boucle
BNE REG_WHILE_NBLED
MOV R0, #SCLK ;Argument SCLK
diff --git a/LUMIERES.inc b/LUMIERES.inc
index bd542ae..4700ade 100644
--- a/LUMIERES.inc
+++ b/LUMIERES.inc
@@ -6,39 +6,56 @@
AREA MesDonnees, data, readwrite
;**************************************************************************
-Barette1 DCB 0xad,0xff,0
- DCB 0,0xff,0
- DCB 0,0,0xff
- DCB 0xff,0,0
- DCB 0xff,0xff,0
- DCB 0xff,0xff,0xff
- DCB 0xff,0,0
- DCB 0,0xff,0
- DCB 0,0,0xff
- DCB 0xff,0,0
- DCB 0xff,0xff,0
- DCB 0xff,0xff,0xff
- DCB 0xff,0,0
- DCB 0xff,0xff,0
- DCB 0xff,0xff,0xff
- DCB 0x0f,0xff,0x00
+Barette1 DCB 0xff,0x00,0x0
+ DCB 0xff,0x00,0x0
+ DCB 0xff,0x00,0x0
+ DCB 0xff,0x00,0x0
+ DCB 0xff,0x00,0x0
+ DCB 0xff,0x00,0x0
+ DCB 0xff,0x00,0x0
+ DCB 0xff,0x00,0x0
+ DCB 0xff,0x00,0x0
+ DCB 0xff,0x00,0x0
+ DCB 0xff,0x00,0x0
+ DCB 0xff,0x00,0x00
+ DCB 0xff,0x00,0x00
+ DCB 0xff,0x00,0x00
+ DCB 0xff,0x00,0x00
+ DCB 0x00,0x00,0x00
-Barette2 DCB 0xe6,0x3f,0
- DCB 0,0x56,0x64
- DCB 0x52,0,0xfe
- DCB 0x1f,0x1e,0
- DCB 0xff,0x5a,0
- DCB 0x6f,0xf7,0x8d
- DCB 0xdf,0x3e,0
- DCB 0,0xfa,0x6f
- DCB 0xe6,0x8c,0x2d
- DCB 0xf4,0x4f,0
- DCB 0,0x56,0x64
- DCB 0x52,0,0xfe
- DCB 0x1f,0x1e,0
- DCB 0xff,0x5a,0
- DCB 0x6f,0xf7,0x8d
- DCB 0xff,0,0
+Barette2 DCB 0x00,0x00,0x00
+ DCB 0xAA,0x00,0x00
+ DCB 0x00,0x00,0x00
+ DCB 0xAA,0x00,0x00
+ DCB 0x00,0x00,0x00
+ DCB 0xAA,0x00,0x00
+ DCB 0x00,0x00,0x00
+ DCB 0xAA,0x00,0x00
+ DCB 0x00,0x00,0x00
+ DCB 0xAA,0x00,0x00
+ DCB 0x00,0x00,0x00
+ DCB 0xAA,0x00,0x00
+ DCB 0x00,0x00,0x00
+ DCB 0xAA,0x00,0x00
+ DCB 0x00,0x00,0x00
+ DCB 0xAA,0x00,0x00
+
+Barette3 DCB 0xAA,0x00,0x00
+ DCB 0xAA,0x00,0x00
+ DCB 0xAA,0x00,0x00
+ DCB 0xAA,0x00,0x00
+ DCB 0x80,0x80,0x80
+ DCB 0x80,0x80,0x80
+ DCB 0x80,0x80,0x80
+ DCB 0x80,0x80,0x80
+ DCB 0x80,0x80,0x80
+ DCB 0x80,0x80,0x80
+ DCB 0x80,0x80,0x80
+ DCB 0x80,0x80,0x80
+ DCB 0x00,0x00,0xAA
+ DCB 0x00,0x00,0xAA
+ DCB 0x00,0x00,0xAA
+ DCB 0x00,0x00,0xAA
END
\ No newline at end of file
diff --git a/Principale.asm b/Principale.asm
index a73387e..a03cce2 100644
--- a/Principale.asm
+++ b/Principale.asm
@@ -39,7 +39,7 @@
AREA mesdonnees, data, readwrite
;*******************************************************************************
-M EQU 10
+M EQU 20
;***************CODE************************************************************
AREA moncode, code, readonly
@@ -48,30 +48,30 @@ M EQU 10
main PROC
;*******************************************************************************
BL Run_Timer3 ;Allumage du Timer 3
- LDR R4, [pc,#-2124] ;***********************************************
- MOV R5, #1 ;RetroEngineering : 0x40021000 << 18 -> Argument ?
- STR R5,[R4,#0x18] ;***********************************************
+ MOV R0,#1
BL Init_Cible;
;*******************************************************************************
; ETAPE 2
;*******************************************************************************
MOV R7,#0
Etape2 ;for(int=0;i on sort de la boucle
+ BNE TheEnd ;if capteur = true -> on sort de la boucle
ADD R7,R7,#1 ;i++
- CMP R7, #10 ;i==10 ?
- BNE Etape2 ;if i!=10 -> on continue la boucle (Au final : R7 == 10 || R6)
+ CMP R7, #M ;i==M ?
+ BNE Etape2 ;if i!=10 -> on continue la boucle (Au final : R7 == M || R6)
;*******************************************************************************
; ETAPE 1
;*******************************************************************************