diff --git a/web.cpp b/web.cpp index 655354637d7601afc63988da07a36c1159c091a7..6144a4d468b9c0eb29b156b691f5fb68c5291c3c 100644 --- a/web.cpp +++ b/web.cpp @@ -201,6 +201,8 @@ void switch_push_pull_choice_callback (Control* sender, int value, void* param) switch (value) { case S_ACTIVE: + syringe_filled.set_push(true); + ESPUI.print(label_push_pull_choice, "Délivrer"); style (volume_exchange_mL, 1); @@ -210,6 +212,9 @@ void switch_push_pull_choice_callback (Control* sender, int value, void* param) break; case S_INACTIVE: + + syringe_filled.set_push(false); + ESPUI.print(label_push_pull_choice, "Recupérer"); style (volume_exchange_mL, 2); @@ -217,7 +222,7 @@ void switch_push_pull_choice_callback (Control* sender, int value, void* param) style (switch_push_pull_choice, 2); break; } - + syringe_filled.write_Json(); Serial.print(" "); Serial.println(sender->id); } @@ -230,6 +235,7 @@ void remaining_volume_mL_callback (Control* sender, int value, void* param) ***/ { + ESPUI.updateSlider(remaining_volume_mL, syringe_filled.get_remaining_volume_mL()); } @@ -569,9 +575,12 @@ void web_loop () //bool switchi = syringe.isRunning(); //bool a = syringe.isRunning(); if(millis() > last_time + 500) { - //ESPUI.updateSlider(slider, syringe_filled.current_position()); last_time = millis(); - //on_off(); + + //UPDATES + + syringe_filled.update_remaining_volume(); + if (syringe_filled.is_running()) syringe_pump_on(); else diff --git a/web.h b/web.h index 77710b16e9e2b5aae4032916091c7362ab364a02..1eabe0d808027d34d6ffb8044917e0d000c55e80 100644 --- a/web.h +++ b/web.h @@ -29,6 +29,7 @@ uint16_t volume_exchange_mL, label_push_pull_choice, switch_push_pull_choice; uint16_t label_remaining_volume_mL; +uint16_t remaining_volume_mL; //Configurations uint16_t syringe_selection, syringe_ref, syringe_brand, syringe_volume_mL, syringe_diameter_mm, choose_syringe;