Merge branch 'master' of mon.framagit.org:cohabit-fablab/ifv_esp32
This commit is contained in:
commit
fb1c9b3782
10
src/main.cpp
10
src/main.cpp
|
@ -191,12 +191,12 @@ void compte_tour() {
|
||||||
int diff_count = count - old_count;
|
int diff_count = count - old_count;
|
||||||
vRotReel = (60000*diff_count/(pptr*offset)); //vitesse en tours par min (4 pulsations /tour, 2 montantes, 2 descendantes)
|
vRotReel = (60000*diff_count/(pptr*offset)); //vitesse en tours par min (4 pulsations /tour, 2 montantes, 2 descendantes)
|
||||||
old_count = count;
|
old_count = count;
|
||||||
Serial.println("count =");
|
//Serial.println("count =");
|
||||||
Serial.println(count);
|
//Serial.println(count);
|
||||||
//Serial.println("chrono_compte_tour=");
|
//Serial.println("chrono_compte_tour=");
|
||||||
//Serial.println(chrono_compte_tour);
|
//Serial.println(chrono_compte_tour);
|
||||||
Serial.println("vRrotReel=");
|
//Serial.println("vRrotReel=");
|
||||||
Serial.println(vRotReel);
|
//Serial.println(vRotReel);
|
||||||
gaz_moteur();// ajustement des gaz en fonction de la vitesse mesurée
|
gaz_moteur();// ajustement des gaz en fonction de la vitesse mesurée
|
||||||
sema_compte_tour = false;
|
sema_compte_tour = false;
|
||||||
}
|
}
|
||||||
|
@ -323,7 +323,7 @@ void sd_init() {
|
||||||
}
|
}
|
||||||
|
|
||||||
now = rtc.now();
|
now = rtc.now();
|
||||||
char date_format[12] = "MM-DD-hh-mm";
|
char date_format[] = "DDhhmm";
|
||||||
char *date = now.toString(date_format);
|
char *date = now.toString(date_format);
|
||||||
strcat(fichier,date);
|
strcat(fichier,date);
|
||||||
char entete[64] = "# YY-MM-DD:hh:mm:ss Vrot en tr/min \n";
|
char entete[64] = "# YY-MM-DD:hh:mm:ss Vrot en tr/min \n";
|
||||||
|
|
Loading…
Reference in a new issue