Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

implement support for st7735 display #2319

Open
wants to merge 12 commits into
base: dev
Choose a base branch
from
Open

implement support for st7735 display #2319

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a82eba2
implement support for st7735 display
dpeddi Aug 12, 2020
add6d05
remove test code just for the screenshot
dpeddi Aug 12, 2020
75168b4
move font into static directory
dpeddi Aug 14, 2020
923135c
remove double thermostat.h definition in main.cpp
dpeddi Aug 14, 2020
52e866a
remove double pragma once in thermostat.h
dpeddi Aug 14, 2020
906a660
[thermostat] move simple string from ram to flash
dpeddi Aug 14, 2020
aee7ea4
remove unused define
dpeddi Aug 14, 2020
e53dfd0
[thermostat] move display include into cpp source
dpeddi Aug 14, 2020
6bf578d
[thermomstat] define new function instead split it
dpeddi Aug 14, 2020
bb13e87
[thermostat] fix string to flash
dpeddi Aug 15, 2020
a56551a
thermostat build configuration for this display into platformio_examp…
dpeddi Aug 18, 2020
ae57ec8
create general.h define with default gpio for display
dpeddi Aug 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
432 changes: 432 additions & 0 deletions code/espurna/Roboto_Thin9pt8b.h
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions code/espurna/button.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ Copyright (C) 2016-2019 by Xose Pérez <xose dot perez at gmail dot com>
#include "light.h"
#include "ws.h"
#include "mcp23s08.h"
#include "thermostat.h"

#include "button_config.h"

#include "libs/DebounceEvent.h"


BrokerBind(ButtonBroker);

// TODO: if we are using such conversion helpers across the codebase, should convert() be in internal ns?
Expand Down
1 change: 1 addition & 0 deletions code/espurna/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "web.h"
#include "ws.h"
#include "mcp23s08.h"
#include "thermostat.h"
dpeddi marked this conversation as resolved.
Show resolved Hide resolved

std::vector<void_callback_f> _loop_callbacks;
std::vector<void_callback_f> _reload_callbacks;
Expand Down
129 changes: 125 additions & 4 deletions code/espurna/thermostat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ THERMOSTAT MODULE

Copyright (C) 2017 by Dmitry Blinov <dblinov76 at gmail dot com>

https://github.com/xoseperez/espurna/pull/1603#issuecomment-469256254
*/

#include "thermostat.h"
Expand Down Expand Up @@ -488,36 +489,75 @@ void resetBurnCounters() {

#define wifi_on_width 16
#define wifi_on_height 16
#if THERMOSTAT_DISPLAY_ST7735_SUPPORT
const char wifi_on_bits[] PROGMEM = {
0x00, 0x00, 0x70, 0x00, 0x7E, 0x00, 0x7F, 0x80, 0x07, 0xC0, 0x01, 0xE0,
0x40, 0xF0, 0x78, 0x78, 0x7C, 0x38, 0x1E, 0x1C, 0x07, 0x1C, 0x03, 0x8C,
0x63, 0x8E, 0x71, 0x8E, 0x71, 0xCE, 0x00, 0x00, };
#else
const char wifi_on_bits[] PROGMEM = {
0x00, 0x00, 0x0E, 0x00, 0x7E, 0x00, 0xFE, 0x01, 0xE0, 0x03, 0x80, 0x07,
0x02, 0x0F, 0x1E, 0x1E, 0x3E, 0x1C, 0x78, 0x38, 0xE0, 0x38, 0xC0, 0x31,
0xC6, 0x71, 0x8E, 0x71, 0x8E, 0x73, 0x00, 0x00, };
#endif

#define mqtt_width 16
#define mqtt_height 16
#if THERMOSTAT_DISPLAY_ST7735_SUPPORT
const char mqtt_bits[] PROGMEM = {
0x00, 0x00, 0x00, 0x10, 0x00, 0x18, 0x00, 0x1C, 0x57, 0xFE, 0x57, 0xFE,
0x00, 0x1C, 0x08, 0x18, 0x18, 0x10, 0x38, 0x00, 0x7F, 0xEA, 0x7F, 0xEA,
0x38, 0x00, 0x18, 0x00, 0x08, 0x00, 0x00, 0x00, };
#else
const char mqtt_bits[] PROGMEM = {
0x00, 0x00, 0x00, 0x08, 0x00, 0x18, 0x00, 0x38, 0xEA, 0x7F, 0xEA, 0x7F,
0x00, 0x38, 0x10, 0x18, 0x18, 0x08, 0x1C, 0x00, 0xFE, 0x57, 0xFE, 0x57,
0x1C, 0x00, 0x18, 0x00, 0x10, 0x00, 0x00, 0x00, };
#endif

#define remote_temp_width 16
#define remote_temp_height 16
#if THERMOSTAT_DISPLAY_ST7735_SUPPORT
const char remote_temp_bits[] PROGMEM = {
0x00, 0x00, 0x07, 0x18, 0x08, 0xA4, 0x08, 0xA4, 0x09, 0x98, 0x0A, 0x80,
0x0A, 0x80, 0x0B, 0x80, 0x0A, 0x80, 0x0A, 0x80, 0x0B, 0x80, 0x0A, 0x80,
0x07, 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, 0x00
};
#else
const char remote_temp_bits[] PROGMEM = {
0x00, 0x00, 0xE0, 0x18, 0x10, 0x25, 0x10, 0x25, 0x90, 0x19, 0x50, 0x01,
0x50, 0x01, 0xD0, 0x01, 0x50, 0x01, 0x50, 0x01, 0xD0, 0x01, 0x50, 0x01,
0xE0, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00, };
#endif

#define server_width 16
#define server_height 16
#if THERMOSTAT_DISPLAY_ST7735_SUPPORT
const char server_bits[] PROGMEM = {
0x00, 0x00, 0x1F, 0xF8, 0x3F, 0xFC, 0x30, 0x0C, 0x30, 0x0C, 0x30, 0x0C,
0x30, 0x0C, 0x30, 0x0C, 0x30, 0x0C, 0x1F, 0xF8, 0x3F, 0xFC, 0x7F, 0xFE,
0x78, 0x1E, 0x7F, 0xFE, 0x3F, 0xFC, 0x00, 0x00, };
#else
const char server_bits[] PROGMEM = {
0x00, 0x00, 0xF8, 0x1F, 0xFC, 0x3F, 0x0C, 0x30, 0x0C, 0x30, 0x0C, 0x30,
0x0C, 0x30, 0x0C, 0x30, 0x0C, 0x30, 0xF8, 0x1F, 0xFC, 0x3F, 0xFE, 0x7F,
0x1E, 0x78, 0xFE, 0x7F, 0xFC, 0x3F, 0x00, 0x00, };
#endif

#define LOCAL_TEMP_UPDATE_INTERVAL 60000
#define LOCAL_HUM_UPDATE_INTERVAL 61000

#if THERMOSTAT_DISPLAY_ST7735_SUPPORT
/*#define cs D8
#define dc D3
#define rst D4*/
#define cs D8
#define dc D4
#define rst -1
dpeddi marked this conversation as resolved.
Show resolved Hide resolved
Adafruit_ST7735 display = Adafruit_ST7735(cs, dc, rst);
#else
SSD1306 display(0x3c, 1, 3);
#endif

unsigned long _local_temp_last_update = 0xFFFF;
unsigned long _local_hum_last_update = 0xFFFF;
Expand All @@ -533,20 +573,27 @@ bool _temp_range_need_update = true;

//------------------------------------------------------------------------------
void drawIco(int16_t x, int16_t y, const char *ico, bool on = true) {
display.drawIco16x16(x, y, ico, !on);
#if THERMOSTAT_DISPLAY_ST7735_SUPPORT
dpeddi marked this conversation as resolved.
Show resolved Hide resolved
uint16_t color;
display.drawBitmap(x, y, (const uint8_t*) ico, 16, 16, ((on == true) ? ST7735_WHITE : ST77XX_BLACK));
#else
display.drawIco16x16(x, y, ico, !on); //FIXME
#endif
_display_need_refresh = true;
}

//------------------------------------------------------------------------------
void display_wifi_status(bool on) {
_display_wifi_status = on;
drawIco(0, 0, wifi_on_bits, on);
drawIco(34, 0, server_bits, on);
dpeddi marked this conversation as resolved.
Show resolved Hide resolved
}

//------------------------------------------------------------------------------
void display_mqtt_status(bool on) {
_display_mqtt_status = on;
drawIco(17, 0, mqtt_bits, on);
drawIco(51, 0, remote_temp_bits, on);
dpeddi marked this conversation as resolved.
Show resolved Hide resolved
}

//------------------------------------------------------------------------------
Expand All @@ -564,19 +611,47 @@ void display_remote_temp_status(bool on) {
//------------------------------------------------------------------------------
void display_temp_range() {
_temp_range.need_display_update = false;
#if THERMOSTAT_DISPLAY_ST7735_SUPPORT
display.fillRect(68, 0, ST7735_TFTHEIGHT_160 - 60, 16, ST7735_BLACK);
display.setTextColor(ST77XX_WHITE);
display.setTextWrap(true);
display.setCursor(90, 0 + 13);
//display.setFont(&TomThumb);
display.setFont(&Roboto_Thin9pt8b);
String temp_range = String(_temp_range.min) + "\xB0- " + String(_temp_range.max) + "\xB0";
display.print(temp_range);
#else
display.setColor(BLACK);
display.fillRect(68, 0, 60, 16);
display.setColor(WHITE);
display.setTextAlignment(TEXT_ALIGN_RIGHT);
display.setFont(ArialMT_Plain_16);
String temp_range = String(_temp_range.min) + "°- " + String(_temp_range.max) + "°";
display.drawString(128, 0, temp_range);
display.drawString(128 /*x*/, 0/*y*/, temp_range);
#endif
_display_need_refresh = true;
}

//------------------------------------------------------------------------------
void display_remote_temp() {
_remote_temp.need_display_update = false;
#if THERMOSTAT_DISPLAY_ST7735_SUPPORT
display.fillRect(0, 16, ST7735_TFTHEIGHT_160, 16, ST77XX_BLACK);

display.setTextColor(ST77XX_WHITE);
display.setTextWrap(true);
//display.setFont(&TomThumb);
display.setFont(&Roboto_Thin9pt8b);

display.setCursor(0, 16 + 13);
String temp_range_title = String("Remote t");
display.print(temp_range_title);

display.setCursor(75, 16 + 13);
String temp_range_vol = String("= ") + (_display_remote_temp_status ? String(_remote_temp.temp, 1) : String("?")) + "\xB0";
display.print(temp_range_vol);
//FIXME
#else
display.setColor(BLACK);
display.fillRect(0, 16, 128, 16);
display.setColor(WHITE);
Expand All @@ -587,12 +662,28 @@ void display_remote_temp() {

String temp_range_vol = String("= ") + (_display_remote_temp_status ? String(_remote_temp.temp, 1) : String("?")) + "°";
display.drawString(75, 16, temp_range_vol);

#endif
_display_need_refresh = true;
}

//------------------------------------------------------------------------------
void display_local_temp() {
#if THERMOSTAT_DISPLAY_ST7735_SUPPORT
display.fillRect(0, 32, ST7735_TFTHEIGHT_160, 16, ST77XX_BLACK);
display.setTextColor(ST77XX_WHITE);
display.setTextWrap(true);
//display.setFont(&TomThumb);
display.setFont(&Roboto_Thin9pt8b);

display.setCursor(0, 32 + 13);
String local_temp_title = String("Local t");
display.print(local_temp_title);
dpeddi marked this conversation as resolved.
Show resolved Hide resolved

display.setCursor(75, 32 + 13);
String local_temp_vol = String("= ") + (getLocalTemperature() != DBL_MIN ? String(getLocalTemperature(), 1) : String("?")) + "\xB0";
display.print(local_temp_vol);
//FIXME
#else
display.setColor(BLACK);
display.fillRect(0, 32, 128, 16);
display.setColor(WHITE);
Expand All @@ -604,12 +695,27 @@ void display_local_temp() {

String local_temp_vol = String("= ") + (getLocalTemperature() != DBL_MIN ? String(getLocalTemperature(), 1) : String("?")) + "°";
display.drawString(75, 32, local_temp_vol);
#endif

_display_need_refresh = true;
}

//------------------------------------------------------------------------------
void display_local_humidity() {
#if THERMOSTAT_DISPLAY_ST7735_SUPPORT
display.fillRect(0, 48, ST7735_TFTHEIGHT_160, 16, ST77XX_BLACK);
display.setTextColor(ST77XX_WHITE);
display.setTextWrap(true);

display.setCursor(0, 48 + 13);
String local_hum_title = String("Local h ");
display.print(local_hum_title);

display.setCursor(75, 48 + 13);
String local_hum_vol = String("= ") + (getLocalHumidity() != DBL_MIN ? String(getLocalHumidity(), 0) : String("?")) + "%";
display.print(local_hum_vol);
//FIXME
#else
display.setColor(BLACK);
display.fillRect(0, 48, 128, 16);
display.setColor(WHITE);
Expand All @@ -621,7 +727,7 @@ void display_local_humidity() {

String local_hum_vol = String("= ") + (getLocalHumidity() != DBL_MIN ? String(getLocalHumidity(), 0) : String("?")) + "%";
display.drawString(75, 48, local_hum_vol);

#endif
_display_need_refresh = true;
}

Expand All @@ -645,8 +751,15 @@ void displayOn() {
// Setup
//------------------------------------------------------------------------------
void displaySetup() {
#if THERMOSTAT_DISPLAY_ST7735_SUPPORT
display.initR(INITR_BLACKTAB); // Initialize ST7735R screen
display.setRotation(1);
display.fillScreen(ST77XX_BLACK);
display.cp437(true);
#else
display.init();
display.flipScreenVertically();
#endif

displayOn();

Expand All @@ -659,7 +772,11 @@ void displayLoop() {
if (_thermostat_display_is_on) {
DEBUG_MSG_P(PSTR("[THERMOSTAT] Display Off by timeout\n"));
_thermostat_display_is_on = false;
#if THERMOSTAT_DISPLAY_ST7735_SUPPORT
//FIXME
#else
display.resetDisplay();
#endif
}
return;
}
Expand Down Expand Up @@ -731,7 +848,11 @@ void displayLoop() {
//------------------------------------------------------------------------------
if (_display_need_refresh) {
yield();
#if THERMOSTAT_DISPLAY_ST7735_SUPPORT
//FIXME
#else
display.display();
#endif
_display_need_refresh = false;
}
}
Expand Down
23 changes: 23 additions & 0 deletions code/espurna/thermostat.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,27 @@ Copyright (C) 2017 by Dmitry Blinov <dblinov76 at gmail dot com>

#pragma once

#ifndef THERMOSTAT_H
#define THERMOSTAT_H
dpeddi marked this conversation as resolved.
Show resolved Hide resolved

#include "espurna.h"

#if THERMOSTAT_SUPPORT

#include <ArduinoJson.h>
#include <float.h>

#if THERMOSTAT_DISPLAY_SUPPORT
#if THERMOSTAT_DISPLAY_ST7735_SUPPORT
#define TOMTHUMB_USE_EXTENDED 1
#include <gfxfont.h>
#include <Roboto_Thin9pt8b.h>
#include "Adafruit_GFX.h"
#include <Adafruit_ST7735.h>
#else
dpeddi marked this conversation as resolved.
Show resolved Hide resolved
#include <SSD1306.h> // alias for `#include "SSD1306Wire.h"`
#endif
#endif

#define ASK_TEMP_RANGE_INTERVAL_INITIAL 15000 // ask initially once per every 15 seconds
#define ASK_TEMP_RANGE_INTERVAL_REGULAR 60000 // ask every minute to be sure
Expand Down Expand Up @@ -64,3 +77,13 @@ void thermostatModeCooler(bool cooler);
bool thermostatModeCooler();

void thermostatSetup();

#if THERMOSTAT_DISPLAY_SUPPORT
void displayOn();
void displaySetup();
void displayLoop();
#endif

#endif

#endif
6 changes: 6 additions & 0 deletions code/platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,14 @@ lib_deps =
https://github.com/pololu/vl53l1x-arduino#1.0.1
https://github.com/mcleng/MAX6675-Library#2.0.1
https://github.com/ThingPulse/esp8266-oled-ssd1306#3398c97
Adafruit GFX [email protected]
Adafruit ST7735 and ST7789 [email protected]
Adafruit SI1145 Library@~1.1.1
https://github.com/BoschSensortec/BSEC-Arduino-library.git#c5503e0
lib_ignore =
SD
Adafruit ILI9341
Adafruit seesaw Library
dpeddi marked this conversation as resolved.
Show resolved Hide resolved

# ------------------------------------------------------------------------------
# COMMON ENVIRONMENT SETTINGS:
Expand Down