Compare commits
2 Commits
a02756bd4f
...
c5c8bf80a7
Author | SHA1 | Date |
---|---|---|
Paul Warren | c5c8bf80a7 | |
Paul Warren | 8473a22d48 |
42
build.sh
42
build.sh
|
@ -1,47 +1,15 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
|
||||||
|
ARD_CMD='arduino -v --port /dev/ttyUSB0 --board esp8266:esp8266:d1_mini:xtal=80,baud=460800,ip=lm6f esp_time.ino'
|
||||||
|
|
||||||
opt=$1
|
opt=$1
|
||||||
case $opt in
|
case $opt in
|
||||||
-u) arduino --upload -v --port /dev/ttyUSB0 --board esp8266:esp8266:d1_mini:baud=460800,ip=lm6f esp_time.ino
|
-u) $ARD_CMD --upload
|
||||||
;;
|
;;
|
||||||
*) arduino --verify -v --board esp8266:esp8266:d1_mini:baud=460800,ip=lm6f esp_time.ino
|
*) $ARD_CMD --verify
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#arduino-builder -compile -logger=machine -hardware /usr/share/arduino/hardware -hardware /home/pwarren/.arduino15/packages -tools /usr/share/arduino/hardware/tools/avr -tools /home/pwarren/.arduino15/packages -libraries /home/pwarren/Arduino/libraries -
|
|
||||||
|
|
||||||
#fqbn=esp8266:esp8266:d1_mini:xtal=80,vt=flash,exception=disabled,stacksmash=disabled,ssl=all,mmu=3232,non32xfer=fast,eesz=4M2M,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=921600
|
#fqbn=esp8266:esp8266:d1_mini:xtal=80,vt=flash,exception=disabled,stacksmash=disabled,ssl=all,mmu=3232,non32xfer=fast,eesz=4M2M,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=921600
|
||||||
|
|
||||||
|
|
||||||
#-ide-version=10813 -build-path /tmp/arduino_build_776166 -warnings=all -build-cache /tmp/arduino_cache_36351 -prefs=build.warn_data_percentage=75 -prefs=runtime.tools.mkspiffs.path=/home/pwarren/.arduino15/packages/esp8266/tools/mkspiffs/3.0.4-gcc10.3-1757bed -prefs=runtime.tools.mkspiffs-3.0.4-gcc10.3-1757bed.path=/home/pwarren/.arduino15/packages/esp8266/tools/mkspiffs/3.0.4-gcc10.3-1757bed -prefs=runtime.tools.xtensa-lx106-elf-gcc.path=/home/pwarren/.arduino15/packages/esp8266/tools/xtensa-lx106-elf-gcc/3.0.4-gcc10.3-1757bed -prefs=runtime.tools.xtensa-lx106-elf-gcc-3.0.4-gcc10.3-1757bed.path=/home/pwarren/.arduino15/packages/esp8266/tools/xtensa-lx106-elf-gcc/3.0.4-gcc10.3-1757bed -prefs=runtime.tools.mklittlefs.path=/home/pwarren/.arduino15/packages/esp8266/tools/mklittlefs/3.0.4-gcc10.3-1757bed -prefs=runtime.tools.mklittlefs-3.0.4-gcc10.3-1757bed.path=/home/pwarren/.arduino15/packages/esp8266/tools/mklittlefs/3.0.4-gcc10.3-1757bed -prefs=runtime.tools.python3.path=/home/pwarren/.arduino15/packages/esp8266/tools/python3/3.7.2-post1 -prefs=runtime.tools.python3-3.7.2-post1.path=/home/pwarren/.arduino15/packages/esp8266/tools/python3/3.7.2-post1 -verbose /home/pwarren/Projects/esp_time/esp_time.ino
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# /home/pwarren/Projects/arduino-1.8.10/arduino-builder
|
|
||||||
# -dump-prefs
|
|
||||||
# -logger=machine
|
|
||||||
# -hardware /home/pwarren/Projects/arduino-1.8.10/hardware
|
|
||||||
# -hardware /home/pwarren/.arduino15/packages
|
|
||||||
# -tools /home/pwarren/Projects/arduino-1.8.10/tools-builder
|
|
||||||
# -tools /home/pwarren/Projects/arduino-1.8.10/hardware/tools/avr
|
|
||||||
# -tools /home/pwarren/.arduino15/packages
|
|
||||||
# -built-in-libraries /home/pwarren/Projects/arduino-1.8.10/libraries
|
|
||||||
# -libraries /home/pwarren/Arduino/libraries
|
|
||||||
# -fqbn=esp8266:esp8266:d1_mini:xtal=80,vt=flash,exception=legacy,ssl=all,eesz=4M2M,ip=lm6f,dbg=Disabled,lvl=None____,wipe=none,baud=460800
|
|
||||||
# -vid-pid=1A86_7523
|
|
||||||
# -ide-version=10810
|
|
||||||
# -build-path /tmp/arduino_build_589661
|
|
||||||
# -warnings=all
|
|
||||||
# -build-cache /tmp/arduino_cache_275875
|
|
||||||
# -prefs=build.warn_data_percentage=75
|
|
||||||
# -prefs=runtime.tools.xtensa-lx106-elf-gcc.path=/home/pwarren/.arduino15/packages/esp8266/tools/xtensa-lx106-elf-gcc/2.5.0-4-b40a506
|
|
||||||
# -prefs=runtime.tools.xtensa-lx106-elf-gcc-2.5.0-4-b40a506.path=/home/pwarren/.arduino15/packages/esp8266/tools/xtensa-lx106-elf-gcc/2.5.0-4-b40a506
|
|
||||||
# -prefs=runtime.tools.python3.path=/home/pwarren/.arduino15/packages/esp8266/tools/python3/3.7.2-post1 -prefs=runtime.tools.python3-3.7.2-post1.path=/home/pwarren/.arduino15/packages/esp8266/tools/python3/3.7.2-post1
|
|
||||||
# -prefs=runtime.tools.mklittlefs.path=/home/pwarren/.arduino15/packages/esp8266/tools/mklittlefs/2.5.0-4-69bd9e6
|
|
||||||
# -prefs=runtime.tools.mklittlefs-2.5.0-4-69bd9e6.path=/home/pwarren/.arduino15/packages/esp8266/tools/mklittlefs/2.5.0-4-69bd9e6
|
|
||||||
# -prefs=runtime.tools.mkspiffs.path=/home/pwarren/.arduino15/packages/esp8266/tools/mkspiffs/2.5.0-4-b40a506
|
|
||||||
# -prefs=runtime.tools.mkspiffs-2.5.0-4-b40a506.path=/home/pwarren/.arduino15/packages/esp8266/tools/mkspiffs/2.5.0-4-b40a506
|
|
||||||
# -verbose /tmp/arduino_modified_sketch_422089/IPv6.ino
|
|
||||||
|
|
46
esp_time.ino
46
esp_time.ino
|
@ -265,46 +265,48 @@ void weatherUpdate(void) {
|
||||||
|
|
||||||
const char* today_day = jsonBuffer["today"]["day"]; // "Wednesday"
|
const char* today_day = jsonBuffer["today"]["day"]; // "Wednesday"
|
||||||
const char* today_icon = jsonBuffer["today"]["icon"]; // "sunny.jpg"
|
const char* today_icon = jsonBuffer["today"]["icon"]; // "sunny.jpg"
|
||||||
const char* today_max = jsonBuffer["today"]["max"]; // "27"
|
int today_max = jsonBuffer["today"]["max"]; // "27"
|
||||||
|
|
||||||
const char* tomorrow_day = jsonBuffer["tomorrow"]["day"]; // "Thursday"
|
const char* tomorrow_day = jsonBuffer["tomorrow"]["day"]; // "Thursday"
|
||||||
const char* tomorrow_icon = jsonBuffer["tomorrow"]["icon"]; // "sunny.jpg"
|
const char* tomorrow_icon = jsonBuffer["tomorrow"]["icon"]; // "sunny.jpg"
|
||||||
const char* tomorrow_max = jsonBuffer["tomorrow"]["max"]; // "31"
|
int tomorrow_max = jsonBuffer["tomorrow"]["max"]; // "31"
|
||||||
|
|
||||||
const char* day_after_day = jsonBuffer["day_after"]["day"]; // "Friday"
|
const char* day_after_day = jsonBuffer["day_after"]["day"]; // "Friday"
|
||||||
const char* day_after_icon = jsonBuffer["day_after"]["icon"]; // "pcloud.jpg"
|
const char* day_after_icon = jsonBuffer["day_after"]["icon"]; // "pcloud.jpg"
|
||||||
const char* day_after_max = jsonBuffer["day_after"]["max"]; // "33"
|
int day_after_max = jsonBuffer["day_after"]["max"]; // "33"
|
||||||
|
|
||||||
current_outside = jsonBuffer["current"]["outside"];
|
int current_outside = jsonBuffer["current"]["outside"];
|
||||||
current_bedroom = jsonBuffer["current"]["bedroom"];
|
int current_bedroom = jsonBuffer["current"]["bedroom"];
|
||||||
current_lounge = jsonBuffer["current"]["lounge"];
|
int current_lounge = jsonBuffer["current"]["lounge"];
|
||||||
|
|
||||||
Serial.println("Updating EPD with weather");
|
Serial.println("Updating EPD with weather");
|
||||||
|
|
||||||
epd_set_en_font(ASCII64);
|
epd_set_en_font(ASCII64);
|
||||||
|
|
||||||
//Today
|
//Today
|
||||||
epd_disp_bitmap(today_icon, 0, 290);
|
epd_disp_bitmap(today_icon, 0, 290);
|
||||||
epd_disp_string(today_day, 0, 536);
|
epd_disp_string(today_day, 0, 536);
|
||||||
epd_disp_string(today_max, 75, 460);
|
sprintf(buf, "%d", today_max);
|
||||||
|
epd_disp_string(buf, 75, 460);
|
||||||
|
|
||||||
//Tomorrow
|
//Tomorrow
|
||||||
epd_disp_bitmap(tomorrow_icon, 267, 290);
|
epd_disp_bitmap(tomorrow_icon, 267, 290);
|
||||||
epd_disp_string(tomorrow_day, 260, 536);
|
epd_disp_string(tomorrow_day, 260, 536);
|
||||||
epd_disp_string(tomorrow_max, 352, 460);
|
sprintf(buf, "%d", tomorrow_max);
|
||||||
|
epd_disp_string(buf, 352, 460);
|
||||||
|
|
||||||
//Day After
|
//Day After
|
||||||
epd_disp_bitmap(day_after_icon, 533, 290);
|
epd_disp_bitmap(day_after_icon, 533, 290);
|
||||||
epd_disp_string(day_after_day, 533, 536);
|
epd_disp_string(day_after_day, 533, 536);
|
||||||
epd_disp_string(day_after_max, 615, 460);
|
sprintf(buf, "%d", day_after_max);
|
||||||
|
epd_disp_string(buf, 615, 460);
|
||||||
Serial.println("Adding Temps");
|
|
||||||
sprintf(buf, "E: %s I: %s",
|
//Serial.println("Adding Temps");
|
||||||
|
sprintf(buf, "E: %d I: %d",
|
||||||
current_outside,
|
current_outside,
|
||||||
current_lounge);
|
current_lounge);
|
||||||
Serial.println(buf);
|
//Serial.println(buf);
|
||||||
|
epd_disp_string(buf, 500, 225);
|
||||||
epd_disp_string(buf, 500, 225);
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
Serial.print("Error on HTTP Request: ");
|
Serial.print("Error on HTTP Request: ");
|
||||||
|
@ -331,17 +333,23 @@ void loop() {
|
||||||
Serial.print("Weather details sent: ");
|
Serial.print("Weather details sent: ");
|
||||||
Serial.println(second(now()));
|
Serial.println(second(now()));
|
||||||
printDateTime(1);
|
printDateTime(1);
|
||||||
|
Serial.println("Waiting on minute to change");
|
||||||
while (second(now()) != 0) {
|
while (second(now()) != 0) {
|
||||||
delay(500);
|
delay(500);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Serial.println("EPD Update");
|
||||||
epd_update();
|
epd_update();
|
||||||
delay(1500);
|
delay(4000);
|
||||||
|
Serial.println("EPD Stop");
|
||||||
epd_enter_stopmode();
|
epd_enter_stopmode();
|
||||||
|
|
||||||
sleep_seconds = wakeup_seconds - second(now());
|
sleep_seconds = wakeup_seconds - second(now());
|
||||||
|
|
||||||
|
if (sleep_seconds < 0) {
|
||||||
|
sleep_seconds = 10;
|
||||||
|
}
|
||||||
|
|
||||||
Serial.print("Sleeping for: ");
|
Serial.print("Sleeping for: ");
|
||||||
Serial.println(sleep_seconds);
|
Serial.println(sleep_seconds);
|
||||||
|
|
Loading…
Reference in New Issue