Skip to content

Commit

Permalink
Better display of lcd initial wifi configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mickyleitor
Mickyleitor committed Sep 23, 2023
1 parent db5d3e7 commit 2202142
Show file tree
Hide file tree
Showing 2 changed files with 172 additions and 146 deletions.
311 changes: 168 additions & 143 deletions Firmware_ESP8266/Firmware_ESP8266.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
// - NTPClient by Fabrice Weinberg 3.2.0 : https://github.com/arduino-libraries/NTPClient
// - LiquidCrystal_PCF8574 by mathertel 2.2.0 : https://github.com/mathertel/LiquidCrystal_PCF8574


#include <Ticker.h>
#include "basic_defines.h"
#include "SolarAzEl.h"
Expand All @@ -27,165 +26,191 @@ struct ShutterParameters ShutterData[3];
Ticker TimeOutTask, SystemFunctionTask;

void goIdleState(void) {
Serial.println("Buttons Time Out");
_SystemState = SYSTEM_STATE_ENTERING_IDLE;
};
Serial.println("Buttons Time Out");
_SystemState = SYSTEM_STATE_ENTERING_IDLE;
}

void setup() {
Serial.begin(115200);
Serial.println();
Serial.println("Master inicializado");
EEPROM_Begin(&settings);

if( initLCDFunction(10000) < 0){
errorHandler(FATAL_ERROR_CODE_LCD_INIT_FAILED);
}

// sendLcdBuffer(" ", " ");
sendLcdBuffer("....INICIANDO...", "CONECTANDO WIFI");
if( !ESP8266Utils_Connect_STA(settings.wifiSettings.ssid_sta, settings.wifiSettings.password_sta, settings.wifiSettings.hostname, WIFI_CONNECTION_TIMEOUT) ){
Serial.print("Error connecting to SSID: ");
Serial.println(settings.wifiSettings.ssid_sta);
if( !ESP8266Utils_Connect_AP(settings.wifiSettings.ssid_ap, settings.wifiSettings.password_ap, settings.wifiSettings.hostname, WIFI_CONNECTION_TIMEOUT) ){
Serial.print("Error creating AP with SSID: ");
Serial.println(settings.wifiSettings.ssid_ap);
errorHandler(FATAL_ERROR_CODE_WIFI_AP_FAILED);
}else{
Serial.print("AP created with SSID: ");
Serial.println(settings.wifiSettings.ssid_ap);
_SystemState = SYSTEM_STATE_WIFI_ACCESS_POINT_OPENED;
Serial.begin(115200);
Serial.println();
Serial.println("Master inicializado");
EEPROM_Begin(&settings);

if (initLCDFunction(10000) < 0) {
errorHandler(FATAL_ERROR_CODE_LCD_INIT_FAILED);
}

// sendLcdBuffer(" ", " ");
sendLcdBuffer("....INICIANDO...CONECTANDO WIFI");
if (!ESP8266Utils_Connect_STA(settings.wifiSettings.ssid_sta, settings.wifiSettings.password_sta, settings.wifiSettings.hostname, WIFI_CONNECTION_TIMEOUT)) {
Serial.print("Error connecting to SSID: ");
Serial.println(settings.wifiSettings.ssid_sta);
if (!ESP8266Utils_Connect_AP(settings.wifiSettings.ssid_ap, settings.wifiSettings.password_ap, settings.wifiSettings.hostname, WIFI_CONNECTION_TIMEOUT)) {
Serial.print("Error creating AP with SSID: ");
Serial.println(settings.wifiSettings.ssid_ap);
errorHandler(FATAL_ERROR_CODE_WIFI_AP_FAILED);
} else {
Serial.print("AP created with SSID: ");
Serial.println(settings.wifiSettings.ssid_ap);
_SystemState = SYSTEM_STATE_WIFI_ACCESS_POINT_OPENED;
}
}
}
}

void loop() {

ESP8266Utils_handleWifi();
ESP8266Utils_handleWifi();

switch (_SystemState) {
case SYSTEM_STATE_WIFI_ACCESS_POINT_OPENED : {
static int indexDisplay1;
static int indexDisplay2;
static uint32_t timerMs;
String displayString1 = " " + String(settings.wifiSettings.ssid_ap) + " ";
String displayString2 = " Password: " + String(settings.wifiSettings.password_ap) + " IP: " + ESP8266Utils_get_hostname() + " ";
switch (_SystemState) {
case SYSTEM_STATE_WIFI_ACCESS_POINT_OPENED: {
static int lcd_transition_state;
static uint32_t lcd_transition_timerMs;
static int indexDisplay;
static uint32_t slide_timerMs;

if ( (millis() - timerMs) > LCD_SLIDE_SPEED_MS ) {
timerMs = millis();
String displayString1;
String displayString2;

sendLcdBuffer(String("SSID:" + displayString1.substring(indexDisplay1, indexDisplay1 + 11)),
displayString2.substring(indexDisplay2, indexDisplay2 + 16));
if( lcd_transition_state == 1){
sendLcdBuffer(String("PORFAVOR CONECTE A LA RED WIFI "));

indexDisplay1++;
indexDisplay2++;
if (indexDisplay1 > displayString1.length() - 10) indexDisplay1 = 0;
if (indexDisplay2 > displayString2.length() - 16) indexDisplay2 = 0;
}
break;
}
case SYSTEM_STATE_WIFI_STATION_CONNECTED : {
sendLcdBuffer("....INICIANDO...", " PERIFERICOS ");
// Before ACCESS_POINT_OPENED it makes no sense to do all this bottom functions
initButtonsFunction();
checkSlaveConnection();
sendLcdBuffer("....INICIANDO...", "OBTENIENDO DATOS");
ESP8266Utils_update_WeatherData(&settings);
SystemFunctionTask.detach();
SystemFunctionTask.attach(SYSTEM_MANAGER_SECONDS,SystemFunctionManager);
_SystemState = SYSTEM_STATE_ENTERING_IDLE;
break;
}
case SYSTEM_STATE_ENTERING_IDLE : {
apagarBrilloPantalla();
actualizarHoraPantalla();
TimeOutTask.detach();
TimeOutTask.attach(UPDATE_SCREEN_SECONDS, actualizarHoraPantalla);
if ( _seleccionMenu > SELECCION_MENU_NONE) {
_seleccionMenuAnterior = _seleccionMenu;
if((millis() - lcd_transition_timerMs) > LCD_TRANSITION_SPEED_MS){
lcd_transition_timerMs = millis();
lcd_transition_state++;
}
}else if(lcd_transition_state == 2){
displayString1 = " SSID ";
displayString2 = " " + String(settings.wifiSettings.ssid_ap) + " ";
}else if(lcd_transition_state == 3){
displayString1 = " PASSWORD ";
displayString2 = " " + String(settings.wifiSettings.password_ap) + " ";
}else if(lcd_transition_state == 4){
displayString1 = " LOCAL ADDRESS ";
displayString2 = " " + ESP8266Utils_get_hostname() + " ";
}else{
lcd_transition_state = 1;
lcd_transition_timerMs = millis();
}

if(lcd_transition_state > 1){
if ((millis() - slide_timerMs) > LCD_SLIDE_SPEED_MS) {
slide_timerMs = millis();

indexDisplay++;
if (indexDisplay >= (displayString2.length() - 16)) {
indexDisplay = 0;
lcd_transition_state++;
}else{
sendLcdBuffer(displayString1 + displayString2.substring(indexDisplay, indexDisplay + 16));
}
}
}

break;
}
case SYSTEM_STATE_WIFI_STATION_CONNECTED: {
sendLcdBuffer("....INICIANDO... PERIFERICOS ");
// Before ACCESS_POINT_OPENED it makes no sense to do all this bottom functions
initButtonsFunction();
checkSlaveConnection();
sendLcdBuffer("....INICIANDO... OBTENIENDO DATOS");
ESP8266Utils_update_WeatherData(&settings);
SystemFunctionTask.detach();
SystemFunctionTask.attach(SYSTEM_MANAGER_SECONDS, SystemFunctionManager);
_SystemState = SYSTEM_STATE_ENTERING_IDLE;
break;
}
case SYSTEM_STATE_ENTERING_IDLE: {
apagarBrilloPantalla();
actualizarHoraPantalla();
TimeOutTask.detach();
TimeOutTask.attach(UPDATE_SCREEN_SECONDS, actualizarHoraPantalla);
if (_seleccionMenu > SELECCION_MENU_NONE) {
_seleccionMenuAnterior = _seleccionMenu;
}
_seleccionMenu = SELECCION_MENU_NONE;
_SystemState = SYSTEM_STATE_IDLING;
break;
}
_seleccionMenu = SELECCION_MENU_NONE;
_SystemState = SYSTEM_STATE_IDLING;
break;
}
case SYSTEM_STATE_IDLING : {
if(buttonPressed() != BUTTON_STATUS_NONE){
_SystemState = SYSTEM_STATE_WAKEUP;
case SYSTEM_STATE_IDLING: {
if (buttonPressed() != BUTTON_STATUS_NONE) {
_SystemState = SYSTEM_STATE_WAKEUP;
}
break;
}
break;
}
case SYSTEM_STATE_WAKEUP : {
// Update Weather condition every wake up?
// getWeatherDataFunction();
encenderBrilloPantalla();
_seleccionMenu = _seleccionMenuAnterior;
_SystemState = SYSTEM_STATE_MENU;
break;
}
case SYSTEM_STATE_MENU : {
uint8_t button = buttonPressed();
handleButtonFromMenu(&_seleccionMenu, button);
actualizarMenuPantalla(_seleccionMenu);
break;
}
case SYSTEM_STATE_ACTION_JOB : {
apagarBrilloPantalla();
delay(200);
encenderBrilloPantalla();
activarModoTrabajo();
_SystemState = SYSTEM_STATE_ENTERING_IDLE;
if(_seleccionMenu > SELECCION_MENU_NONE){
_SystemState = SYSTEM_STATE_MENU;
case SYSTEM_STATE_WAKEUP: {
// Update Weather condition every wake up?
// getWeatherDataFunction();
encenderBrilloPantalla();
_seleccionMenu = _seleccionMenuAnterior;
_SystemState = SYSTEM_STATE_MENU;
break;
}
break;
}
case SYSTEM_STATE_ACTION_SLEEP : {
Serial.println("Modo dormir activado");
EEPROM_Write(&settings);
struct RSCP_Arg_buzzer_action buzzerAction;
buzzerAction.action = RSCP_DEF_BUZZER_ACTION_ON;
buzzerAction.volume = 300;
buzzerAction.duration_ms = 500;
rscpSendAction(RSCP_CMD_SET_BUZZER_ACTION, (uint8_t *)&buzzerAction, sizeof(buzzerAction), 1000);
delay(200);
bajarPersiana(SELECCION_MENU_PERSIANA_TO_INDEX(SELECCION_MENU_PERSIANA_DERECHA));
delay(200);
bajarPersiana(SELECCION_MENU_PERSIANA_TO_INDEX(SELECCION_MENU_PERSIANA_CENTRAL));
EEPROM_Read(&settings);
_SystemState = SYSTEM_STATE_ENTERING_IDLE;
if(_seleccionMenu > SELECCION_MENU_NONE){
_SystemState = SYSTEM_STATE_MENU;
case SYSTEM_STATE_MENU: {
uint8_t button = buttonPressed();
handleButtonFromMenu(&_seleccionMenu, button);
actualizarMenuPantalla(_seleccionMenu);
break;
}
break;
}
}
case SYSTEM_STATE_ACTION_JOB: {
apagarBrilloPantalla();
delay(200);
encenderBrilloPantalla();
activarModoTrabajo();
_SystemState = SYSTEM_STATE_ENTERING_IDLE;
if (_seleccionMenu > SELECCION_MENU_NONE) {
_SystemState = SYSTEM_STATE_MENU;
}
break;
}
case SYSTEM_STATE_ACTION_SLEEP: {
Serial.println("Modo dormir activado");
EEPROM_Write(&settings);
struct RSCP_Arg_buzzer_action buzzerAction;
buzzerAction.action = RSCP_DEF_BUZZER_ACTION_ON;
buzzerAction.volume = 300;
buzzerAction.duration_ms = 500;
rscpSendAction(RSCP_CMD_SET_BUZZER_ACTION, (uint8_t *)&buzzerAction, sizeof(buzzerAction), 1000);
delay(200);
bajarPersiana(SELECCION_MENU_PERSIANA_TO_INDEX(SELECCION_MENU_PERSIANA_DERECHA));
delay(200);
bajarPersiana(SELECCION_MENU_PERSIANA_TO_INDEX(SELECCION_MENU_PERSIANA_CENTRAL));
EEPROM_Read(&settings);
_SystemState = SYSTEM_STATE_ENTERING_IDLE;
if (_seleccionMenu > SELECCION_MENU_NONE) {
_SystemState = SYSTEM_STATE_MENU;
}
break;
}
}
}

void activarModoTrabajo() {
Serial.println("Modo trabajo activado");
struct RSCP_Arg_buzzer_action buzzerAction;
buzzerAction.action = RSCP_DEF_BUZZER_ACTION_ON;
buzzerAction.volume = 300;
buzzerAction.duration_ms = 500;
rscpSendAction(RSCP_CMD_SET_BUZZER_ACTION, (uint8_t *)&buzzerAction, sizeof(buzzerAction), 1000);
ESP8266Utils_update_WeatherData(&settings);
time_t nowSecondsUTC = time(NULL) % (60 * 60 * 24);
// According to Requirements the current time should be between sunrise and sunset time.
if((MyWeather.sunriseSecondsUTC <= nowSecondsUTC) && (nowSecondsUTC <= MyWeather.sunsetSecondsUTC)){
// According to Requirements there is no need if the Cloudiness is less than 75%
if(MyWeather.Cloudiness < 75){
// Both shutter lowered when 60 < SunAzimuth < 260
if( 60 < MyWeather.SunAzimuth && MyWeather.SunAzimuth < 260){
bajarPersiana(SELECCION_MENU_PERSIANA_TO_INDEX(SELECCION_MENU_PERSIANA_DERECHA));
delay(500);
bajarPersiana(SELECCION_MENU_PERSIANA_TO_INDEX(SELECCION_MENU_PERSIANA_CENTRAL));
delay(500);
struct RSCP_Arg_switchrelay switchRelayArg;
switchRelayArg.status = RSCP_DEF_SWITCH_RELAY_ON;
rscpSendAction(RSCP_CMD_SET_SWITCH_RELAY, (uint8_t *)&switchRelayArg, sizeof(switchRelayArg), 1000);
// Center shutter only lower when 100 < SunAzimuth < 230
}else if( 100 < MyWeather.SunAzimuth && MyWeather.SunAzimuth < 230){
bajarPersiana(SELECCION_MENU_PERSIANA_TO_INDEX(SELECCION_MENU_PERSIANA_CENTRAL));
}
Serial.println("Modo trabajo activado");
struct RSCP_Arg_buzzer_action buzzerAction;
buzzerAction.action = RSCP_DEF_BUZZER_ACTION_ON;
buzzerAction.volume = 300;
buzzerAction.duration_ms = 500;
rscpSendAction(RSCP_CMD_SET_BUZZER_ACTION, (uint8_t *)&buzzerAction, sizeof(buzzerAction), 1000);
ESP8266Utils_update_WeatherData(&settings);
time_t nowSecondsUTC = time(NULL) % (60 * 60 * 24);
// According to Requirements the current time should be between sunrise and sunset time.
if ((MyWeather.sunriseSecondsUTC <= nowSecondsUTC) && (nowSecondsUTC <= MyWeather.sunsetSecondsUTC)) {
// According to Requirements there is no need if the Cloudiness is less than 75%
if (MyWeather.Cloudiness < 75) {
// Both shutter lowered when 60 < SunAzimuth < 260
if (60 < MyWeather.SunAzimuth && MyWeather.SunAzimuth < 260) {
bajarPersiana(SELECCION_MENU_PERSIANA_TO_INDEX(SELECCION_MENU_PERSIANA_DERECHA));
delay(500);
bajarPersiana(SELECCION_MENU_PERSIANA_TO_INDEX(SELECCION_MENU_PERSIANA_CENTRAL));
delay(500);
struct RSCP_Arg_switchrelay switchRelayArg;
switchRelayArg.status = RSCP_DEF_SWITCH_RELAY_ON;
rscpSendAction(RSCP_CMD_SET_SWITCH_RELAY, (uint8_t *)&switchRelayArg, sizeof(switchRelayArg), 1000);
// Center shutter only lower when 100 < SunAzimuth < 230
} else if (100 < MyWeather.SunAzimuth && MyWeather.SunAzimuth < 230) {
bajarPersiana(SELECCION_MENU_PERSIANA_TO_INDEX(SELECCION_MENU_PERSIANA_CENTRAL));
}
}
}
}
}
7 changes: 4 additions & 3 deletions Firmware_ESP8266/lcd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ LiquidCrystal_PCF8574 _lcd(LCD_I2C_ADDRESS);
#define LCD_SPECIAL_CHAR_STOP_ARROW (char)(LCD_SPECIAL_CHAR_BASE + 4)
#define LCD_SPECIAL_CHAR_UP_ARROW_CAN (char)(LCD_SPECIAL_CHAR_BASE + 5)

#define LCD_TRANSITION_SPEED_MS (5000)
#define LCD_SLIDE_SPEED_MS (500)

void apagarBrilloPantalla() {
Expand All @@ -36,7 +37,7 @@ void encenderBrilloPantalla() {
_lcd.setBacklight(255);
}

void sendLcdBuffer(String line1, String line2) {
void _sendLcdBuffer(String line1, String line2) {
_lcd.home();
_lcd.clear();
for (int i = 0; i < 16; i++) {
Expand All @@ -62,7 +63,7 @@ bool sendLcdBuffer(String newBuffer) {
bufferAnterior = newBuffer;
String line1 = newBuffer.substring(0, 16);
String line2 = newBuffer.substring(16, 32);
sendLcdBuffer(line1, line2);
_sendLcdBuffer(line1, line2);
return true;
}
return false;
Expand Down Expand Up @@ -947,7 +948,7 @@ void actualizarMenuPantalla(uint8_t _localMenu)
_locaBuffer = _locaBuffer.substring(_localBufferIndex, _localBufferIndex + 16);
}
lcdBuffer += _locaBuffer;
lcdBuffer += String("< >");
lcdBuffer += String("< ");
break;
}
}
Expand Down

0 comments on commit 2202142

Please sign in to comment.