mbed-os github
Dependencies: ADS1015 Faulhaber HTU21D_mod MS5837_potless Sensor_Head_RevB_3 USBDevice_dfu Utilsdfu beep
Fork of ARNSRS_testDFU by
Diff: main.cpp
- Revision:
- 41:51ba69648f9d
- Parent:
- 40:32d89e04ead1
- Child:
- 42:3591ec9903b4
diff -r 32d89e04ead1 -r 51ba69648f9d main.cpp --- a/main.cpp Thu Mar 29 16:03:01 2018 +0000 +++ b/main.cpp Fri Mar 30 10:29:10 2018 +0000 @@ -24,7 +24,7 @@ #define HOME_SERVO_FUITE 90 //Ecrit dans le moniteur série de la tablette à 115200 bds si sur 1, penser à mettre NEED_CONSOLE_OUTPUT à 0 -#define NEED_ANDROID_OUTPUT 1 +#define NEED_ANDROID_OUTPUT 0 //Mode PID, STD à commenter / décommenter #define STD_MODE @@ -162,7 +162,7 @@ void Affichage() { - //NVIC_DisableIRQ(USART2_IRQn); + NVIC_DisableIRQ(USART2_IRQn); serialMonit.printf("\r\n"); serialMonit.printf(" CO2 = %d ppm\r\n" , co2); serialMonit.printf(" PPO2 = %d mb\r\n", ppO2); @@ -186,7 +186,7 @@ serialMonit.printf(" V_USB = %f", Vusb); serialMonit.printf("\r\n\r\n"); fflush(stdout); - //NVIC_EnableIRQ(USART2_IRQn); + NVIC_EnableIRQ(USART2_IRQn); } void pressed() @@ -401,17 +401,17 @@ while(serialMonit.readable()) { if ((indexParam == sizeParam) || newParamFlag == true) { //éviter la saturation du buffer - //NVIC_DisableIRQ(USART2_IRQn); + NVIC_DisableIRQ(USART2_IRQn); char char_flush = serialMonit.getc(); - //NVIC_EnableIRQ(USART2_IRQn); + NVIC_EnableIRQ(USART2_IRQn); } else { - //NVIC_DisableIRQ(USART2_IRQn); + NVIC_DisableIRQ(USART2_IRQn); param [indexParam ++] = serialMonit.getc();//chargement du buffer dans le message if ((indexParam == sizeParam) || (param[indexParam - 1] == '\n')) {//le message est complet ou nouvelle ligne ou autre si on veut... param[indexParam] = 0; newParamFlag = true; } - //NVIC_EnableIRQ(USART2_IRQn); + NVIC_EnableIRQ(USART2_IRQn); } } } @@ -466,9 +466,11 @@ } else if (0 == strcmp(com, "calib_O2")) { FLAG_O2 = false; wait_ms(100); - sensors.Calibrate_O2(true, atoi(numb)); + sensors.Calibrate_O2(atoi(numb)); wait_ms(100); FLAG_O2 = true; + } else if (0 == strcmp(com, "calib_CO2_A")) { + sensors.Calibrate_CO2("G\r\n"); } else if (0 == strcmp(com, "flash_i")) { FLAG_REC = false; UTILS::Flash_Infos(); @@ -544,10 +546,10 @@ } else if (0 == strcmp(com, "time")) {//Depuis terminal MAC taper : " date +%s " set_time(atoi(numb)); } else if (0 == strcmp(com, "c_pou")) { - Consigne_poumon = atof(numb); + Consigne_poumon += atof(numb); DEBUG(" Servo Poumon = %f\r\n", Consigne_poumon); } else if (0 == strcmp(com, "c_fui")) { - Consigne_fuite = atof(numb); + Consigne_fuite += atof(numb); DEBUG(" Servo Fuite = %f\r\n", Consigne_fuite); } else if (0 == strcmp(com, "reset")) { UTILS::UnMount_Flash(); @@ -857,9 +859,9 @@ //Pour windev la même chose que pour l'écran if (FLAG_WINDEV) { - //NVIC_DisableIRQ(USART2_IRQn); + NVIC_DisableIRQ(USART2_IRQn); serialMonit.printf(to_slave); - //NVIC_EnableIRQ(USART2_IRQn); + NVIC_EnableIRQ(USART2_IRQn); } //Calcul des OTU