diff --git a/motor.cpp b/motor.cpp index 72f25576adcf73e4083137947ff9063dcb7dd2cc..129c90613a774f86e08deda5eb46e35fea3b9898 100644 --- a/motor.cpp +++ b/motor.cpp @@ -113,7 +113,7 @@ void Motor :: move_to_step (int step) void Motor :: move_to_mm (float mm) /*** --Argument : distace in mm +-Argument : distance in mm -Return : / -Action : Move to the distance required. ***/ diff --git a/pousseseringue-arduino.cpp b/pousseseringue-arduino.cpp index 6190aa5f981beb1461ffa92bb589d41439b1e270..a2c41de24db00e88fdef4abba9a8964de0ca391d 100644 --- a/pousseseringue-arduino.cpp +++ b/pousseseringue-arduino.cpp @@ -89,6 +89,7 @@ int rpming = 0; // -1, 0 or +1 SyringeFilled syringefilled(stepper); Cli console(syringe_filled); + const char* oledMode () { switch (mode) @@ -362,7 +363,9 @@ void loop() syringe_filled.manage_emergency(bEmergency.pressed(), !!stepper.distanceToGo()); Serial.printf("%sEmergency=%u (remaining steps = %lu)\n", msgHeader, bEmergency.pressed(), stepper.distanceToGo()); } + + //Code pour les boutons de l'écran #if CORE_MOCK bool changeA = false; bool changeB = false; diff --git a/syringefilled.cpp b/syringefilled.cpp index 79040d82073a7b2aad2b0e0823a859c03aa3825f..0e6a3da0739bb157d595f4f88cfeb4b2ad26731b 100644 --- a/syringefilled.cpp +++ b/syringefilled.cpp @@ -322,6 +322,9 @@ void SyringeFilled :: show_configuration() step_to_mm(step)); } + +//JSON + //Example : File f = ({ InterruptLock lock; filesystem->open(filename, "w"); }); and the f becomes the argument input_stream //useful in web.cpp via a button to save data void SyringeFilled :: write_Json () diff --git a/web.cpp b/web.cpp index 507568e7df1b24894a650249a27a0617e2286336..655354637d7601afc63988da07a36c1159c091a7 100644 --- a/web.cpp +++ b/web.cpp @@ -58,7 +58,7 @@ void web_setup () choose_syringe = ESPUI.addControl(ControlType::Button, "Choisir cette seringue", "Utiliser cette seringue", ControlColor::None, syringe_selection, choose_syringe_callback, (void*)19); ESPUI.addControl(ControlType::Separator, "", "", ControlColor::None, configurations); - + //Volume_exchange_wanted volume_exchange_mL = ESPUI.addControl(ControlType::Number,"Choix du volume à echanger en mL", "", ControlColor::None, configurations, volume_exchange_mL_callback, (void*)19); @@ -475,9 +475,9 @@ void set_init_style() style (initialisation, 2); - style (volume_exchange_mL, 3); - style (label_push_pull_choice, 3); - style (switch_push_pull_choice, 3); + style (volume_exchange_mL, 1); + style (label_push_pull_choice, 1); + style (switch_push_pull_choice, 1); style (label_remaining_volume_mL, 3);