Skip to content

Commit

Permalink
Update Horloge.ino
Browse files Browse the repository at this point in the history
  • Loading branch information
@Marcussacapuces91
Marcussacapuces91 committed Mar 29, 2021
1 parent 7a311c2 commit 8ef4b32
Showing 1 changed file with 9 additions and 283 deletions.
292 changes: 9 additions & 283 deletions Horloge/Horloge.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,295 +19,21 @@
* Contact: marc@sibert.fr
*/

///> @see https://github.com/arduino-libraries/NTPClient
#include <NTPClient.h>
#include <WiFiUdp.h>
// #define DEBUG 1

///> @see https://arduino-esp8266.readthedocs.io/en/latest/index.html
#include <ESP8266WiFi.h>
#include "horloge.h"

///> @see https://github.com/adafruit/Adafruit_LED_Backpack
#include <Adafruit_LEDBackpack.h>
#ifdef DEBUG
#include <GDBStub.h>
#endif

#include <LittleFS.h>

#include "web.h"

template<
const long BAUDRATE = 115200,
const unsigned I2C_ADDR = 0x70
> class App {
public:
App() :
alpha4(Adafruit_AlphaNum4()),
url(F("pool.ntp.org")),
ntpUDP(),
timeClient(ntpUDP, url.c_str(), utcOffsetInSeconds)
{
WiFi.setAutoReconnect(true);

uint8_t mac[6];
WiFi.macAddress(mac);
char host[20];
snprintf_P(host, sizeof(host), PSTR("horloge-%02x%02x%02x"), mac[3], mac[4], mac[5]);
hostname = host;
}

inline
void setup() {
Serial.begin(BAUDRATE);
alpha4.begin(I2C_ADDR);
Serial.print(F("LittleFS starts: "));
Serial.println(LittleFS.begin() ? "OK." : "Failed!");

alpha4.clear();
alpha4.setBrightness(0);

alpha4.writeDigitRaw(0, 0x0008);
alpha4.writeDigitRaw(3, 0x0008);
alpha4.writeDisplay();
for (byte i = 0; i < 4; ++i) {
alpha4.setBrightness(i);
delay(200);
}
alpha4.writeDigitRaw(0, 0x00C0);
alpha4.writeDigitRaw(3, 0x00C0);
alpha4.writeDisplay();
for (byte i = 4; i < 8; ++i) {
alpha4.setBrightness(i);
delay(200);
}
alpha4.writeDigitRaw(0, 0x00E2);
alpha4.writeDigitRaw(3, 0x00E2);
alpha4.writeDisplay();
for (byte i = 8; i < 12; ++i) {
alpha4.setBrightness(i);
delay(200);
}
alpha4.writeDigitRaw(0, 0x00E3);
alpha4.writeDigitRaw(3, 0x00E3);
alpha4.writeDisplay();
for (byte i = 12; i <= 15; ++i) {
alpha4.setBrightness(i);
delay(200);
}
alpha4.writeDigitRaw(1, 0x0008);
alpha4.writeDigitRaw(2, 0x0008);
alpha4.writeDisplay();
delay(200);

alpha4.writeDigitRaw(3, 0x07E3);
alpha4.writeDisplay();
delay(200);

alpha4.writeDigitRaw(3, 0x00E3);
alpha4.writeDisplay();
delay(1000);

// display(F("HORLOGE 1,0 (c) Marc SIBERT"));
display(F("HORLOGE 1,0"));
delay(500);
// display(String(F("COMPILE ")) + __DATE__ + F(" - ") + __TIME__);
// delay(1000);


setupWiFi();

web.setup();

}

/**
* Méthode appelée perpétuellement.
*/
inline
void loop() {
static auto oldSec = 100;

if (!WiFi.isConnected()) setupWiFi();
web.handleClient();

timeClient.update();
const auto sec = timeClient.getSeconds();
if (sec != oldSec) {
oldSec = sec;
const auto hh = timeClient.getHours();
alpha4.writeDigitAscii(0, hh < 10 ? ' ' : ('0' + hh / 10));
alpha4.writeDigitAscii(1, '0' + hh % 10, (sec & 1));
const auto mn = timeClient.getMinutes();
alpha4.writeDigitAscii(2, '0' + mn / 10);
alpha4.writeDigitAscii(3, '0' + mn % 10);
const auto sensorValue = analogRead(A0);
alpha4.setBrightness( constrain(_BV( map(sensorValue, 500, 1023, 0, 3) ), 1, 15) );

alpha4.writeDisplay();
}

}

protected:
/**
* Affiche les chaînes de caractères sur l'écran.
* @param str La chaîne de caractère.
*/
void display(const String& str) {
const byte digits = 4;
if (str.length() <= digits) {
for (byte i = 0; i < digits; ++i) {
alpha4.writeDigitAscii(i, i < str.length() ? str[i] : ' ');
}
} else {
for (unsigned i = 0; i < str.length() - (digits - 1); ++i) {
display(str.substring(i, i + digits));
}
}
alpha4.writeDisplay();
delay(200);
}

String statusMessage(const int status) {
switch (status) {
case WL_IDLE_STATUS :
return F("Status change...");
break;
case WL_NO_SSID_AVAIL :
return F("SSID not reachable!");
break;
case WL_CONNECTED :
return F("Connected.");
break;
case WL_CONNECT_FAILED :
return F("Connection failed!");
break;
case WL_CONNECTION_LOST :
return F("Connection lost...");
break;
case WL_DISCONNECTED :
return F("Disconnected...");
break;
default :
Serial.print("WL_IDLE_STATUS ="); Serial.println(WL_IDLE_STATUS);
Serial.print("WL_NO_SSID_AVAIL ="); Serial.println(WL_NO_SSID_AVAIL);
Serial.print("WL_SCAN_COMPLETED ="); Serial.println(WL_SCAN_COMPLETED);
Serial.print("WL_CONNECTED ="); Serial.println(WL_CONNECTED);
Serial.print("WL_CONNECT_FAILED ="); Serial.println(WL_CONNECT_FAILED);
Serial.print("WL_CONNECTION_LOST ="); Serial.println(WL_CONNECTION_LOST);
Serial.print("WL_DISCONNECTED ="); Serial.println(WL_DISCONNECTED);

Serial.print("Erreur wl_status_t : ");
Serial.println(status);

return String(F("Other error #")) + String(status);
break;
}
}

boolean waitForConnexion(const unsigned timeout = 30) {
auto s = WiFi.status();
for(const auto t = millis(); millis() < t + (timeout * 1000UL); s = WiFi.status()) {
display(statusMessage(s));
yield();
if (s == WL_CONNECTED) return true;
}
return false;
}

/**
* Setup WiFi connection or
*/
void setupWiFi() {
WiFi.mode(WIFI_STA);

WiFi.hostname(hostname);
WiFi.begin();

display(String(F("WIFI SSID ")) + WiFi.SSID());
if (waitForConnexion()) {
display(String(F("IP address ")) + WiFi.localIP().toString());
delay(200);
return;
}
display(F("No WiFi found!"));
delay(200);

display(F("Start WPS "));
delay(200);
if (WiFi.beginWPSConfig()) {
if (waitForConnexion()) {
display(F("WPS succeded - Reboot"));
delay(200);
ESP.restart();
} else {
display(F("WPS timed out!"));
delay(200);
}
} else {
display(F("WPS failed!"));
delay(200);
}

display(F("Start SmartConfig"));
delay(200);
if (WiFi.beginSmartConfig()) {
if (waitForConnexion()) {
display(F("SmartConfig succeded - Reboot"));
delay(200);
ESP.restart();
} else {
display(F("Connection timed out!"));
delay(200);
}
} else {
display(F("SmartConfig failed!"));
delay(200);
}

}

/**
* @see http://howardhinnant.github.io/date_algorithms.html
*/
void displayDate(const unsigned long& day) {
const unsigned long z = day + 719468;
const unsigned long era = z / 146097;
const unsigned doe = static_cast<unsigned>(z - era * 146097); // [0, 146096]
const unsigned yoe = (doe - doe/1460 + doe/36524 - doe/146096) / 365; // [0, 399]
const unsigned doy = doe - (365*yoe + yoe/4 - yoe/100); // [0, 365]
const byte mp = (5*doy + 2)/153; // [0, 11]
const byte d = doy - (153*mp+2)/5 + 1; // [1, 31]
const byte m = mp + (mp < 10 ? 3 : -9); // [1, 12]
const unsigned y = static_cast<unsigned>(yoe) + era * 400 + (m <= 2);

static const String jours[] = {"Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi"};
static const String mois[] = {"Janvier", "Fevrier", "Mars", "Avril", "Mai", "Juin", "Juillet", "Aout", "Septembre", "Octobre", "Novembre", "Decembre"};

display(String(jours[(day+4) % 7]) + " " + String(d) + " " + mois[mp] + " " + String(y));
delay(1000);
}

private:


///> Accès à l'afficheur.
Adafruit_AlphaNum4 alpha4;

///> Outils WiFi & ntp.
String url;
const long utcOffsetInSeconds = 3600;
WiFiUDP ntpUDP;
NTPClient timeClient;

String hostname;

Web web;
};


// constexpr char url[] = "europe.pool.ntp.org";
App<> app;
Horloge app;

void setup() {
app.setup();
#ifdef DEBUG
gdbstub_init();
#endif
}

void loop() {
Expand Down

0 comments on commit 8ef4b32

Please sign in to comment.