Skip to content

Commit

Permalink
Merge with local Branch.
Browse files Browse the repository at this point in the history
  • Loading branch information
@MKO1640
MKO1640 committed May 31, 2020
1 parent 990adce commit a4fbc63
Show file tree
Hide file tree
Showing 6 changed files with 163 additions and 47 deletions.
5 changes: 5 additions & 0 deletions lib/hiveeyes/hive_record.h
View file
Expand Up @@ -9,7 +9,12 @@ typedef struct {
float humidity_outside;
float temperature_inside_1;
float temperature_inside_2;
float temperature_inside_3;
float temperature_inside_4;
float temperature_inside_5;
float weight;
float voltage;
float rssi;
} Hive_record_type;

#endif /* ifndef HIVE_RECORD_H_ */
33 changes: 23 additions & 10 deletions lib/hiveeyes/hiveeyes_client.h
View file
Expand Up @@ -19,18 +19,30 @@ bool decode_data(WiFiClient& json) {
Serial.println(error.c_str());
return false;
}

for (int i = 0; i < max_readings_hiveeyes; i++) {

if (max_readings_hiveeyes > doc.size()) {
hive_readings = doc.size();
}
else
{
hive_readings = max_readings_hiveeyes;
}
Serial.println(" Decoding hiveeyes data");
for (int i = 0; i < hive_readings; i++) {

JsonObject reading = doc[i];

hive_data[i].time = reading["time"].as<char*>();
hive_data[i].temperature_outside = reading["temperature.0x77.i2c:0"];
hive_data[i].humidity_outside = reading["humidity.0x77.i2c:0"];
hive_data[i].temperature_inside_1 = reading["temperature.28ff641d8fc3944f.onewire:0"];
hive_data[i].temperature_inside_2 = reading["temperature.28ff641d8fdf18c1.onewire:0"];
hive_data[i].weight = reading["weight.0"];

hive_data[i].temperature_outside = reading[ReadingTemperature_outside];
hive_data[i].humidity_outside = reading[ReadingHumidity_outside];
hive_data[i].temperature_inside_1 = reading[ReadingTemperature_inside_1];
hive_data[i].temperature_inside_2 = reading[ReadingTemperature_inside_2];
hive_data[i].temperature_inside_3 = reading[ReadingTemperature_inside_3];
hive_data[i].temperature_inside_4 = reading[ReadingTemperature_inside_4];
hive_data[i].temperature_inside_5 = reading[ReadingTemperature_inside_5];
hive_data[i].weight = reading[ReadingWeight];
hive_data[i].voltage = reading[ReadingVoltage];
hive_data[i].rssi = reading[ReadingRssi];
}

return true;
Expand All @@ -41,10 +53,11 @@ bool obtain_hiveeyes_data(WiFiClient& client) {
// Define URI.
// https://getkotori.org/docs/handbook/export/
HTTPClient http;
http.useHTTP10(true);
String server = hiveeyes_server;

// TODO: Improve Kotori by requesting only last reading.
String uri = hiveeyes_uri + "?from=now-1m";
String uri = hiveeyes_uri + hiveeyes_readTime;

// Make HTTP request.
//http.begin(uri, test_root_ca); // HTTPS example connection
Expand All @@ -54,7 +67,7 @@ bool obtain_hiveeyes_data(WiFiClient& client) {
if (httpCode == HTTP_CODE_OK) {
if (!decode_data(http.getStream())) return false;
success = true;

Serial.println("Connection Hiveeyes OK");
} else {
Serial.printf("Connection failed, error: %s", http.errorToString(httpCode).c_str());
success = false;
Expand Down
9 changes: 8 additions & 1 deletion platformio.ini
View file
Expand Up @@ -13,10 +13,17 @@
[env:esp32]
platform = espressif32
board = esp32dev
board_build.flash_mode = qio
framework = arduino

board_build.mcu = esp32
board_build.f_cpu = 240000000L
upload_protocol = esptool
upload_port = /dev/ttyS13
upload_speed = 115200
monitor_port = /dev/ttyS13
monitor_speed = 115200


lib_deps =
Wire
ArduinoJson@6.15.2
Expand Down
120 changes: 93 additions & 27 deletions src/hiveeyes-epaper.ino
View file
Expand Up @@ -30,10 +30,10 @@
#include "epaper_fonts.h"
#include "forecast_record.h"
#include "hive_record.h"
#include "lang.h"
//#include "lang.h"
//#include "lang_cz.h" // Localisation (Czech)
//#include "lang_fr.h" // Localisation (French)
//#include "lang_gr.h" // Localisation (German)
#include "lang_gr.h" // Localisation (German)
//#include "lang_it.h" // Localisation (Italian)
//#include "lang_nl.h" // Localisation (Dutch)
//#include "lang_pl.h" // Localisation (Polish)
Expand All @@ -44,22 +44,23 @@
enum alignment {LEFT, RIGHT, CENTER};

// Connections for e.g. LOLIN D32
static const uint8_t EPD_BUSY = 4; // to EPD BUSY
static const uint8_t EPD_CS = 5; // to EPD CS
static const uint8_t EPD_RST = 16; // to EPD RST
static const uint8_t EPD_DC = 17; // to EPD DC
static const uint8_t EPD_SCK = 18; // to EPD CLK
static const uint8_t EPD_MISO = 19; // Master-In Slave-Out not used, as no data from display
static const uint8_t EPD_MOSI = 23; // to EPD DIN
//static const uint8_t EPD_BUSY = 4; // to EPD BUSY
//static const uint8_t EPD_CS = 5; // to EPD CS
//static const uint8_t EPD_RST = 16; // to EPD RST
//static const uint8_t EPD_DC = 17; // to EPD DC
//static const uint8_t EPD_SCK = 18; // to EPD CLK
//static const uint8_t EPD_MISO = 19; // Master-In Slave-Out not used, as no data from display
//static const uint8_t EPD_MOSI = 23; // to EPD DIN

// Connections for e.g. Waveshare ESP32 e-Paper Driver Board
//static const uint8_t EPD_BUSY = 25;
//static const uint8_t EPD_CS = 15;
//static const uint8_t EPD_RST = 26;
//static const uint8_t EPD_DC = 27;
//static const uint8_t EPD_SCK = 13;
//static const uint8_t EPD_MISO = 12; // Master-In Slave-Out not used, as no data from display
//static const uint8_t EPD_MOSI = 14;
static const uint8_t EPD_BUSY = 25;
static const uint8_t EPD_CS = 15;
static const uint8_t EPD_RST = 26;
static const uint8_t EPD_DC = 27;
static const uint8_t EPD_SCK = 13;
static const uint8_t EPD_MISO = 12; // Master-In Slave-Out not used, as no data from display
static const uint8_t EPD_MOSI = 14;
static const uint8_t BATTERY_PIN = 35; //

GxEPD2_BW<GxEPD2_420, GxEPD2_420::HEIGHT> display(GxEPD2_420(/*CS=D8*/ EPD_CS, /*DC=D3*/ EPD_DC, /*RST=D4*/ EPD_RST, /*BUSY=D2*/ EPD_BUSY));

Expand Down Expand Up @@ -92,6 +93,7 @@ Forecast_record_type WxForecast[max_readings];
#include <common.h>

#define max_readings_hiveeyes 24
int hive_readings;
Hive_record_type hive_data[max_readings_hiveeyes];
#include "hiveeyes_client.h"

Expand All @@ -106,30 +108,35 @@ float temperature_readings[max_readings] = {0};
float humidity_readings[max_readings] = {0};
float rain_readings[max_readings] = {0};
float snow_readings[max_readings] = {0};
float weight_readings[max_readings_hiveeyes] = {0};

long SleepDuration = 30; // Sleep time in minutes, aligned to the nearest minute boundary, so if 30 will always update at 00 or 30 past the hour
int WakeupTime = 7; // Don't wakeup until after 07:00 to save battery power
int SleepTime = 23; // Sleep after (23+1) 00:00 to save battery power
int WakeupTime = 0; // Don't wakeup until after 07:00 to save battery power
int SleepTime = 24; // Sleep after (23+1) 00:00 to save battery power

//#########################################################################################
void setup() {
StartTime = millis();
Serial.begin(115200);
if (StartWiFi() == WL_CONNECTED && SetupTime() == true) {
if (CurrentHour >= WakeupTime && CurrentHour <= SleepTime ) {
Serial.println("InitialiseDisplay");
InitialiseDisplay(); // Give screen time to initialise by getting weather data!
byte Attempts = 1;
bool RxWeather = false, RxForecast = false;

WiFiClient client; // wifi client object

// Obtain weather information.
Serial.println("get owm Data");
while ((RxWeather == false || RxForecast == false) && Attempts <= 2) { // Try up-to 2 time for Weather and Forecast data
if (RxWeather == false) RxWeather = obtain_wx_data(client, "weather");
if (RxForecast == false) RxForecast = obtain_wx_data(client, "forecast");
Attempts++;
}

// Obtain hive information.
Serial.println("get hiveeye Data");
obtain_hiveeyes_data(client);

// Display data.
Expand Down Expand Up @@ -168,14 +175,16 @@ void DisplayWeather() { // 4.2" e-paper display is 400x300 resol
if (WxConditions[0].Visibility > 0) Visibility(335, 100, String(WxConditions[0].Visibility) + "M");
if (WxConditions[0].Cloudcover > 0) CloudCover(350, 125, WxConditions[0].Cloudcover);
DrawAstronomySection(233, 74); // Astronomy section Sun rise/set, Moon phase and Moon icon
DrawHiveeyesSection(187); // DrawHiveeyesSection(y) Draw Hiveeyes Selection over full Screen size
}
//#########################################################################################
void DrawHeadingSection() {
u8g2Fonts.setFont(u8g2_font_helvB08_tf);
drawString(SCREEN_WIDTH / 2, 0, City, CENTER);
drawString(SCREEN_WIDTH, 0, date_str, RIGHT);
drawString(4, 0, time_str, LEFT);
DrawBattery(65, 12);
DrawBattery(34, 12);
DrawRSSI(97,10, wifi_signal);
display.drawLine(0, 12, SCREEN_WIDTH, 12, GxEPD_BLACK);
}
//#########################################################################################
Expand Down Expand Up @@ -210,13 +219,13 @@ void DrawForecastSection(int x, int y) {
}
temperature_readings[r] = WxForecast[r].Temperature;
}
display.drawLine(0, y + 172, SCREEN_WIDTH, y + 172, GxEPD_BLACK);
u8g2Fonts.setFont(u8g2_font_helvB12_tf);
drawString(SCREEN_WIDTH / 2, y + 180, TXT_FORECAST_VALUES, CENTER);
u8g2Fonts.setFont(u8g2_font_helvB10_tf);
DrawGraph(SCREEN_WIDTH / 400 * 30, SCREEN_HEIGHT / 300 * 221, SCREEN_WIDTH / 4, SCREEN_HEIGHT / 5, 900, 1050, Units == "M" ? TXT_PRESSURE_HPA : TXT_PRESSURE_IN, pressure_readings, max_readings, autoscale_on, barchart_off);
DrawGraph(SCREEN_WIDTH / 400 * 158, SCREEN_HEIGHT / 300 * 221, SCREEN_WIDTH / 4, SCREEN_HEIGHT / 5, 10, 30, Units == "M" ? TXT_TEMPERATURE_C : TXT_TEMPERATURE_F, temperature_readings, max_readings, autoscale_on, barchart_off);
DrawGraph(SCREEN_WIDTH / 400 * 288, SCREEN_HEIGHT / 300 * 221, SCREEN_WIDTH / 4, SCREEN_HEIGHT / 5, 0, 30, TXT_HUMIDITY_PERCENT, rain_readings, max_readings, autoscale_on, barchart_on);
//display.drawLine(0, y + 172, SCREEN_WIDTH, y + 172, GxEPD_BLACK);
//u8g2Fonts.setFont(u8g2_font_helvB12_tf);
//drawString(SCREEN_WIDTH / 2, y + 180, TXT_FORECAST_VALUES, CENTER);
//u8g2Fonts.setFont(u8g2_font_helvB10_tf);
//DrawGraph(SCREEN_WIDTH / 400 * 30, SCREEN_HEIGHT / 300 * 221, SCREEN_WIDTH / 4, SCREEN_HEIGHT / 5, 900, 1050, Units == "M" ? TXT_PRESSURE_HPA : TXT_PRESSURE_IN, pressure_readings, max_readings, autoscale_on, barchart_off);
//DrawGraph(SCREEN_WIDTH / 400 * 158, SCREEN_HEIGHT / 300 * 221, SCREEN_WIDTH / 4, SCREEN_HEIGHT / 5, 10, 30, Units == "M" ? TXT_TEMPERATURE_C : TXT_TEMPERATURE_F, temperature_readings, max_readings, autoscale_on, barchart_off);
//DrawGraph(SCREEN_WIDTH / 400 * 288, SCREEN_HEIGHT / 300 * 221, SCREEN_WIDTH / 4, SCREEN_HEIGHT / 5, 0, 30, TXT_HUMIDITY_PERCENT, rain_readings, max_readings, autoscale_on, barchart_on);
}
//#########################################################################################
void DrawForecastWeather(int x, int y, int index) {
Expand All @@ -228,6 +237,62 @@ void DrawForecastWeather(int x, int y, int index) {
drawString(x + 41, y + 52, String(WxForecast[index].High, 0) + "° / " + String(WxForecast[index].Low, 0) + "°", CENTER);
}
//#########################################################################################
void DrawHiveeyesSection( int y) {
// Hiveeyes Heading
display.drawLine(SCREEN_WIDTH/3, y , SCREEN_WIDTH/3, SCREEN_HEIGHT, GxEPD_BLACK);
display.drawLine(SCREEN_WIDTH/3*2, y , SCREEN_WIDTH/3*2, SCREEN_HEIGHT, GxEPD_BLACK);
display.drawLine(0, y +0, SCREEN_WIDTH, y + 0, GxEPD_BLACK);

// Hiveeyes Hive1
u8g2Fonts.setFont(u8g2_font_helvB12_tf);
drawString(SCREEN_WIDTH / 6, y + 6, "Hive1", CENTER);
u8g2Fonts.setFont(u8g2_font_helvB08_tf);
DrawBattery1(-5,y+29, hive_data[hive_readings-1].voltage ,3.0 ,4.0 );
DrawRSSI(64, y+27, hive_data[hive_readings-1].rssi);
//Too Do! make void for Temp. Check all temp for Max and
u8g2Fonts.setFont(FONT(u8g2_font_helvB10));
drawString(120, y + 37, String(hive_data[2].temperature_inside_1, 1) + "°C", RIGHT);
display.drawRect( 5, y + 40 , 10, -4, GxEPD_BLACK);
display.fillRect( 17,y + 40 , 10, -6, GxEPD_BLACK);
display.drawRect( 29,y + 40 , 10, -4, GxEPD_BLACK);
display.drawRect( 41,y + 40 , 10, -2, GxEPD_BLACK);
display.drawRect( 53,y + 40 , 10, -2, GxEPD_BLACK);
//DrawGraph(int x_pos, int y_pos, int gwidth, int gheight, float Y1Min, float Y1Max, String title, float DataArray[], int readings, boolean auto_scale, boolean barchart_mode)
for (int r = 1; r <= hive_readings; r++) {
weight_readings[r] = hive_data[r].weight;
}
DrawGraph(20,250,100,40,1,1.05,("weight =" + String(hive_data[hive_readings-1].weight)),weight_readings,hive_readings,false,false);
}
//#########################################################################################
void DrawRSSI(int x, int y, int rssi) {
int WIFIsignal = 0;

int xpos = 1;
for (int _rssi = -100; _rssi <= rssi; _rssi = _rssi + 20) {
if (_rssi <= -20) WIFIsignal = 20; // <-20dbm displays 5-bars
if (_rssi <= -40) WIFIsignal = 16; // -40dbm to -21dbm displays 4-bars
if (_rssi <= -60) WIFIsignal = 12; // -60dbm to -41dbm displays 3-bars
if (_rssi <= -80) WIFIsignal = 8; // -80dbm to -61dbm displays 2-bars
if (_rssi <= -100) WIFIsignal = 4; // -100dbm to -81dbm displays 1-bar
display.fillRect(x + xpos * 6, y - WIFIsignal, 5, WIFIsignal, GxEPD_BLACK);
xpos++;
}
display.fillRect(x, y - 1, 5, 1, GxEPD_BLACK);
drawString(x + 41, y - 8, String(rssi) + "dBm", CENTER);
}
//#########################################################################################
void DrawBattery1(int x, int y, float voltage, float emptyV , float fullV) {
uint8_t percentage = 100;
percentage = 2836.9625 * pow(voltage, 4) - 43987.4889 * pow(voltage, 3) + 255233.8134 * pow(voltage, 2) - 656689.7123 * voltage + 632041.7303;
if (voltage >= fullV) percentage = 100;
if (voltage <= emptyV) percentage = 0;
display.drawRect(x + 15, y - 12, 19, 10, GxEPD_BLACK);
display.fillRect(x + 34, y - 10, 2, 5, GxEPD_BLACK);
display.fillRect(x + 17, y - 10, 15 * percentage / 100.0, 6, GxEPD_BLACK);
//drawString(x + 62, y - 11, String(percentage) + "%", RIGHT);
drawString(x + 52, y -11, String(voltage, 2) + "V", CENTER);
}
//#########################################################################################
void DrawMainWx(int x, int y) {
u8g2Fonts.setFont(u8g2_font_helvB14_tf);
drawString(x - 25, y - 22, String(WxConditions[0].Temperature, 1) + "°" + (Units == "M" ? "C" : "F"), CENTER); // Show current Temperature
Expand Down Expand Up @@ -780,7 +845,7 @@ void Nodata(int x, int y, bool IconSize, String IconName) {
//#########################################################################################
void DrawBattery(int x, int y) {
uint8_t percentage = 100;
float voltage = analogRead(35) / 4096.0 * 7.46;
float voltage = analogRead(BATTERY_PIN) / 4096.0 * 7.46;
if (voltage > 1 ) { // Only display if there is a valid reading
Serial.println("Voltage = " + String(voltage));
percentage = 2836.9625 * pow(voltage, 4) - 43987.4889 * pow(voltage, 3) + 255233.8134 * pow(voltage, 2) - 656689.7123 * voltage + 632041.7303;
Expand Down Expand Up @@ -902,6 +967,7 @@ void drawStringMaxWidth(int x, int y, unsigned int text_width, String text, alig
}
//#########################################################################################
void InitialiseDisplay() {
Serial.println("Initialise Display");
display.init(0);
SPI.end();
SPI.begin(EPD_SCK, EPD_MISO, EPD_MOSI, EPD_CS);
Expand Down
31 changes: 28 additions & 3 deletions src/hiveeyes_config.h
View file
@@ -1,3 +1,28 @@
// Configuration for Hiveeyes data export interface.
String hiveeyes_server = "swarm.hiveeyes.org";
String hiveeyes_uri = "/api-notls/hiveeyes/testdrive/area-38/fipy-workbench-01/data.json";
String hiveeyes_server = "swarm.hiveeyes.org";
String uri = "/api-notls/hiveeyes/testdrive/area-38/fipy-workbench-01/data.json";
String hiveeyes_readTime = "&from=now-10m";

// Configure Names of Data from Server
String ReadingTemperature_outside = "temperature.0x77.i2c:0";
String ReadingHumidity_outside = "humidity.0x77.i2c:0";
String ReadingTemperature_inside_1 = "temperature.28ff641d8fc3944f.onewire:0";
String ReadingTemperature_inside_2 = "temperature.28ff641d8fdf18c1.onewire:0";
String ReadingTemperature_inside_3 = "temperature.3333333333333333.onewire:0";
String ReadingTemperature_inside_4 = "temperature.4444444444444444.onewire:0";
String ReadingTemperature_inside_5 = "temperature.5555555555555555.onewire:0";
String ReadingVoltage = "system.battery-voltage";
String ReadingWeight = "weight.0";
String ReadingRssi = "system.wifi.rssi";

// build uri complete
String hiveeyes_uri = uri + "?include="+ ReadingTemperature_outside + ","
+ ReadingHumidity_outside + ","
+ ReadingTemperature_inside_1 + ","
+ ReadingTemperature_inside_2 + ","
+ ReadingTemperature_inside_3 + ","
+ ReadingTemperature_inside_4 + ","
+ ReadingTemperature_inside_5 + ","
+ ReadingVoltage + ","
+ ReadingWeight + ","
+ ReadingRssi;

12 changes: 6 additions & 6 deletions src/owm_credentials.h
View file
@@ -1,17 +1,17 @@
// Change to your WiFi credentials
const char* ssid = "your_SSID";
const char* password = "your_PASSWORD";
const char* ssid = "FRITZ!Box 7490";
const char* password = "06243647984188696083";

// Use your own API key by signing up for a free developer account at https://openweathermap.org/
String apikey = "your_API_key"; // See: https://openweathermap.org/
String apikey = "0428ba66534dfce1cf312be2b3ec6f6b"; // See: https://openweathermap.org/
const char server[] = "api.openweathermap.org";
//http://api.openweathermap.org/data/2.5/forecast?q=Melksham,UK&APPID=your_OWM_API_key&mode=json&units=metric&cnt=40
//http://api.openweathermap.org/data/2.5/weather?q=Melksham,UK&APPID=your_OWM_API_key&mode=json&units=metric&cnt=1
//Set your location according to OWM locations
String City = "MELKSHAM"; // Your home city See: http://bulk.openweathermap.org/sample/
String Country = "GB"; // Your _ISO-3166-1_two-letter_country_code country code, on OWM find your nearest city and the country code is displayed
String City = "NORDERSTEDT"; // Your home city See: http://bulk.openweathermap.org/sample/
String Country = "DE"; // Your _ISO-3166-1_two-letter_country_code country code, on OWM find your nearest city and the country code is displayed
// https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes
String Language = "EN"; // NOTE: Only the weather description is translated by OWM
String Language = "DE"; // NOTE: Only the weather description is translated by OWM
// Examples: Arabic (AR) Czech (CZ) English (EN) Greek (EL) Persian(Farsi) (FA) Galician (GL) Hungarian (HU) Japanese (JA)
// Korean (KR) Latvian (LA) Lithuanian (LT) Macedonian (MK) Slovak (SK) Slovenian (SL) Vietnamese (VI)
String Hemisphere = "north"; // or "south"
Expand Down

0 comments on commit a4fbc63

Please sign in to comment.