Skip to content

Extinguisher #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danansermin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Extinguisher #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions include/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions src/Extinguisher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
#include <Arduino.h>

//////// Add new include library
//#include <Wire.h>
//#include <Adafruit_GFX.h>
#include <Wire.h>
#include <Adafruit_GFX.h>
#include <Adafruit_SSD1306.h> //charge the Adafruit_SSD1306 Wemos Mini OLED !
#include <Bounce2.h>
#include <Ticker.h>

//////// 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
Expand Down Expand Up @@ -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);
Expand Down