Skip to content

Poprawka warunkowania BUILD_VERSION i SUPLA_OTA #4

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

Merged
krycha88 merged 10 commits into from
Feb 22, 2021
Merged

Poprawka warunkowania BUILD_VERSION i SUPLA_OTA #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
33257b3
Update SuplaDeviceGUI.cpp
Goral64 Feb 19, 2021
8ffa49f
Update SuplaDeviceGUI.cpp
Goral64 Feb 19, 2021
caae61e
Update SuplaWebServer.cpp
Goral64 Feb 19, 2021
cee7b98
Merge branch 'master' of https://github.com/Goral64/GUI-Generic
Goral64 Feb 19, 2021
5afbfb4
Dodanie fontów z polskimi znakami (WIN1250) oraz konwerter UTF-8 do
Goral64 Feb 19, 2021
5e06993
Zmiana liter w include zgodna z nazwą pliku nagłówkowego (dla linuksa)
Goral64 Feb 21, 2021
40d9e48
Zmiana liter w include zgodna z nazwą pliku nagłówkowego (dla linuksa)
Goral64 Feb 21, 2021
73455e9
Zmiana liter w include zgodna z nazwą pliku nagłówkowego (dla linuksa)
Goral64 Feb 21, 2021
9737c6a
Poprawienie znalezionych literówek dla polskiego tłumaczenia
Goral64 Feb 21, 2021
187b403
Scalenie polskich fontów i konwertera znaków do SuplaOled
Goral64 Feb 21, 2021
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
4 changes: 2 additions & 2 deletions lib/SuplaDevice/src/supla/sensor/HJ101.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "hj101.h"
#include "HJ101.h"

namespace Supla {
namespace Sensor {
Expand Down Expand Up @@ -175,4 +175,4 @@ void HJ101::calibrate(double calibPower, double calibVoltage) {

HLW8012 *HJ101::hj101 = nullptr;
}; // namespace Sensor
}; // namespace Supla
}; // namespace Supla
4 changes: 2 additions & 2 deletions src/GUI-Generic_Config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#define supla_lib_config_h_ // silences unnecessary debug messages "should be disabled by default"
#endif

//#define USE_CUSTOM
// #define USE_CUSTOM

// User configuration
#ifdef USE_CUSTOM
Expand Down Expand Up @@ -38,7 +38,7 @@
#define SUPLA_SHT3x
#define SUPLA_SI7021
#define SUPLA_OLED
//#define SUPLA_MCP23017
// #define SUPLA_MCP23017
// #define SUPLA_HTU21D // 0x40 NOT SUPPORTED
// #define SUPLA_SHT71 // 0x44 AND 0x45 NOT SUPPORTED
// #define SUPLA_BH1750 // 0x23 AND 0x5C NOT SUPPORTED
Expand Down
2 changes: 2 additions & 0 deletions src/SuplaDeviceGUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ void begin() {

SuplaDevice.setName(ConfigManager->get(KEY_HOST_NAME)->getValue());

#ifdef BUILD_VERSION
SuplaDevice.setSwVersion(BUILD_VERSION);
#endif

SuplaDevice.begin((char *)ConfigManager->get(KEY_SUPLA_GUID)->getValue(), // Global Unique Identifier
ConfigManager->get(KEY_SUPLA_SERVER)->getValue(), // SUPLA server address
Expand Down
106 changes: 91 additions & 15 deletions src/SuplaOled.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void displayUiSignal(OLEDDisplay* display) {
display->fillRect(x, y, x + 46, 16);
display->setColor(WHITE);
if (value == -1) {
display->setFont(ArialMT_Plain_10);
display->setFont(ArialMT_Win1250_Plain_10);
display->drawString(x + 1, y, "x");
}
else {
Expand All @@ -75,7 +75,7 @@ void displayUiRelayState(OLEDDisplay* display) {
int y = 0;
int x = 0;

display->setFont(ArialMT_Plain_10);
display->setFont(ArialMT_Win1250_Plain_10);
display->setTextAlignment(TEXT_ALIGN_LEFT);
for (int i = 0; i < Supla::GUI::relay.size(); i++) {
if (Supla::GUI::relay[i]->isOn()) {
Expand Down Expand Up @@ -112,7 +112,7 @@ void displayUiSuplaStatus(OLEDDisplay* display) {

displayUiSignal(display);

display->setFont(ArialMT_Plain_10);
display->setFont(ArialMT_Win1250_Plain_10);
display->setTextAlignment(TEXT_ALIGN_LEFT);
display->setColor(WHITE);
display->drawStringMaxWidth(x, y, display->getWidth(), ConfigESP->supla_status.msg);
Expand All @@ -121,7 +121,7 @@ void displayUiSuplaStatus(OLEDDisplay* display) {

void displayConfigMode(OLEDDisplay* display) {
display->clear();
display->setFont(ArialMT_Plain_10);
display->setFont(ArialMT_Win1250_Plain_10);
display->setTextAlignment(TEXT_ALIGN_LEFT);
display->setColor(WHITE);
display->drawString(0, 15, F("Tryb konfiguracyjny"));
Expand All @@ -134,7 +134,7 @@ void displayConfigMode(OLEDDisplay* display) {
void displayUiBlank(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
// display->drawXbm(10, 17, supla_logo_width, supla_logo_height, supla_logo_bits);
display->setTextAlignment(TEXT_ALIGN_LEFT);
display->setFont(ArialMT_Plain_16);
display->setFont(ArialMT_Win1250_Plain_16);
display->drawString(10, display->getHeight() / 2, F("SUPLA"));
}

Expand All @@ -159,13 +159,13 @@ void displayUiTemperature(OLEDDisplay* display, OLEDDisplayUiState* state, int16
}

if (name != NULL) {
display->setFont(ArialMT_Plain_10);
display->setFont(ArialMT_Win1250_Plain_10);
display->drawString(x + TEMP_WIDTH + 20, y + display->getHeight() / 2 - 15, name);
}

display->setFont(ArialMT_Plain_24);
display->setFont(ArialMT_Win1250_Plain_24);
display->drawString(x + temp_width, y + drawStringIcon, getTempString(temp));
display->setFont(ArialMT_Plain_16);
display->setFont(ArialMT_Win1250_Plain_16);
display->drawString(x + temp_width + (getTempString(temp).length() * 12), y + drawStringIcon, "ºC");
}

Expand All @@ -189,13 +189,13 @@ void displaUiHumidity(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t x
}

if (name != NULL) {
display->setFont(ArialMT_Plain_10);
display->setFont(ArialMT_Win1250_Plain_10);
display->drawString(x + TEMP_WIDTH + 20, y + display->getHeight() / 2 - 15, name);
}

display->setFont(ArialMT_Plain_24);
display->setFont(ArialMT_Win1250_Plain_24);
display->drawString(x + humidity_width, y + drawStringIcon, getHumidityString(humidity));
display->setFont(ArialMT_Plain_16);
display->setFont(ArialMT_Win1250_Plain_16);
display->drawString(x + humidity_width + (getHumidityString(humidity).length() * 12), y + drawStringIcon, "%");
}

Expand All @@ -219,13 +219,13 @@ void displayUiPressure(OLEDDisplay* display, OLEDDisplayUiState* state, int16_t
}

if (name != NULL) {
display->setFont(ArialMT_Plain_10);
display->setFont(ArialMT_Win1250_Plain_10);
display->drawString(x + TEMP_WIDTH + 20, y + display->getHeight() / 2 - 15, name);
}

display->setFont(ArialMT_Plain_24);
display->setFont(ArialMT_Win1250_Plain_24);
display->drawString(x + pressure_width, y + drawStringIcon, getPressureString(pressure));
display->setFont(ArialMT_Plain_16);
display->setFont(ArialMT_Win1250_Plain_16);
display->drawString(x + pressure_width + (getPressureString(pressure).length() * 14), y + drawStringIcon, "hPa");
}

Expand Down Expand Up @@ -369,6 +369,7 @@ SuplaOled::SuplaOled() {

display->setBrightness(255);
display->flipScreenVertically();
display->setFontTableLookupFunction(&utf8win1250);
}
}

Expand Down Expand Up @@ -423,4 +424,79 @@ void SuplaOled::handleAction(int event, int action) {
oledON = true;
}
}
#endif

// In ESP8266 Arduino core v2.3.0 missing bsearch: https://github.com/esp8266/Arduino/issues/2314
// Part of GNU C Library
void * gnu_c_bsearch (const void *key, const void *base, size_t nmemb, size_t size, int (*compar) (const void *, const void *)) {
size_t l, u, idx;
const void *p;
int comparison;

l = 0;
u = nmemb;
while (l < u) {
idx = (l + u) / 2;

p = (void *) (((const char *) base) + (idx * size));
comparison = (*compar) (key, p);
if (comparison < 0)
u = idx;
else if (comparison > 0)
l = idx + 1;
else
return (void *) p;
}

return NULL;
}

// compare function for bsearch
int charset_table_cmp(const void* p_key, const void* p_item) {
const uint16_t key = *(uint16_t *) p_key;
const uint16_t item = (*((char *) p_item)) << 8 | *(((char *) p_item) + 1);

if (key < item) return -1;
else if (key == item) return 0;
else return 1;
}

// convert utf-8 character to windows-1250
// if utf-8 char continue with next byte, returns 0, otherwise windows-1250 char
// for unconvertable char returns 0
char utf8win1250(const uint8_t ch) {
static uint16_t uChar;
static uint8_t len;
char *found;

if ((ch & 0x80) == 0x00) {
uChar = len = 0;
return ch;
} else if ((ch & 0xE0) == 0xC0) {
uChar = ch & 0x1F; len = 1;
return 0;
} else if ((ch & 0xF0) == 0xE0) {
uChar = ch & 0x0F; len = 2;
return 0;
} else if ((ch & 0xF8) == 0xF0) {
uChar = ch & 0x07; len = 3;
return 0;
} else if ((ch & 0xC0) == 0x80 && len > 0) {
uChar = (uChar << 6) | (ch & 0x7F); len--;
if (len > 0)
return 0;
} else {
uChar = len = 0;
return 0;
}

found = (char*) gnu_c_bsearch(&uChar, utf8_win1250_table + 1, utf8_win1250_table[0], 3 * sizeof(char), charset_table_cmp);

if (found != NULL) {
uChar = len = 0;
return *(found + 2); // return win1250 char at 3rd position;
}

return 0;
}

#endif
Loading