diff --git a/include/common.h b/include/common.h index 089bcdd..59ea91e 100644 --- a/include/common.h +++ b/include/common.h @@ -10,15 +10,15 @@ #define LOG // Work without the server (put in comment to work with the server) -//#define STANDALONE +#define STANDALONE // Define witch module is used (ONLY ONE) //#define MODEL //#define BREACH //#define ELECTRICITY -#define ENERGY +//#define ENERGY //#define ENGINE -//#define EXTINGUISHER +#define EXTINGUISHER //#define FIRE //#define NAVIGATION //#define RADAR diff --git a/platformio.ini b/platformio.ini index 95f55dd..d947075 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [platformio] -default_envs = s2_mini ; Select from - d1_mini_pro - d1_mini - s2_mini - lolin_d32 +default_envs = d1_mini ; Select from - d1_mini_pro - d1_mini - s2_mini - lolin_d32 [env:d1_mini_pro] platform = espressif8266 @@ -44,7 +44,7 @@ lib_deps = adafruit/Adafruit GFX Library@^1.11.5 adafruit/Adafruit ILI9341@^1.5.12 adafruit/Adafruit NeoPixel@^1.11.0 - adafruit/Adafruit SSD1306@^2.5.7 + stblassitude/Adafruit SSD1306 Wemos Mini OLED@^1.1.2 thomasfredericks/Bounce2@^2.71 fastled/FastLED@^3.5.0 miguelbalboa/MFRC522@^1.4.10 diff --git a/src/Extinguisher.cpp b/src/Extinguisher.cpp index 7c374fc..ad7f72f 100644 --- a/src/Extinguisher.cpp +++ b/src/Extinguisher.cpp @@ -4,8 +4,8 @@ #include //////// Add new include library -//#include -//#include +#include +#include #include //charge the Adafruit_SSD1306 Wemos Mini OLED ! #include #include @@ -13,11 +13,11 @@ //////// Define global constantes (ALWAYS IN MAJ) // OLED -#define OLED_RESET 14 +#define OLED_RESET -1 Adafruit_SSD1306 display(OLED_RESET); // IR -const int LED_IR = 16; +const int LED_IR = 12; // Buttons #define TRIGGER 0 @@ -312,8 +312,8 @@ void read_buttons() void MySetup() { // set input's IO - pinMode(TRIGGER, INPUT); - pinMode(CONTACT, INPUT); + pinMode(TRIGGER, INPUT_PULLUP); + pinMode(CONTACT, INPUT_PULLUP); trigger.attach(TRIGGER); trigger.interval(5); contact.attach(CONTACT);