iot/yoradio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wind_fix

Browse Source
This commit is contained in:
e2002
2023-03-03 12:56:33 +03:00
parent 5a0984fa89
commit 0cb70f2c2a
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
yoRadio/locale/displayL10n_en.h
View File

@@ -35,19 +35,19 @@ const char oct[] PROGMEM = "october";
const char nov[] PROGMEM = "november";
const char dec[] PROGMEM = "december";
const char wn_N[] PROGMEM = "N";
const char wn_N[] PROGMEM = "NORTH";
const char wn_NNE[] PROGMEM = "NNE";
const char wn_NE[] PROGMEM = "NE";
const char wn_ENE[] PROGMEM = "ENE";
const char wn_E[] PROGMEM = "E";
const char wn_E[] PROGMEM = "EAST";
const char wn_ESE[] PROGMEM = "ESE";
const char wn_SE[] PROGMEM = "SE";
const char wn_SSE[] PROGMEM = "SSE";
const char wn_S[] PROGMEM = "S";
const char wn_S[] PROGMEM = "SOUTH";
const char wn_SSW[] PROGMEM = "SSW";
const char wn_SW[] PROGMEM = "SW";
const char wn_WSW[] PROGMEM = "WSW";
const char wn_W[] PROGMEM = "W";
const char wn_W[] PROGMEM = "WEST";
const char wn_WNW[] PROGMEM = "WNW";
const char wn_NW[] PROGMEM = "NW";
const char wn_NNW[] PROGMEM = "NNW";
@@ -71,7 +71,7 @@ const char apPassTxt[] PROGMEM = "PASSWORD";
const char bootstrFmt[] PROGMEM = "Trying to %s";
const char apSettFmt[] PROGMEM = "SETTINGS PAGE ON: HTTP://%s/";
#if EXT_WEATHER
const char weatherFmt[] PROGMEM = "%s, %.1f\011C \007 feels like: %.1f\011C \007 pressure: %d мм * humidity: %s%% \007 wind: %s\027%.1f m/s";
const char weatherFmt[] PROGMEM = "%s, %.1f\011C \007 feels like: %.1f\011C \007 pressure: %d мм * humidity: %s%% \007 wind: %.1f m/s [%s]";
#else
const char weatherFmt[] PROGMEM = "%s, %.1f\011C \007 pressure: %d mm \007 humidity: %s%%";
#endif

10
yoRadio/locale/displayL10n_ru.h
View File

@@ -35,19 +35,19 @@ const char oct[] PROGMEM = "октября";
const char nov[] PROGMEM = "ноября";
const char dec[] PROGMEM = "декабря";
const char wn_N[] PROGMEM = "С";
const char wn_N[] PROGMEM = "СЕВ";
const char wn_NNE[] PROGMEM = "ССВ";
const char wn_NE[] PROGMEM = "СВ";
const char wn_ENE[] PROGMEM = "ВСВ";
const char wn_E[] PROGMEM = "В";
const char wn_E[] PROGMEM = "ВОСТ";
const char wn_ESE[] PROGMEM = "ВЮВ";
const char wn_SE[] PROGMEM = "ЮВ";
const char wn_SSE[] PROGMEM = "ЮЮВ";
const char wn_S[] PROGMEM = "Ю";
const char wn_S[] PROGMEM = "ЮЖ";
const char wn_SSW[] PROGMEM = "ЮЮЗ";
const char wn_SW[] PROGMEM = "ЮЗ";
const char wn_WSW[] PROGMEM = "ЗЮЗ";
const char wn_W[] PROGMEM = "З";
const char wn_W[] PROGMEM = "ЗАП";
const char wn_WNW[] PROGMEM = "ЗСЗ";
const char wn_NW[] PROGMEM = "СЗ";
const char wn_NNW[] PROGMEM = "ССЗ";
@@ -71,7 +71,7 @@ const char apPassTxt[] PROGMEM = "ПАРОЛЬ";
const char bootstrFmt[] PROGMEM = "Соединяюсь с %s";
const char apSettFmt[] PROGMEM = "НАСТРОЙКИ: HTTP://%s/";
#if EXT_WEATHER
const char weatherFmt[] PROGMEM = "%s, %.1f\011C \007 ощущается: %.1f\011C \007 давление: %d мм \007 влажность: %s%% \007 ветер: %s\027%.1f м/с";
const char weatherFmt[] PROGMEM = "%s, %.1f\011C \007 ощущается: %.1f\011C \007 давление: %d мм \007 влажность: %s%% \007 ветер: %.1f м/с [%s]";
#else
const char weatherFmt[] PROGMEM = "%s, %.1f\011C \007 давление: %d mm \007 влажность: %s%%";
#endif

2
yoRadio/src/core/network.cpp
View File

@@ -324,7 +324,7 @@ bool getWeather(char *wstr) {
sprintf(wstr, weatherFmt, tempf, pressi, hum);
#else
#if EXT_WEATHER
sprintf(wstr, weatherFmt, desc, tempf, tempfl, pressi, hum, wind[wind_deg], wind_speed);
sprintf(wstr, weatherFmt, desc, tempf, tempfl, pressi, hum, wind_speed, wind[wind_deg]);
#else
sprintf(wstr, weatherFmt, desc, tempf, pressi, hum);
#endif