ramara/grpC_RAMARA_CROS
1
0
Fork 0
forked from acco/chti23
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: ramara:master
Branches Tags
ramara:master
acco:master
ramara:jeuMarche
ramara:Step_DFT_Reel
ramara:vprep
..
compare: ramara:jeuMarche
Branches Tags
ramara:master
acco:master
ramara:jeuMarche
ramara:Step_DFT_Reel
ramara:vprep

No commits in common. "master" and "jeuMarche" have entirely different histories.
master ... jeuMarche

1 changed files with 2 additions and 1 deletions
Show stats Expand all files Collapse all files

3
PjtKEIL_Step_Integration/Src/principal.c
View file

@ -70,7 +70,6 @@ void callback() {
} }
} else {cnt[3]=0;} } else {cnt[3]=0;}
// Pour ne changer de cible que toutes les 2 sec (2000/5 = 400)
if (clk5Hz %400 ==0) { if (clk5Hz %400 ==0) {
i = (i+1)%15; i = (i+1)%15;
if (i == 0){ if (i == 0){
@ -116,6 +115,8 @@ Init_ADC1_DMA1( 0, dma_buf );
Init_Affichage(); Init_Affichage();
//TODO : englober dans fct qui fait changer la cible active régulièrement (mais wait nécessaire)
Choix_Capteur(1); Choix_Capteur(1);
Prepare_Set_LED(LED_Cible_1); Prepare_Set_LED(LED_Cible_1);