From 212f65e9dbde0b4e8cbc64809c1e215266561ffc Mon Sep 17 00:00:00 2001
From: Malaurie Bernard <mbernard@kinouby>
Date: Mon, 10 Jul 2023 14:49:47 +0200
Subject: [PATCH] Cleaning the web files and changing names so it is in english
 only

---
 motor.cpp |   2 +-
 web.cpp   | 144 +++++++++++++++++++++++++-----------------------------
 web.h     |  18 +++----
 3 files changed, 74 insertions(+), 90 deletions(-)

diff --git a/motor.cpp b/motor.cpp
index 8dd7585..72f2557 100644
--- a/motor.cpp
+++ b/motor.cpp
@@ -202,7 +202,7 @@ void Motor :: reset_position()
 -Return   : /
 -Action   : Set the curent position as the zero.
 ***/
-{Motor
+{
 #if !CORE_MOCK
     stop();
     cli();
diff --git a/web.cpp b/web.cpp
index f29ecb1..28a1ad2 100644
--- a/web.cpp
+++ b/web.cpp
@@ -31,23 +31,27 @@ void web_setup ()
 
     //Création des différents onglets
     uint16_t tab1 = ESPUI.addControl(ControlType::Tab, "Configurations", "Configurations");
-    uint16_t tab2 = ESPUI.addControl(ControlType::Tab, "Mise en marche", "Mise en marche");
     uint16_t tab3 = ESPUI.addControl(ControlType::Tab, "Nouvelle Seringue", "Nouvelle seringue");
     uint16_t tab4 = ESPUI.addControl(ControlType::Tab, "Paramètres avancés", "Paramètres avancés");
     uint16_t tab5 = ESPUI.addControl(Tab, "", "Styled controls");
 
     //Au dessus des tables
     
-    status_label_id1 = ESPUI.label("Etat du pousse-seringue 1 :", ControlColor::None, "A l'arrêt");
-
-
+    status_syringe_pump = ESPUI.label("Etat du pousse-seringue 1 :", ControlColor::None, "A l'arrêt");
     //Mettre en route le pousse-seringue
-    activation = ESPUI.addControl(ControlType::Switcher, "Mise en marche", "Arrêt", ControlColor::None, status_label_id1, switch_status_callback1, (void*)19);
-
+    activation = ESPUI.addControl(ControlType::Switcher, "Mise en marche", "Arrêt", ControlColor::None, status_syringe_pump, on_off_callback, (void*)19);
+    //Style
+    ESPUI.setPanelStyle(status_syringe_pump, couleurs[2]);
+    ESPUI.setElementStyle(status_syringe_pump, couleurs[3]);
 
+    //Seringue en place
+    status_syringe_filled = ESPUI.label("Etat du pousse-seringue 1 :", ControlColor::None, "A l'arrêt");
+    //Mettre en route le pousse-seringue
+    activation = ESPUI.addControl(ControlType::Switcher, "Mise en marche", "Arrêt", ControlColor::None, status_syringe_filled, on_off_callback, (void*)19);
     //Style
-    ESPUI.setPanelStyle(status_label_id1, couleurs[2]);
-    ESPUI.setElementStyle(status_label_id1, couleurs[3]);
+    ESPUI.setPanelStyle(status_syringe_filled, couleurs[2]);
+    ESPUI.setElementStyle(status_syringe_filled, couleurs[3]);
+
 
 
     //Deplacement demandé du pousse-seringue
@@ -110,11 +114,11 @@ void web_setup ()
 
 
 
-    nv_bouton_ctrl = ESPUI.addControl(ControlType::Button, "Nouveau Bouton", "Let magic happen", ControlColor::None, tab5, nv_bouton_ctrl_callback);
-    ESPUI.setPanelStyle(nv_bouton_ctrl, couleurs[0]);
-    ESPUI.setElementStyle(nv_bouton_ctrl, couleurs[1]);
+    nv_button_ctrl = ESPUI.addControl(ControlType::Button, "Nouveau button", "Let magic happen", ControlColor::None, tab5, nv_button_ctrl_callback);
+    ESPUI.setPanelStyle(nv_button_ctrl, couleurs[0]);
+    ESPUI.setElementStyle(nv_button_ctrl, couleurs[1]);
 
-    nv_bouton = ESPUI.addControl(ControlType::Button, "Abra", "Cadabra", ControlColor::None, tab5, nv_bouton_callback);
+    nv_button = ESPUI.addControl(ControlType::Button, "Abra", "Cadabra", ControlColor::None, tab5, nv_button_callback);
     
 
 
@@ -158,32 +162,17 @@ void button_status_callback1(Control* sender, int type, void* param)
     {
     case B_DOWN:
         Serial.println("Status: Start");
-        ESPUI.print(status_label_id1, "En marche");
+        ESPUI.print(status_syringe_pump, "En marche");
         break;
 
     case B_UP:
         Serial.println("Status: Stop");
-        ESPUI.print(status_label_id1, "A l'arrêt");
+        ESPUI.print(status_syringe_pump, "A l'arrêt");
         break;
     }
 }
 
-void button_status_callback2(Control* sender, int type, void* param)
-{
-    Serial.println(String("param: ") + String(long(param)));
-    switch (type)
-    {
-    case B_DOWN:
-        Serial.println("Status: Start");
-        ESPUI.print(status_label_id2, "En marche");
-        break;
 
-    case B_UP:
-        Serial.println("Status: Stop");
-        ESPUI.print(status_label_id2, "A l'arrêt");
-        break;
-    }
-}
 
 void button_callback(Control* sender, int type)
 {
@@ -249,27 +238,6 @@ void pad_callback(Control* sender, int value)
 }
 
 
-void switch_status_callback2(Control* sender, int value, void* param)
-{
-
-    Serial.println(String("param: ") + String(long(param)));
-    switch (value)
-    {
-    case S_ACTIVE:
-        Serial.print("Active:");
-        ESPUI.print(status_label_id2, "En marche");
-        break;
-
-    case S_INACTIVE:
-        Serial.print("Inactive");
-        ESPUI.print(status_label_id2, "A l'arrêt");
-        break;
-    }
-
-    Serial.print(" ");
-    Serial.println(sender->id);
-}
-
 
 void select_callback(Control* sender, int value)
 {
@@ -324,47 +292,32 @@ void general_callback(Control *sender, int type) {
 	Serial.println(sender->value);
 }
 
-void nv_bouton_ctrl_callback(Control *sender, int type) {
+void nv_button_ctrl_callback(Control *sender, int type) {
     
 
     if(type == B_UP) {
         
         test = !test;
-        ESPUI.updateVisibility(nv_bouton, test);
+        ESPUI.updateVisibility(nv_button, test);
         
 	}
 }
 
-void nv_bouton_callback(Control *sender, int type) {
+void nv_button_callback(Control *sender, int type) {
 	if(type == B_DOWN) {
-        ESPUI.setPanelStyle(nv_bouton, couleurs[2]);
-        ESPUI.setElementStyle(nv_bouton, couleurs[3]);
+        ESPUI.setPanelStyle(nv_button, couleurs[2]);
+        ESPUI.setElementStyle(nv_button, couleurs[3]);
 	}
 }
 
-void position_choice (Control *sender, int type) {
-
-    Serial.printf("val=%s\n", sender->value.c_str()); 
-    syringe_filled.set_exchange_volume_mL(atof(sender->value.c_str()));
 
-}
 
-void go_to_zero (Control *sender, int type) {
 
-    if(type == B_UP) {
-        syringe_filled.show_configuration();
-        Serial.printf("Go to zero"); 
-        syringe_filled.go_to_zero();
-        ESPUI.print(status_label_id1, "En marche");
-        ESPUI.setPanelStyle(status_label_id1, couleurs[0]);
-        ESPUI.setElementStyle(status_label_id1, couleurs[1]);
 
 
-    }
 
-}
-
-void switch_status_callback1(Control* sender, int value, void* param)
+//Methods that are really useful
+void on_off_callback (Control* sender, int value, void* param)
 {
 
     Serial.println(String("param: ") + String(long(param)));
@@ -372,17 +325,17 @@ void switch_status_callback1(Control* sender, int value, void* param)
     {
     case S_ACTIVE:
         Serial.print("Active:");
-        ESPUI.print(status_label_id1, "En marche");
-        ESPUI.setPanelStyle(status_label_id1, couleurs[0]);
-        ESPUI.setElementStyle(status_label_id1, couleurs[1]);
+        ESPUI.print(status_syringe_pump, "En marche");
+        ESPUI.setPanelStyle(status_syringe_pump, couleurs[0]);
+        ESPUI.setElementStyle(status_syringe_pump, couleurs[1]);
         syringe_filled.exchange();
         break;
 
     case S_INACTIVE:
         Serial.print("Inactive");
-        ESPUI.print(status_label_id1, "A l'arrêt");
-        ESPUI.setPanelStyle(status_label_id1, couleurs[2]);
-        ESPUI.setElementStyle(status_label_id1, couleurs[3]);
+        ESPUI.print(status_syringe_pump, "A l'arrêt");
+        ESPUI.setPanelStyle(status_syringe_pump, couleurs[2]);
+        ESPUI.setElementStyle(status_syringe_pump, couleurs[3]);
         syringe_filled.stop();
         break;
     }
@@ -391,9 +344,44 @@ void switch_status_callback1(Control* sender, int value, void* param)
     Serial.println(sender->id);
 }
 
+void on_off()
+{
+    if (syringe_filled.is_running())
+    {
+      ESPUI.updateControlValue(activation, "1");
+    }
+
+    ESPUI.updateControlValue(activation, "0");
+
+}
+
+void go_to_zero (Control *sender, int type) {
+
+    if(type == B_UP) {
+        syringe_filled.show_configuration();
+        Serial.printf("Go to zero"); 
+        syringe_filled.go_to_zero();
+        ESPUI.print(status_syringe_pump, "En marche");
+        ESPUI.setPanelStyle(status_syringe_pump, couleurs[0]);
+        ESPUI.setElementStyle(status_syringe_pump, couleurs[1]);
+
+
+    }
+
+}
+
+void position_choice (Control *sender, int type) {
+
+    Serial.printf("val=%s\n", sender->value.c_str()); 
+    syringe_filled.set_exchange_volume_mL(atof(sender->value.c_str()));
+
+}
+
+
 
 void web_loop ()
 {
+    on_off();
   //bool switchi = syringe.isRunning();
   //bool a = syringe.isRunning();
 	//if(millis() > last_time + 500) {
diff --git a/web.h b/web.h
index 5b0870f..01fe67e 100644
--- a/web.h
+++ b/web.h
@@ -16,9 +16,7 @@
 
 
 
-int status_label_id1;
-int status_label_id2;
-int graph_id;
+int status_syringe_pump, status_syringe_filled;
 int millis_label_id;
 int test_switch_id;
 
@@ -28,13 +26,13 @@ uint16_t activation;
 
 uint16_t etat_button_seringue;
 
-uint16_t bouton1, bouton2, bouton3, bouton4, bouton5, bouton6, bouton7, bouton8, bouton9, bouton10, bouton11, bouton12, bouton13, bouton14, bouton15, bouton16, bouton17, bouton18, bouton19, bouton20, bouton21, bouton22, bouton23, bouton24, bouton25, bouton26, bouton27, bouton28, bouton29, bouton30, bouton31, bouton32, bouton33, bouton34, bouton35, bouton36, bouton37, bouton38, bouton39, bouton40, bouton41, bouton42, bouton43, bouton44, bouton45, bouton46, bouton47, bouton48, bouton49, bouton50, bouton51, bouton52, bouton53, bouton54, bouton55, bouton56, bouton57, bouton58, bouton59, bouton60, bouton61, bouton62, bouton63, bouton64, bouton65, bouton66, bouton67, bouton68, bouton69, bouton70, bouton71, bouton72, bouton73, bouton74, bouton75, bouton76, bouton77, bouton78, bouton79, bouton80, bouton81, bouton82, bouton83, bouton84, bouton85, bouton86, bouton87, bouton88, bouton89, bouton90, bouton91, bouton92, bouton93, bouton94, bouton95, bouton96, bouton97, bouton98;
+uint16_t button1, button2, button3, button4, button5, button6, button7, button8, button9, button10, button11, button12, button13, button14, button15, button16, button17, button18, button19, button20, button21, button22, button23, button24, button25, button26, button27, button28, button29, button30, button31, button32, button33, button34, button35, button36, button37, button38, button39, button40, button41, button42, button43, button44, button45, button46, button47, button48, button49, button50, button51, button52, button53, button54, button55, button56, button57, button58, button59, button60, button61, button62, button63, button64, button65, button66, button67, button68, button69, button70, button71, button72, button73, button74, button75, button76, button77, button78, button79, button80, button81, button82, button83, button84, button85, button86, button87, button88, button89, button90, button91, button92, button93, button94, button95, button96, button97, button98;
 
 uint16_t zero;
 
 uint16_t style_button, style_label, style_switcher, style_slider, style_button2, style_label2, style_slider2;
 
-uint16_t nv_bouton_ctrl, nv_bouton;
+uint16_t nv_button_ctrl, nv_button;
 
 uint16_t slider;
 
@@ -64,25 +62,23 @@ void number_callback(Control* sender, int type);
 void text_callback(Control* sender, int type);
 void slider_callback(Control* sender, int type);
 void button_status_callback1(Control* sender, int type, void* param);
-void button_status_callback2(Control* sender, int type, void* param);
 void button_callback(Control* sender, int type);
-void pad_callback(Control* sender, int value);
-void switch_status_callback1(Control* sender, int value, void* param);
 void switch_status_callback2(Control* sender, int value, void* param);
 void select_callback(Control* sender, int value);
 void other_switch_callback(Control* sender, int value);
 void button_seringue(Control* sender, int type);
 void general_callback(Control* sender, int type);
-void nv_bouton_ctrl_callback(Control* sender, int type);
-void nv_bouton_callback(Control* sender, int type);
+void nv_button_ctrl_callback(Control* sender, int type);
+void nv_button_callback(Control* sender, int type);
 void position_choice(Control* sender, int type);
 void go_to_zero(Control* sender, int type);
-void on_off();
 
 
 
 
 
+//Methods that are really useful
+void on_off_callback(Control* sender, int value, void* param);
 
 
 
-- 
GitLab