code editting

common.h

@@ -14,8 +14,6 @@
 
 extern const char* msgHeader;
 
-void web_setup ();
-void web_loop ();
 
 // A4988 PINOUT
 #define DIR             15              // esp8266 gpio

motor.h

@@ -16,6 +16,7 @@ public:
     float acceleration () { return 5; }
     long distanceToGo () { return 0; }
     float speed() {return 0;}
+
 };
 #else
 #include <AccelStepper.h>
@@ -29,6 +30,7 @@ public:
         AccelStepper(interface, pin1, pin2, pin3, pin4, enable) { }
     // make it public
     inline unsigned long computeNewSpeed () { return AccelStepper::computeNewSpeed(); }
+
 };
 
 

pousseseringue-arduino.cpp

@@ -54,6 +54,7 @@ SSD1306AsciiWire oled;
 #include "Debouncer.h"          // local, debouncer, short counter, long detector
 #include "syringe.h"
 #include "syringefilled.h"
+#include "web.h"
 #include "cli.h"
 #include "common.h"
 #include "fs.h"

syringe.cpp

@@ -10,7 +10,7 @@ Syringe syringe;
 //CONSTRUCTOR
 Syringe :: Syringe()
 {
-    set_syringe("BD_10mL",  10, 14.5);
+    //set_syringe("BD_5mL",  10, 14.5);
     //set_syringe("Terumo_5mL", 5, 10);
     //set_syringe("Terumo_2mL", 2, 3);
     //set_syringe("FisherBrand_1mL", 1, 0.5);
@@ -90,7 +90,7 @@ void Syringe :: write_Json ()
 {
 InterruptLock lock; //useful thanks to its constructor (so a is not visible in the code)
 File f = filesystem->open("syringe_json", "w"); //Creation du fichier
-size_t a = serializeJson(syringe_json, f); //remettre f a la plce de json
+size_t a = serializeJsonPretty(syringe_json, f); //remettre f a la plce de json
 Serial.println("Taille de syringe_json");
 Serial.println(a);
 f.close();