Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit d7917ef
Author: Dmytro Korniienko <[email protected]>
Date:   Thu Nov 26 18:37:06 2020 +0200

    WiFi lost STA fix

commit 768bb7a
Author: Dmytro Korniienko <[email protected]>
Date:   Thu Nov 26 17:40:10 2020 +0200

    wifi manual reconnect fix

commit b75e271
Author: Emil Muratov <[email protected]>
Date:   Wed Nov 25 20:29:02 2020 +0300

    WiFi status fix
     - fixed updating WiFi station variable (ESP32)
     - Interface frame size increased for ESP32

    Signed-off-by: Emil Muratov <[email protected]>

commit 98d5eb1
Author: Emil Muratov <[email protected]>
Date:   Wed Nov 25 01:18:37 2020 +0300

    Embed system settings vars/GUI

     - Add system-related vars to the embui initialization code
     - Predefined code for "settings' web-page
     - generic example changed to adopt predefined settings UI

    Signed-off-by: Emil Muratov <[email protected]>

commit 86dc340
Author: Emil Muratov <[email protected]>
Date:   Thu Nov 19 16:55:27 2020 +0300

    TimeLib: Workaround for newlib bug with <+-nn> timezone names
        local WA for both esp8266 and esp32 'till fixed in both core's
        Fix for 8266 already in master  esp8266/Arduino#7702

    Signed-off-by: Emil Muratov <[email protected]>

commit a31bd32
Author: Emil Muratov <[email protected]>
Date:   Thu Nov 19 02:06:53 2020 +0300

    WiFi: ESP32 DHCP WA, reconnection fix
     - implemented WA for the ESP32 issue  espressif/arduino-esp32#2537
     - Delayed reconnection, allows websocket to finish section transaction. Fix #1

    Signed-off-by: Emil Muratov <[email protected]>

commit b136f84
Author: Dmytro Korniienko <[email protected]>
Date:   Fri Nov 6 18:47:48 2020 +0200

    resources

commit f276d20
Author: Dmytro Korniienko <[email protected]>
Date:   Thu Nov 5 18:21:44 2020 +0200

    mqtt critical fix

commit fee53ef
Author: Dmytro Korniienko <[email protected]>
Date:   Thu Nov 5 16:19:42 2020 +0200

    mqtt fix

commit 803c9b6
Author: Dmytro Korniienko <[email protected]>
Date:   Thu Nov 5 12:58:19 2020 +0200

    resources fix

commit be4bcb6
Author: Dmytro Korniienko <[email protected]>
Date:   Thu Nov 5 12:15:58 2020 +0200

    Upload progress fix

commit 7e83cfc
Author: Dmytro Korniienko <[email protected]>
Date:   Wed Nov 4 17:47:12 2020 +0200

    resources

commit 81b3d5c
Author: Dmytro Korniienko <[email protected]>
Date:   Tue Nov 3 14:33:29 2020 +0200

    MQTT log fix

commit 1584fd8
Author: Emil Muratov <[email protected]>
Date:   Tue Nov 3 12:13:44 2020 +0300

    OTA: esp8266 fix for gzipped fw image

    Signed-off-by: Emil Muratov <[email protected]>

commit 208e6ec
Merge: 3eff570 da552d7
Author: Emil Muratov <[email protected]>
Date:   Sat Oct 31 15:24:11 2020 +0300

    Merge branch 'dev' of github.com:DmytroKorniienko/EmbUI into emdev

commit 3eff570
Author: Emil Muratov <[email protected]>
Date:   Sat Oct 31 15:21:22 2020 +0300

    OTA fix for ESP32

    Signed-off-by: Emil Muratov <[email protected]>

commit da552d7
Author: Dmytro Korniienko <[email protected]>
Date:   Sat Oct 31 04:32:46 2020 +0200

    bugfix mqtt

commit cdaf07c
Author: Dmytro Korniienko <[email protected]>
Date:   Sat Oct 31 00:31:15 2020 +0200

    bugfix

commit 343649a
Author: Dmytro Korniienko <[email protected]>
Date:   Sat Oct 31 00:21:38 2020 +0200

    getAPmac bugfix

commit 0521889
Author: Dmytro Korniienko <[email protected]>
Date:   Fri Oct 30 19:54:46 2020 +0200

    bugfix

commit 92f2907
Author: Dmytro Korniienko <[email protected]>
Date:   Fri Oct 30 19:43:27 2020 +0200

    Fix (lost changes)
  • Loading branch information
@DmytroKorniienko
DmytroKorniienko committed Nov 26, 2020
1 parent 46519b1 commit df8dd8a
Show file tree
Hide file tree
Showing 2 changed files with 314 additions and 0 deletions.
243 changes: 243 additions & 0 deletions EmbUI/basicui.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,243 @@
#include "basicui.h"

/**
* Define configuration variables and controls handlers
*
* Variables has literal names and are kept within json-configuration file on flash
* Control handlers are bound by literal name with a particular method. This method is invoked
* by manipulating controls
*
* this method owerrides weak definition in framework
*
*/
void BasicUI::add_sections(){
LOG(println, F("UI: Creating webui vars"));

// variable for UI language (specific to basicui translations)
embui.var_create(FPSTR(P_LANGUAGE), String((uint8_t)lang));

/**
* обработчики действий
*/
// вывод BasicUI секций
embui.section_handle_add(FPSTR(T_SETTINGS), section_settings_frame); // generate "settings" UI section
embui.section_handle_add(FPSTR(T_SH_NETW), block_settings_netw); // generate "network settings" UI section
embui.section_handle_add(FPSTR(T_SH_TIME), block_settings_time); // generate "time settings" UI section
//embui.section_handle_add(FPSTR(T_SH_OTHER), show_settings_other);

// обработка базовых настроек
embui.section_handle_add(FPSTR(T_SET_WIFI), set_settings_wifi); // обработка настроек WiFi Client
embui.section_handle_add(FPSTR(T_SET_WIFIAP), set_settings_wifiAP); // обработка настроек WiFi AP
embui.section_handle_add(FPSTR(T_SET_MQTT), set_settings_mqtt); // обработка настроек MQTT
embui.section_handle_add(FPSTR(T_SET_TIME), set_settings_time); // установки даты/времени
embui.section_handle_add(FPSTR(P_LANGUAGE), set_language); // смена языка интерфейса

//embui.section_handle_add(FPSTR(T_004B), set_settings_other);
}

/**
* This code adds "Settings" section to the MENU
* it is up to you to properly open/close Interface menu json_section
*/
void BasicUI::opt_setup(Interface *interf, JsonObject *data){
if (!interf) return;
interf->option(FPSTR(T_SETTINGS), FPSTR(T_DICT[lang][TD::D_SETTINGS])); // пункт меню "настройки"
}

/**
* формирование секции "настроек",
* вызывается либо по выбору из "меню" либо при вызове из
* других блоков/обработчиков
*
*/
void BasicUI::section_settings_frame(Interface *interf, JsonObject *data){
if (!interf) return;
interf->json_frame_interface(""); // саму секцию целиком не обрабатываем

interf->json_section_main(FPSTR(T_SETTINGS), FPSTR(T_DICT[lang][TD::D_SETTINGS]));

interf->select(FPSTR(P_LANGUAGE), String(lang), String(FPSTR(T_DICT[lang][TD::D_LANG])), true);
interf->option("0", "Rus");
interf->option("1", "Eng");
interf->json_section_end();

interf->spacer();

interf->button(FPSTR(T_SH_NETW), FPSTR(T_DICT[lang][TD::D_WIFI_MQTT])); // кнопка перехода в настройки сети
interf->button(FPSTR(T_SH_TIME), FPSTR(T_DICT[lang][TD::D_Time])); // кнопка перехода в настройки времени

interf->spacer();
block_settings_update(interf, data); // добавляем блок интерфейса "обновления ПО"

interf->json_section_end();
interf->json_frame_flush();
}

/**
* BasicUI блок интерфейса настроек WiFi/MQTT
*/
void BasicUI::block_settings_netw(Interface *interf, JsonObject *data){
if (!interf) return;
interf->json_frame_interface();

// Headline
interf->json_section_main(FPSTR(T_OPT_NETW), FPSTR(T_DICT[lang][TD::D_WIFI_MQTT]));

// форма настроек Wi-Fi Client
interf->json_section_hidden(FPSTR(T_SET_WIFI), FPSTR(T_DICT[lang][TD::D_WiFiClient]));
interf->spacer(FPSTR(T_DICT[lang][TD::D_WiFiClientOpts]));
interf->text(FPSTR(P_hostname), FPSTR(T_DICT[lang][TD::D_Hostname]));
interf->text(FPSTR(P_WCSSID), WiFi.SSID(), FPSTR(T_DICT[lang][TD::D_WiFiSSID]), false);
interf->password(FPSTR(P_WCPASS), "", FPSTR(T_DICT[lang][TD::D_Password]));
interf->button_submit(FPSTR(T_SET_WIFI), FPSTR(T_DICT[lang][TD::D_CONNECT]), FPSTR(P_GRAY));
interf->json_section_end();

// форма настроек Wi-Fi AP
interf->json_section_hidden(FPSTR(T_SET_WIFIAP), FPSTR(T_DICT[lang][TD::D_WiFiAP]));
interf->text(FPSTR(P_hostname), FPSTR(T_DICT[lang][TD::D_Hostname]));
interf->spacer(FPSTR(T_DICT[lang][TD::D_WiFiAPOpts]));
interf->comment(FPSTR(T_DICT[lang][TD::D_MSG_APOnly]));
interf->checkbox(FPSTR(P_APonly), FPSTR(T_DICT[lang][TD::D_APOnlyMode]));
interf->password(FPSTR(P_APpwd), FPSTR(T_DICT[lang][TD::D_MSG_APProtect]));
interf->button_submit(FPSTR(T_SET_WIFIAP), FPSTR(T_DICT[lang][TD::D_SAVE]), FPSTR(P_GRAY));
interf->json_section_end();

// форма настроек MQTT
interf->json_section_hidden(FPSTR(T_SET_MQTT), FPSTR(T_DICT[lang][TD::D_MQTT]));
interf->text(FPSTR(P_m_host), FPSTR(T_DICT[lang][TD::D_MQTT_Host]));
interf->number(FPSTR(P_m_port), FPSTR(T_DICT[lang][TD::D_MQTT_Port]));
interf->text(FPSTR(P_m_user), FPSTR(T_DICT[lang][TD::D_User]));
interf->text(FPSTR(P_m_pass), FPSTR(T_DICT[lang][TD::D_Password]));
interf->text(FPSTR(P_m_pref), FPSTR(T_DICT[lang][TD::D_MQTT_Topic]));
interf->number(FPSTR(P_m_tupd), FPSTR(T_DICT[lang][TD::D_MQTT_Interval]));
interf->button_submit(FPSTR(T_SET_MQTT), FPSTR(T_DICT[lang][TD::D_CONNECT]), FPSTR(P_GRAY));
interf->json_section_end();

interf->spacer();
interf->button(FPSTR(T_SETTINGS), FPSTR(T_DICT[lang][TD::D_EXIT]));

interf->json_section_end();

interf->json_frame_flush();
}

/**
* BasicUI блок загрузки обновлений ПО
*/
void BasicUI::block_settings_update(Interface *interf, JsonObject *data){
if (!interf) return;
interf->json_section_hidden(FPSTR(T_DO_OTAUPD), FPSTR(T_DICT[lang][TD::D_Update]));
interf->spacer(FPSTR(T_DICT[lang][TD::D_FWLOAD]));
interf->file(FPSTR(T_DO_OTAUPD), FPSTR(T_DO_OTAUPD), FPSTR(T_DICT[lang][TD::D_UPLOAD]));
}

/**
* BasicUI блок настройки даты/времени
*/
void BasicUI::block_settings_time(Interface *interf, JsonObject *data){
if (!interf) return;
interf->json_frame_interface();

// Headline
interf->json_section_main(FPSTR(T_SET_TIME), FPSTR(T_DICT[lang][TD::D_DATETIME]));

interf->comment(FPSTR(T_DICT[lang][TD::D_MSG_TZSet01])); // комментарий-описание секции
interf->text(FPSTR(P_TZSET), FPSTR(T_DICT[lang][TD::D_MSG_TZONE]));
interf->text(FPSTR(P_userntp), FPSTR(T_DICT[lang][TD::D_NTP_Secondary]));
interf->text(FPSTR(P_DTIME), "", FPSTR(T_DICT[lang][TD::D_MSG_DATETIME]), false);
interf->button_submit(FPSTR(T_SET_TIME), FPSTR(T_DICT[lang][TD::D_SAVE]), FPSTR(P_GRAY));

interf->spacer();
interf->button(FPSTR(T_SETTINGS), FPSTR(T_DICT[lang][TD::D_EXIT]));

interf->json_section_end();
interf->json_frame_flush();
}

/**
* Обработчик настроек WiFi в режиме клиента
*/
void BasicUI::set_settings_wifi(Interface *interf, JsonObject *data){
if (!data) return;

SETPARAM(FPSTR(P_hostname)); // сохраняем hostname в конфиг

const char *ssid = (*data)[FPSTR(P_WCSSID)]; // переменные доступа в конфиге не храним
const char *pwd = (*data)[FPSTR(P_WCPASS)]; // фреймворк хранит последнюю доступную точку самостоятельно

if(ssid){
embui.wifi_connect(ssid, pwd);
} else {
LOG(println, F("UI WiFi: No SSID defined!"));
}

section_settings_frame(interf, data); // переходим в раздел "настройки"
}

/**
* Обработчик настроек WiFi в режиме AP
*/
void BasicUI::set_settings_wifiAP(Interface *interf, JsonObject *data){
if (!data) return;

SETPARAM(FPSTR(P_hostname)); // эти переменные будут сохранены в конфиг-файл
SETPARAM(FPSTR(P_APonly));
SETPARAM(FPSTR(P_APpwd));

embui.save();
embui.wifi_connect(); // иницируем WiFi-подключение с новыми параметрами

section_settings_frame(interf, data); // переходим в раздел "настройки"
}

/**
* Обработчик настроек MQTT
*/
void BasicUI::set_settings_mqtt(Interface *interf, JsonObject *data){
if (!data) return;
// сохраняем настройки в конфиг
SETPARAM(FPSTR(P_m_host));
SETPARAM(FPSTR(P_m_port));
SETPARAM(FPSTR(P_m_user));
SETPARAM(FPSTR(P_m_pass));
SETPARAM(FPSTR(P_m_pref));
SETPARAM(FPSTR(P_m_tupd));
//SETPARAM(FPSTR(P_m_tupd), some_mqtt_object.semqtt_int((*data)[FPSTR(P_m_tupd)]));

embui.save();

section_settings_frame(interf, data);
}

/**
* Обработчик настроек даты/времени
*/
void BasicUI::set_settings_time(Interface *interf, JsonObject *data){
if (!data) return;

String datetime=(*data)[FPSTR(P_DTIME)];
if (datetime.length())
embui.timeProcessor.setTime(datetime);
SETPARAM(FPSTR(P_TZSET), embui.timeProcessor.tzsetup((*data)[FPSTR(P_TZSET)]));
SETPARAM(FPSTR(P_userntp), embui.timeProcessor.setcustomntp((*data)[FPSTR(P_userntp)]));

section_settings_frame(interf, data);
}

void BasicUI::set_language(Interface *interf, JsonObject *data){
if (!data) return;

//lang = (*data)[FPSTR(P_LANGUAGE)].as<unsigned char>();
SETPARAM(FPSTR(P_LANGUAGE), lang = (*data)[FPSTR(P_LANGUAGE)].as<unsigned char>() );

section_settings_frame(interf, data);
}

void BasicUI::embuistatus(Interface *interf){
if (!interf) return;
interf->json_frame_value();
interf->value(F("pTime"), embui.timeProcessor.getFormattedShortTime(), true);
interf->value(F("pMem"), String(ESP.getFreeHeap()), true);
interf->value(F("pUptime"), String(millis()/1000), true);
interf->json_frame_flush();
}
71 changes: 71 additions & 0 deletions EmbUI/basicui.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/*
Here is a set of predefined WebUI elements for system settings setup like WiFi, time, MQTT, etc...
*/
#pragma once

#include "ui.h"
#include "i18n.h" // localized GUI text-strings

/**
* List of UI languages in predefined i18n resources
*/
enum LANG : uint8_t {
RU = (0U),
EN = (1U),
};

static uint8_t lang = LANG::RU; // default language for text resources

// UI blocks
static const char T_SETTINGS[] PROGMEM = "settings";
static const char T_OPT_NETW[] PROGMEM = "networking";

// UI handlers
static const char T_DO_OTAUPD[] PROGMEM = "update";
static const char T_SET_WIFI[] PROGMEM = "set_wifi";
static const char T_SET_WIFIAP[] PROGMEM = "set_wifiAP";
static const char T_SET_MQTT[] PROGMEM = "set_mqtt";
static const char T_SET_TIME[] PROGMEM = "set_time";

static const char T_SH_NETW[] PROGMEM = "sh_netw";
static const char T_SH_TIME[] PROGMEM = "sh_time";

/*
A class with static functions to handle basic WebUI interface
*/
class BasicUI {

public:

/**
* Define configuration variables and controls handlers
*
* Variables has literal names and are kept within json-configuration file on flash
* Control handlers are bound by literal name with a particular method. This method is invoked
* by manipulating controls
*
* this method owerrides weak definition in framework
*
*/
static void add_sections();

/**
* This code adds "Settings" section to the MENU
* it is up to you to properly open/close Interface json_section
*/
static void opt_setup(Interface *interf, JsonObject *data);

static void block_settings_netw(Interface *interf, JsonObject *data);
static void block_settings_update(Interface *interf, JsonObject *data);
static void block_settings_time(Interface *interf, JsonObject *data);

static void section_settings_frame(Interface *interf, JsonObject *data);
static void set_settings_wifi(Interface *interf, JsonObject *data);
static void set_settings_wifiAP(Interface *interf, JsonObject *data);
static void set_settings_mqtt(Interface *interf, JsonObject *data);
static void set_settings_time(Interface *interf, JsonObject *data);
static void set_language(Interface *interf, JsonObject *data);
static void embuistatus(Interface *interf);

//uint8_t uploadProgress(size_t len, size_t total);
};

0 comments on commit df8dd8a

Please sign in to comment.