Version bump, add small header and text screen
This commit is contained in:
parent
2b96ae2548
commit
58cd8f33f4
|
@ -47,12 +47,19 @@ void display_header() {
|
|||
display.drawStr(48,35,"Project");
|
||||
display.setFont(u8g2_font_6x10_tr);
|
||||
}
|
||||
|
||||
void display_header_small() {
|
||||
display.setFont(u8g2_font_6x10_tr);
|
||||
display.drawStr(40,7,"PV Monitor Project");
|
||||
display.drawLine(0, 8, 128, 8);
|
||||
}
|
||||
|
||||
void display_init(char* VERSION) {
|
||||
display.firstPage();
|
||||
do {
|
||||
display_header();
|
||||
display.drawStr(0,52,"by Carsten Schmiemann");
|
||||
display.drawStr(30,60,"2022");
|
||||
display.drawStr(40,60,"(C) 2022");
|
||||
display.print(VERSION);
|
||||
} while ( display.nextPage() );
|
||||
}
|
||||
|
@ -66,6 +73,19 @@ void display_text(char* TEXT1, char* TEXT2) {
|
|||
} while ( display.nextPage() );
|
||||
}
|
||||
|
||||
void display_text_fullscreen(char* TEXT1, char* TEXT2, char* TEXT3, char* TEXT4, char* TEXT5, char* TEXT6) {
|
||||
display.firstPage();
|
||||
do {
|
||||
display_header();
|
||||
display.drawStr(0,20, TEXT1);
|
||||
display.drawStr(0,28, TEXT2);
|
||||
display.drawStr(0,36, TEXT3);
|
||||
display.drawStr(0,44, TEXT4);
|
||||
display.drawStr(0,52, TEXT5);
|
||||
display.drawStr(0,60, TEXT6);
|
||||
} while ( display.nextPage() );
|
||||
}
|
||||
|
||||
void display_category_0() {
|
||||
display.setFont(u8g2_font_6x10_tr);
|
||||
display.drawStr(2,7,"PV-Module");
|
||||
|
|
|
@ -24,8 +24,10 @@
|
|||
*/
|
||||
void display_begin();
|
||||
void display_header();
|
||||
void display_header_small();
|
||||
void display_init(char* VERSION);
|
||||
void display_text(char* TEXT1, char* TEXT2);
|
||||
void display_text_fullscreen(char* TEXT1, char* TEXT2, char* TEXT3, char* TEXT4, char* TEXT5, char* TEXT6);
|
||||
void display_category_0();
|
||||
void display_screen_0(float pv_voltage, float pv_wattage, float battery_voltage, float pv_amps, float pv_kwh);
|
||||
void display_screen_1(float battery_voltage, float battery_amps, float battery_wattage, float battery_soc, float batt_cell_v_min, float batt_cell_v_max);
|
||||
|
|
17
src/main.cpp
17
src/main.cpp
|
@ -42,21 +42,20 @@
|
|||
|
||||
//Program parts
|
||||
#include <pins.h>
|
||||
//#include <screens.h>
|
||||
#include <display.h>
|
||||
|
||||
#define VERSION "0.1a"
|
||||
#define VERSION "0.5"
|
||||
|
||||
//Defaults
|
||||
char mqtt_server[15] = "10.3.4.5";
|
||||
char gx_vrm_id[20] = "123456789a";
|
||||
char mqtt_server[15] = "";
|
||||
char gx_vrm_id[20] = "";
|
||||
char disp_refresh_interval[6] = "500";
|
||||
char disp_screen_interval[6] = "10000";
|
||||
char address_pv_charger[6] = "0";
|
||||
char address_grid_meter[6] = "0";
|
||||
char address_inverter[6] = "0";
|
||||
char address_battery[6] = "0";
|
||||
char address_outside_temperature[6] = "0";
|
||||
char address_pv_charger[6] = "";
|
||||
char address_grid_meter[6] = "";
|
||||
char address_inverter[6] = "";
|
||||
char address_battery[6] = "";
|
||||
char address_outside_temperature[6] = "";
|
||||
long unsigned int DISPLAY_REFRESH_INTERVAL;
|
||||
long unsigned int DISPLAY_SCREEN_INTERVAL;
|
||||
|
||||
|
|
Loading…
Reference in a new issue