projects/esp-weather-station
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix l10n and WiFi connect issues

Browse Source
This commit is contained in:
Marcel Stör
2018-09-16 22:25:25 +02:00
parent e9063650d9
commit ba74e3c2a8
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
esp8266-weather-station-color.ino
View File

@@ -136,6 +136,7 @@ void connectWifi() {
Serial.print(WIFI_SSID); Serial.print(WIFI_SSID);
Serial.print("/"); Serial.print("/");
Serial.println(WIFI_PASS); Serial.println(WIFI_PASS);
WiFi.disconnect();
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
WiFi.hostname(WIFI_HOSTNAME); WiFi.hostname(WIFI_HOSTNAME);
WiFi.begin(WIFI_SSID,WIFI_PASS); WiFi.begin(WIFI_SSID,WIFI_PASS);
@@ -341,8 +342,7 @@ void drawTime() {
gfx.setTextAlignment(TEXT_ALIGN_CENTER); gfx.setTextAlignment(TEXT_ALIGN_CENTER);
gfx.setFont(ArialRoundedMTBold_14); gfx.setFont(ArialRoundedMTBold_14);
gfx.setColor(MINI_WHITE); gfx.setColor(MINI_WHITE);
String date = ctime(&now); String date = WDAY_NAMES[timeinfo->tm_wday] + " " + MONTH_NAMES[timeinfo->tm_mon] + " " + String(timeinfo->tm_mday) + " " + String(1900 + timeinfo->tm_year);
date = date.substring(0,11) + String(1900 + timeinfo->tm_year);
gfx.drawString(120, 6, date); gfx.drawString(120, 6, date);
gfx.setFont(ArialRoundedMTBold_36); gfx.setFont(ArialRoundedMTBold_36);
@@ -443,23 +443,23 @@ void drawAstronomy() {
gfx.setTextAlignment(TEXT_ALIGN_LEFT); gfx.setTextAlignment(TEXT_ALIGN_LEFT);
gfx.setColor(MINI_YELLOW); gfx.setColor(MINI_YELLOW);
gfx.drawString(5, 250, "Sun"); gfx.drawString(5, 250, SUN_MOON_TEXT[0]);
gfx.setColor(MINI_WHITE); gfx.setColor(MINI_WHITE);
time_t time = currentWeather.sunrise + dstOffset; time_t time = currentWeather.sunrise + dstOffset;
gfx.drawString(5, 276, "Rise:"); gfx.drawString(5, 276, SUN_MOON_TEXT[1] + ":");
gfx.drawString(45, 276, getTime(&time)); gfx.drawString(45, 276, getTime(&time));
time = currentWeather.sunset + dstOffset; time = currentWeather.sunset + dstOffset;
gfx.drawString(5, 291, "Set:"); gfx.drawString(5, 291, SUN_MOON_TEXT[2] + ":");
gfx.drawString(45, 291, getTime(&time)); gfx.drawString(45, 291, getTime(&time));
gfx.setTextAlignment(TEXT_ALIGN_RIGHT); gfx.setTextAlignment(TEXT_ALIGN_RIGHT);
gfx.setColor(MINI_YELLOW); gfx.setColor(MINI_YELLOW);
gfx.drawString(235, 250, "Moon"); gfx.drawString(235, 250, SUN_MOON_TEXT[3]);
gfx.setColor(MINI_WHITE); gfx.setColor(MINI_WHITE);
gfx.drawString(235, 276, String(moonAge) + "d"); gfx.drawString(235, 276, String(moonAge) + "d");
gfx.drawString(235, 291, String(moonData.illumination * 100, 0) + "%"); gfx.drawString(235, 291, String(moonData.illumination * 100, 0) + "%");
gfx.drawString(200, 276, "Age:"); gfx.drawString(200, 276, SUN_MOON_TEXT[4] + ":");
gfx.drawString(200, 291, "Illum:"); gfx.drawString(200, 291, SUN_MOON_TEXT[5] + ":");
} }
@@ -639,4 +639,3 @@ String getTime(time_t *timestamp) {
sprintf(buf, "%02d:%02d", timeInfo->tm_hour, timeInfo->tm_min); sprintf(buf, "%02d:%02d", timeInfo->tm_hour, timeInfo->tm_min);
return String(buf); return String(buf);
} }

2
settings.h
View File

@@ -55,6 +55,7 @@ const uint8_t MAX_FORECASTS = 10;
// Adjust according to your language // Adjust according to your language
const String WDAY_NAMES[] = {"SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"}; const String WDAY_NAMES[] = {"SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"};
const String MONTH_NAMES[] = {"JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"}; const String MONTH_NAMES[] = {"JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"};
const String SUN_MOON_TEXT[] = {"Sun", "Rise", "Set", "Moon", "Age", "Illum"};
const String MOON_PHASES[] = {"New Moon", "Waxing Crescent", "First Quarter", "Waxing Gibbous", const String MOON_PHASES[] = {"New Moon", "Waxing Crescent", "First Quarter", "Waxing Gibbous",
"Full Moon", "Waning Gibbous", "Third quarter", "Waning Crescent"}; "Full Moon", "Waning Gibbous", "Third quarter", "Waning Crescent"};
@@ -92,4 +93,3 @@ bool IS_STYLE_12HR = false;
/*************************** /***************************
* End Settings * End Settings
**************************/ **************************/