GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-12 07:39:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add advanced/Basic UI and colored/monochrome define

Browse Source 
to prepare litlevgl integration for advanced
This commit is contained in:
Luc 2019-08-11 19:21:35 +02:00
parent f57807cce9
commit e50da88db3
15 changed files with 1177 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
esp3d/configuration.h
View File

@ -52,6 +52,14 @@
//TFT_SPI_ILI9488_480X320 4 //TFT_SPI_ILI9488_480X320 4
#define DISPLAY_DEVICE TFT_SPI_ILI9488_480X320 #define DISPLAY_DEVICE TFT_SPI_ILI9488_480X320
//UI_TYPE_BASIC 1
//UI_TYPE_ADVANCED 2
#define DISPLAY_UI_TYPE UI_TYPE_BASIC
//UI_COLORED 1
//UI_MONOCHROME 2
#define DISPLAY_UI_COLOR UI_MONOCHROME
//BUZZER_DEVICE: allow to connect passive buzzer //BUZZER_DEVICE: allow to connect passive buzzer
#define BUZZER_DEVICE #define BUZZER_DEVICE

7
esp3d/src/include/defines.h
View File

@ -44,6 +44,13 @@
#define TFT_SPI_ILI9341_320X240 3 #define TFT_SPI_ILI9341_320X240 3
#define TFT_SPI_ILI9488_480X320 4 #define TFT_SPI_ILI9488_480X320 4
//UI type for display
#define UI_TYPE_BASIC 1
#define UI_TYPE_ADVANCED 2
#define UI_COLORED 1
#define UI_MONOCHROME 2
//Touch //Touch
#define XPT2046_SPI 1 #define XPT2046_SPI 1

0
esp3d/src/modules/display/TFT_ILI9341_320X240.h → esp3d/src/modules/display/advanced_ILI9341_320X240.h
View File

0
esp3d/src/modules/display/TFT_ILI9488_480X320.h → esp3d/src/modules/display/advanced_ILI9488_480X320.h
View File

0
esp3d/src/modules/display/OLED_SSD1306.h → esp3d/src/modules/display/advanced_SSD1306 .h
View File

0
esp3d/src/modules/display/OLED_SSDSH1106.h → esp3d/src/modules/display/advanced_SSDSH1106.h
View File

744
esp3d/src/modules/display/advanceddisplay.cpp Normal file
View File

@ -0,0 +1,744 @@
/*
advanceddisplay.cpp - display functions class
Copyright (c) 2014 Luc Lebosse. All rights reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "../../include/esp3d_config.h"
#if defined (DISPLAY_DEVICE) && (DISPLAY_UI_TYPE == UI_TYPE_ADVANCED)
#include "advanceddisplay.h"
#include "../../core/settings_esp3d.h"
#include "../../core/esp3doutput.h"
#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
#include "Wire.h"
#include "esp3d_logo.h"
#if DISPLAY_DEVICE == OLED_I2C_SSD1306
#include <SSD1306Wire.h>
SSD1306Wire esp3d_screen(DISPLAY_I2C_ADDR, DISPLAY_I2C_PIN_SDA, DISPLAY_I2C_PIN_SCL);
#include "advanced_SSD1306.h"
#endif //DISPLAY_DEVICE == OLED_I2C_SSD1306
#if DISPLAY_DEVICE == OLED_I2C_SSDSH1106
#include <SH1106Wire.h>
SH1106Wire esp3d_screen(DISPLAY_I2C_ADDR, (DISPLAY_I2C_PIN_SDA==-1)?SDA:DISPLAY_I2C_PIN_SDA, (DISPLAY_I2C_PIN_SCL==-1)?SCL:DISPLAY_I2C_PIN_SCL);
#include "advanced_SSDSH1106.h"
#endif //DISPLAY_DEVICE == OLED_I2C_SSDSH1106
#endif //DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
#if (DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
#include <TFT_eSPI.h>
TFT_eSPI esp3d_screen = TFT_eSPI();
#include "esp3d_logob.h"
#if (DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240)
#include "advanced_ILI9341_320X240.h"
#endif //(DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240)
#if (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
#include "advanced_ILI9488_480X320.h"
#endif //(DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
#endif //(DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
#if defined (WIFI_FEATURE)
#include "../wifi/wificonfig.h"
#endif // WIFI_FEATURE
#if defined (ETH_FEATURE)
#include "../ethernet/ethconfig.h"
#endif //ETH_FEATURE
#if defined (BLUETOOTH_FEATURE)
#include "../bluetooth/BT_service.h"
#endif //BLUETOOTH_FEATURE
#if defined (WIFI_FEATURE) || defined (ETH_FEATURE) || defined (BLUETOOTH_FEATURE)
#include "../network/netconfig.h"
#endif //WIFI_FEATURE || ETH_FEATURE) ||BLUETOOTH_FEATURE
#define DISPLAY_REFRESH_TIME 1000
Display esp3d_display;
bool Display::startCalibration()
{
bool res = false;
#if defined(DISPLAY_TOUCH_DRIVER)
#if DISPLAY_TOUCH_DRIVER == XPT2046_SPI
uint16_t calibrationData[5];
clear_screen();
//display instructions
uint size = getStringWidth("Touch corners as indicated");
setTextFont(FONTCALIBRATION);
drawString("Touch corners as indicated", (SCREEN_WIDTH-size)/2, (SCREEN_HEIGHT-16)/2, CALIBRATION_FG);
esp3d_screen.calibrateTouch(calibrationData, CALIBRATION_CORNER, CALIBRATION_BG, 15);
res = true;
for (uint8_t i = 0; i < 5; i++) {
if(!Settings_ESP3D::write_uint32 (ESP_CALIBRATION_1+(4*i), calibrationData[i])) {
res= false;
}
}
if (!Settings_ESP3D::write_byte (ESP_CALIBRATION, 1)) {
res= false;
}
clear_screen();
if(res) {
SetStatus("Calibration done");
} else {
SetStatus("Calibration error");
}
update_screen(true);
#endif //XPT2046_SPI
#endif //DISPLAY_TOUCH_DRIVER
return res;
}
bool Display::splash()
{
//log_esp3d("Splash");
if ( !ESP3DOutput::isOutput(ESP_SCREEN_CLIENT)) {
return false;
}
if (!_splash_displayed) {
drawXbm((_screenwidth-ESP3D_Logo_width)/2, (_screenheight-ESP3D_Logo_height)/2, ESP3D_Logo_width, ESP3D_Logo_height, SPLASH_FG, SPLASH_BG,ESP3D_Logo);
//log_esp3d("Display Splash");
_splash_displayed = true;
return true;
}
return false;
}
bool Display::showStatus(bool force)
{
//Display Status
bool refresh_status = force;
static String status;
if (status != _status) {
status = _status;
refresh_status = true;
}
setTextFont(FONTSTATUS);
uint16_t size = sizetoFitSpace(status.c_str(), STATUS_AREA_W);
//check the need for resize
if (size < status.length()) {
static int status_shift = -1;
refresh_status = true;
status+=" ";
//log_esp3d("current %s", status.c_str());
if (status_shift != -1) {
if( (uint16_t)(status_shift)> status.length()) {
status_shift = -1;
}
}
//log_esp3d("shift %d", status_shift);
if (status_shift > 0) {
status.remove(0,status_shift);
}
//log_esp3d("shifted %s", status.c_str());
size = sizetoFitSpace(status.c_str(), STATUS_AREA_W);
//log_esp3d("size available %d existing %d",size, status.length());
if (size < status.length()) {
//cut
status = status.substring(0,size);
status_shift++;
} else {
status_shift = -1;
}
//log_esp3d("sized %s", status.c_str());
}
if (refresh_status) {
//clear area
fillRect(STATUS_AREA_X, STATUS_AREA_Y, STATUS_AREA_W, STATUS_AREA_H, SCREEN_BG);
drawString(status.c_str(), STATUS_AREA_X, STATUS_AREA_Y, STATUS_FG);
}
return refresh_status;
}
bool Display::display_signal(bool force)
{
static int sig = -1;
bool refresh_signal = false;
bool refresh_label = false;
static String label;
#if defined (WIFI_FEATURE)
if (WiFiConfig::started()) {
if (WiFi.getMode() == WIFI_AP) {
if (sig != 100) {
sig = 100;
refresh_signal = true;
}
if (label != WiFiConfig::AP_SSID()) {
label = WiFiConfig::AP_SSID();
refresh_label = true;
}
} else {
if (WiFi.isConnected()) {
if (sig != WiFiConfig::getSignal (WiFi.RSSI ())) {
sig = WiFiConfig::getSignal (WiFi.RSSI ());
refresh_signal = true;
}
if (label != WiFi.SSID()) {
label = WiFi.SSID();
refresh_label = true;
}
} else {
if (sig != -1) {
sig = -1;
refresh_signal = true;
}
if (label != "") {
label = "";
refresh_label = true;
}
}
}
//Display SSID
setTextFont(FONTSSID);
uint16_t size = sizetoFitSpace(label.c_str(), SSID_AREA_W);
//check the need for resize
if (size < label.length()) {
refresh_label = true;
static int label_shift = -1;
label+=" ";
//log_esp3d("current %s", label.c_str());
if (label_shift != -1) {
if((uint16_t)(label_shift)> label.length()) {
label_shift = -1;
}
}
//log_esp3d("shift %d", label_shift);
if (label_shift > 0) {
label.remove(0,label_shift);
}
//log_esp3d("shifted %s", label.c_str());
size = sizetoFitSpace(label.c_str(), SSID_AREA_W);
//log_esp3d("size available %d existing %d",size, label.length());
if (size < label.length()) {
//cut
label = label.substring(0,size);
label_shift++;
} else {
label_shift = -1;
}
//log_esp3d("sized %s", label.c_str());
}
if (refresh_label || force) {
//clear area
fillRect(SSID_AREA_X, SSID_AREA_Y, SSID_AREA_W, SSID_AREA_H, SCREEN_BG);
drawString(label.c_str(), SSID_AREA_X, SSID_AREA_Y, SSID_FG);
}
}
#endif // WIFI_FEATURE
#if defined (ETH_FEATURE)
if (EthConfig::started()) {
if (sig != -2) {
sig = -2;
refresh_signal = true;
}
//display connection speed
if(ETH.linkUp()) {
String tmp = ETH.linkSpeed();
tmp+= "Mbps";
if (label != tmp) {
label = tmp;
refresh_label = true;
}
} else {
if (label !="") {
label ="";
refresh_label = true;
}
}
if (refresh_label || force) {
setTextFont(FONTSSID);
//clear area
fillRect(SSID_AREA_X, SSID_AREA_Y, SSID_AREA_W, SSID_AREA_H, SCREEN_BG);
drawString(label.c_str(), SSID_AREA_X, SSID_AREA_Y, SSID_FG);
}
}
#endif //ETH_FEATURE
#if defined (BLUETOOTH_FEATURE)
if (bt_service.started()) {
if (sig!=-3) {
sig = -3;
refresh_signal = true;
}
//Display hostname
if (label != bt_service.hostname()) {
refresh_label = true;
label = bt_service.hostname();
}
setTextFont(FONTSSID);
uint16_t size = sizetoFitSpace(label.c_str(), SSID_AREA_W);
//check the need for resize
if (size < label.length()) {
refresh_label = true;
static int label_shift = -1;
label+=" ";
//log_esp3d("current %s", hostname.c_str());
if (label_shift > label.length()) {
label_shift = -1;
}
//log_esp3d("shift %d", label_shift);
if (label_shift > 0) {
label.remove(0,label_shift);
}
//log_esp3d("shifted %s", hostname.c_str());
size = sizetoFitSpace(label.c_str(), SSID_AREA_W);
//log_esp3d("size available %d existing %d",size, hostname.length());
if (size < label.length()) {
//cut
label = label.substring(0,size);
label_shift++;
} else {
label_shift = -1;
}
//log_esp3d("sized %s", hostname.c_str());
}
if( refresh_label || force) {
//clear area
fillRect(SSID_AREA_X, SSID_AREA_Y, SSID_AREA_W, SSID_AREA_H, SCREEN_BG);
if (label.length()>0) {
drawString(label.c_str(), SSID_AREA_X, SSID_AREA_Y, SSID_FG);
}
}
}
#endif //BLUETOOTH_FEATURE
if (refresh_signal || force) {
String s;
//set current font size
setTextFont(FONTSIGNAL);
fillRect(SIGNAL_X, SIGNAL_Y, SIGNAL_W, SIGNAL_H,SCREEN_BG);
fillRect(SIGNAL_ICON_X, SIGNAL_ICON_Y, SIGNAL_ICON_W, SIGNAL_ICON_H,SCREEN_BG);
if (sig > 0) {
//Signal %
s = String(sig);
s+="%";
//Signal Icon according %
if (sig > 0) {
fillRect(SIGNAL_ICON_X, SIGNAL_ICON_Y + (SIGNAL_ICON_H * 0.6), SIGNAL_ICON_W_BAR, SIGNAL_ICON_H * 0.4, SIGNAL_FG);
} else {
drawRect(SIGNAL_ICON_X, SIGNAL_ICON_Y + (SIGNAL_ICON_H * 0.6), SIGNAL_ICON_W_BAR, SIGNAL_ICON_H * 0.4, SIGNAL_FG);
}
if (sig >= 25) {
fillRect(SIGNAL_ICON_X + SIGNAL_ICON_SPACER_X +SIGNAL_ICON_W_BAR, SIGNAL_ICON_Y + (SIGNAL_ICON_H * 0.4), SIGNAL_ICON_W_BAR, (SIGNAL_ICON_H * 0.6), SIGNAL_FG);
} else {
drawRect(SIGNAL_ICON_X + SIGNAL_ICON_SPACER_X + SIGNAL_ICON_W_BAR, SIGNAL_ICON_Y + (SIGNAL_ICON_H * 0.4), SIGNAL_ICON_W_BAR, (SIGNAL_ICON_H * 0.6), SIGNAL_FG);
}
if (sig >= 50) {
fillRect(SIGNAL_ICON_X + (2*(SIGNAL_ICON_SPACER_X + SIGNAL_ICON_W_BAR)), SIGNAL_ICON_Y + (SIGNAL_ICON_H * 0.2), SIGNAL_ICON_W_BAR, (SIGNAL_ICON_H * 0.8), SIGNAL_FG);
} else {
drawRect(SIGNAL_ICON_X + (2*(SIGNAL_ICON_SPACER_X + SIGNAL_ICON_W_BAR)), SIGNAL_ICON_Y + (SIGNAL_ICON_H * 0.2), SIGNAL_ICON_W_BAR, (SIGNAL_ICON_H * 0.8), SIGNAL_FG);
}
if (sig >= 75) {
fillRect(SIGNAL_ICON_X + (3*(SIGNAL_ICON_SPACER_X + SIGNAL_ICON_W_BAR)), SIGNAL_ICON_Y, SIGNAL_ICON_W_BAR, (SIGNAL_ICON_H), SIGNAL_FG);
} else {
drawRect(SIGNAL_ICON_X + (3*(SIGNAL_ICON_SPACER_X + SIGNAL_ICON_W_BAR)), SIGNAL_ICON_Y, SIGNAL_ICON_W_BAR, (SIGNAL_ICON_H), SIGNAL_FG);
}
}
//No signal / no connection
if (sig == -1) {
s = " X";
}
//Ethernet is connected
if (sig == -2) {
s = "Eth";
}
//BT is active
if (sig == -3) {
s = "BT";
}
//Show Connection type
drawString(s.c_str(), SIGNAL_X, SIGNAL_Y, SIGNAL_FG);
}
if (refresh_signal || refresh_label || force) {
return true;
} else {
return false;
}
}
bool Display::display_IP(bool force)
{
bool refresh_label = force;
static String label;
#if defined (WIFI_FEATURE) || defined (ETH_FEATURE) || defined (BLUETOOTH_FEATURE)
if (NetConfig::started()) {
String s;
switch(NetConfig::getMode()) {
#if defined (WIFI_FEATURE)
case ESP_WIFI_STA:
s = WiFi.localIP().toString();
break;
case ESP_WIFI_AP:
s = WiFi.softAPIP().toString();
break;
#endif //WIFI_FEATURE
#if defined (ETH_FEATURE)
case ESP_ETH_STA:
s = ETH.localIP().toString();
break;
#endif //ETH_FEATURE
#if defined (BLUETOOTH_FEATURE)
case ESP_BT:
s = bt_service.isConnected()?"Connected":"";
break;
#endif //BLUETOOTH_FEATURE
default:
s="";
break;
}
if (s!= label) {
label = s;
refresh_label = true;
}
if (refresh_label) {
if (label.length()>0) {
setTextFont(FONTIP);
fillRect(IP_AREA_X, IP_AREA_Y, IP_AREA_W, IP_AREA_H, SCREEN_BG);
drawString(label.c_str(), IP_AREA_X, IP_AREA_Y, IP_FG);
}
}
} else {
if (label != "") {
label = "";
refresh_label = true;
fillRect(IP_AREA_X, IP_AREA_Y, IP_AREA_W, IP_AREA_H, SCREEN_BG);
}
}
#endif //WIFI_FEATURE || ETH_FEATURE || BLUETOOTH_FEATURE
return refresh_label;
}
bool Display::main_screen(bool force)
{
bool res = false;
if (display_signal(force)) {
res = true;
}
if (display_IP(force)) {
res = true;
}
if (showStatus(force)) {
res = true;
}
if (res) {
return true;
} else {
return false;
}
}
uint16_t Display::sizetoFitSpace(const char * string, uint16_t maxwidth)
{
String s = string;
while (getStringWidth(s.c_str()) > maxwidth) {
if (s.length() > 0) {
s.remove(s.length()-1);
} else {
return 0;
}
}
return s.length();
}
void Display::show_screenID(uint8_t screenID)
{
clear_screen();
_screenID = screenID;
update_screen(true);
}
Display::Display()
{
_started = false;
_screenID = SPLASH_SCREEN;
_splash_displayed=false;
_screenwidth = SCREEN_WIDTH;
_screenheight = SCREEN_HEIGHT;
}
Display::~Display()
{
end();
}
bool Display::begin()
{
bool res = true;
_started = false;
//log_esp3d("Init Display");
#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
#if defined(DISPLAY_I2C_PIN_RST)
pinMode(DISPLAY_I2C_PIN_RST,OUTPUT);
digitalWrite(DISPLAY_I2C_PIN_RST, LOW); // turn the LED on (HIGH is the voltage level)
delay(10); // wait for a second
digitalWrite(DISPLAY_I2C_PIN_RST, HIGH); // turn the LED off by making the voltage LOW
#endif //DISPLAY_I2C_PIN_RST
esp3d_screen.init();
esp3d_screen.clear();
#if defined(DISPLAY_FLIP_VERTICALY)
esp3d_screen.flipScreenVertically();
#endif
#endif //DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
#if (DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
#if defined (DISPLAY_LED_PIN) && (DISPLAY_LED_PIN!=-1)
pinMode(DISPLAY_LED_PIN, OUTPUT); // sets the digital pin 13 as output
digitalWrite(DISPLAY_LED_PIN, HIGH);
#endif //DISPLAY_LED_PIN
esp3d_screen.begin(); // Initialise the display
#if defined(DISPLAY_FLIP_VERTICALY)
esp3d_screen.setRotation(3);
#else
esp3d_screen.setRotation(1);
#endif
esp3d_screen.fillScreen(SCREEN_BG); // Black screen fill
#endif //(DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
show_screenID(SPLASH_SCREEN);
update_screen();
#if defined(DISPLAY_TOUCH_DRIVER)
if(Settings_ESP3D::read_byte(ESP_CALIBRATION)==1) {
uint16_t calibrationData[5];
for (uint8_t i = 0; i < 5; i++) {
calibrationData[i] = Settings_ESP3D::read_uint32 (ESP_CALIBRATION_1+(4*i));
}
esp3d_screen.setTouch(calibrationData);
}
#endif //DISPLAY_TOUCH_DRIVER
res = true;
if (!res) {
end();
}
_started = res;
return _started;
}
void Display::end()
{
if(!_started) {
return;
}
_status ="";
_started = false;
_screenID = SPLASH_SCREEN;
_splash_displayed=false;
clear_screen();
}
void Display::SetStatus(const char * status)
{
_status= status;
}
void Display::clear_screen()
{
//log_esp3d("clear screen");
#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
esp3d_screen.clear();
#endif //#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
#if (DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
//log_esp3d("Fill black");
esp3d_screen.fillScreen(SCREEN_BG); // Black screen fill
#endif //(DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
}
void Display::update_screen(bool force)
{
if ( !ESP3DOutput::isOutput(ESP_SCREEN_CLIENT)) {
return;
}
static uint32_t last_update = millis();
bool need_update = force;
if (((millis()- last_update) > DISPLAY_REFRESH_TIME) || force) {
last_update = millis();
switch(_screenID) {
case SPLASH_SCREEN:
if (!_splash_displayed) {
need_update = splash();
}
break;
case MAIN_SCREEN:
need_update = main_screen(force);
break;
default:
break;
}
if (need_update) {
#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
esp3d_screen.display();
//log_esp3d("Update display");
#endif //DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
Hal::wait(0);
}
}
}
void Display::handle()
{
if ( !ESP3DOutput::isOutput(ESP_SCREEN_CLIENT)) {
return;
}
if (_started) {
update_screen();
}
}
// Draw a line from position 0 to position 1
void Display::drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t color)
{
if ( !ESP3DOutput::isOutput(ESP_SCREEN_CLIENT)) {
return;
}
#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
esp3d_screen.setColor((color == TFT_BLACK)?BLACK:WHITE);
esp3d_screen.drawLine(x0, y0, x1, y1);
#endif //#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
#if (DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
esp3d_screen.drawLine(x0, y0, x1, y1, color);
#endif (DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
}
// Draw the border of a rectangle at the given location
void Display::drawRect(int16_t x, int16_t y, int16_t width, int16_t height, int16_t color)
{
if ( !ESP3DOutput::isOutput(ESP_SCREEN_CLIENT)) {
return;
}
#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
esp3d_screen.setColor((color == TFT_BLACK)?BLACK:WHITE);
esp3d_screen.drawRect(x, y, width, height);
#endif //#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
#if (DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
esp3d_screen.drawRect(x, y, width, height, color);
#endif //(DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
}
// Fill the rectangle
void Display::fillRect(int16_t x, int16_t y, int16_t width, int16_t height, int16_t color)
{
if ( !ESP3DOutput::isOutput(ESP_SCREEN_CLIENT)) {
return;
}
#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
esp3d_screen.setColor((color == TFT_BLACK)?BLACK:WHITE);
esp3d_screen.fillRect(x, y, width, height);
#endif //#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
#if (DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
esp3d_screen.fillRect(x, y, width, height, color);
#endif //(DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
}
void Display::setTextFont(uint8_t font)
{
#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
switch(font) {
case 3:
esp3d_screen.setFont(ArialMT_Plain_16);
break;
case 2:
default:
esp3d_screen.setFont(ArialMT_Plain_10);
}
#endif //#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
#if (DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
esp3d_screen.setTextFont(font);
#endif //(DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
}
void Display::drawString(const char *string, int32_t poX, int32_t poY, int16_t color)
{
if ( !ESP3DOutput::isOutput(ESP_SCREEN_CLIENT)) {
return;
}
#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
esp3d_screen.setColor((color == TFT_BLACK)?BLACK:WHITE);
esp3d_screen.drawString(poX, poY, string);
#endif //#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
#if (DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
esp3d_screen.setTextColor(color);
esp3d_screen.drawString(string, poX, poY);
#endif //(DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
}
// Draw a XBM
void Display::drawXbm(int16_t x, int16_t y, int16_t width, int16_t height, int16_t color, const uint8_t *xbm)
{
if ( !ESP3DOutput::isOutput(ESP_SCREEN_CLIENT)) {
return;
}
#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
(void)color;
esp3d_screen.drawXbm(x, y, width, height, xbm);
#endif //#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
#if (DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
esp3d_screen.drawXBitmap(x, y, xbm, width, height,color);
#endif //(DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
}
void Display::drawXbm(int16_t x, int16_t y, int16_t width, int16_t height, uint16_t fgcolor, uint16_t bgcolor, const uint8_t *xbm)
{
if ( !ESP3DOutput::isOutput(ESP_SCREEN_CLIENT)) {
return;
}
#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
(void)fgcolor;
(void)bgcolor;
esp3d_screen.drawXbm(x, y, width, height, xbm);
#endif //#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
#if (DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
esp3d_screen.drawXBitmap(x, y, xbm, width, height, fgcolor, bgcolor);
#endif //(DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
}
uint16_t Display::getStringWidth(const char* text)
{
#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
return esp3d_screen.getStringWidth(text, strlen(text));
#endif //#if DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
#if (DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
return esp3d_screen.textWidth(text);
#endif //(DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
}
void Display::progress(uint8_t v)
{
if ( !ESP3DOutput::isOutput(ESP_SCREEN_CLIENT)) {
return;
}
static uint8_t previous = 0;
if (previous > v) {
//clear
fillRect(10, _screenheight-2, _screenwidth-20, 2, SCREEN_BG);
}
//log_esp3d("%d", v);
previous = v;
//display bar
drawRect(10, _screenheight-2, ((_screenwidth-20) * v)/100, 2, PROGRESS_FG);
//update screen
update_screen(true);
}
void display_progress(uint8_t v)
{
esp3d_display.progress(v);
}
#endif //DISPLAY_DEVICE

58
esp3d/src/modules/display/advanceddisplay.h Normal file
View File

@ -0,0 +1,58 @@
/*
advanceddisplay.h - display functions class
Copyright (c) 2014 Luc Lebosse. All rights reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define SPLASH_SCREEN 0
#define MAIN_SCREEN 1
#define CALIBRATION_SCREEN 2
#ifndef _ADVANCEDDISPLAY_H
#define _ADVANCEDDISPLAY_H
class Display
{
public:
Display();
~Display();
bool begin();
void end();
void handle();
void show_screenID(uint8_t screenID);
void update_screen(bool force=false);
void clear_screen();
void progress(uint8_t v);
void SetStatus(const char * status);
bool startCalibration();
private:
bool splash();
bool showStatus(bool force = false);
bool _started;
uint8_t _screenID;
bool _splash_displayed;
uint _screenwidth;
uint _screenheight;
String _status;
};
extern Display esp3d_display;
extern void display_progress(uint8_t v);
#endif //_ADVANCEDDISPLAY_H

70
esp3d/src/modules/display/basic_ILI9341_320X240.h Normal file
View File

@ -0,0 +1,70 @@
/*
TFT_ILI9341_320X240.h - ESP3D display data file
Copyright (c) 2014 Luc Lebosse. All rights reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
//Screen size
#define SCREEN_WIDTH 320
#define SCREEN_HEIGHT 240
//Colors
#define SPLASH_FG TFT_BLACK
#define SPLASH_BG TFT_WHITE
#define SCREEN_BG TFT_BLACK
#define PROGRESS_FG TFT_WHITE
#define SIGNAL_FG TFT_WHITE
#define SSID_FG TFT_WHITE
#define IP_FG TFT_WHITE
#define STATUS_FG TFT_WHITE
#define CALIBRATION_BG TFT_BLACK
#define CALIBRATION_FG TFT_GREEN
#define CALIBRATION_CORNER TFT_RED
//Fonts
#define FONTSIGNAL 2
#define FONTSSID 2
#define FONTIP 2
#define FONTSTATUS 2
#define FONTCALIBRATION 2
//Positions
#define SIGNAL_X 320-34
#define SIGNAL_Y 0
#define SIGNAL_W 34
#define SIGNAL_H 16
#define SIGNAL_ICON_X 320-50
#define SIGNAL_ICON_Y 2
#define SIGNAL_ICON_W 15
#define SIGNAL_ICON_H 10
#define SIGNAL_ICON_W_BAR 3
#define SIGNAL_ICON_SPACER_X 1
#define SSID_AREA_X 0
#define SSID_AREA_Y 0
#define SSID_AREA_W 269
#define SSID_AREA_H 16
#define IP_AREA_X 0
#define IP_AREA_Y 16
#define IP_AREA_W 320
#define IP_AREA_H 16
#define STATUS_AREA_X 0
#define STATUS_AREA_Y 223
#define STATUS_AREA_W 320
#define STATUS_AREA_H 16

70
esp3d/src/modules/display/basic_ILI9488_480X320.h Normal file
View File

@ -0,0 +1,70 @@
/*
TFT_ILI9488_480X320.h - ESP3D display data file
Copyright (c) 2014 Luc Lebosse. All rights reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
//Screen size
#define SCREEN_WIDTH 480
#define SCREEN_HEIGHT 320
//Colors
#define SPLASH_FG TFT_BLACK
#define SPLASH_BG TFT_WHITE
#define SCREEN_BG TFT_BLACK
#define PROGRESS_FG TFT_WHITE
#define SIGNAL_FG TFT_WHITE
#define SSID_FG TFT_WHITE
#define IP_FG TFT_WHITE
#define STATUS_FG TFT_WHITE
#define CALIBRATION_BG TFT_BLACK
#define CALIBRATION_FG TFT_GREEN
#define CALIBRATION_CORNER TFT_RED
//Fonts
#define FONTSIGNAL 2
#define FONTSSID 2
#define FONTIP 2
#define FONTSTATUS 2
#define FONTCALIBRATION 2
//Positions
#define SIGNAL_X SCREEN_WIDTH-34
#define SIGNAL_Y 0
#define SIGNAL_W 34
#define SIGNAL_H 16
#define SIGNAL_ICON_X SCREEN_WIDTH-50
#define SIGNAL_ICON_Y 2
#define SIGNAL_ICON_W 15
#define SIGNAL_ICON_H 10
#define SIGNAL_ICON_W_BAR 3
#define SIGNAL_ICON_SPACER_X 1
#define SSID_AREA_X 0
#define SSID_AREA_Y 0
#define SSID_AREA_W SCREEN_WIDTH -51 -120
#define SSID_AREA_H 16
#define IP_AREA_X SCREEN_WIDTH -51 -120
#define IP_AREA_Y 0
#define IP_AREA_W 100
#define IP_AREA_H 16
#define STATUS_AREA_X 0
#define STATUS_AREA_Y SCREEN_HEIGHT - 17
#define STATUS_AREA_W SCREEN_WIDTH
#define STATUS_AREA_H 16

67
esp3d/src/modules/display/basic_SSD1306.h Normal file
View File

@ -0,0 +1,67 @@
/*
OLED_SSD1306.h - ESP3D display data file
Copyright (c) 2014 Luc Lebosse. All rights reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
//Screen size
#define SCREEN_WIDTH 128
#define SCREEN_HEIGHT 64
//Colors
#define TFT_BLACK BLACK
#define TFT_WHITE WHITE
#define SPLASH_FG TFT_BLACK
#define SPLASH_BG TFT_WHITE
#define SCREEN_BG TFT_BLACK
#define PROGRESS_FG TFT_WHITE
#define SIGNAL_FG TFT_WHITE
#define SSID_FG TFT_WHITE
#define IP_FG TFT_WHITE
#define STATUS_FG TFT_WHITE
//Fonts
#define FONTSIGNAL 2
#define FONTSSID 2
#define FONTIP 3
#define FONTSTATUS 2
//Positions
#define SIGNAL_X 128-27
#define SIGNAL_Y 0
#define SIGNAL_W 46
#define SIGNAL_H 10
#define SIGNAL_ICON_X 128-43
#define SIGNAL_ICON_Y 2
#define SIGNAL_ICON_W 15
#define SIGNAL_ICON_H 10
#define SIGNAL_ICON_W_BAR 3
#define SIGNAL_ICON_SPACER_X 1
#define SSID_AREA_X 0
#define SSID_AREA_Y 0
#define SSID_AREA_W 85
#define SSID_AREA_H 12
#define IP_AREA_X 0
#define IP_AREA_Y 16
#define IP_AREA_W 128
#define IP_AREA_H 16
#define STATUS_AREA_X 0
#define STATUS_AREA_Y 48
#define STATUS_AREA_W 128
#define STATUS_AREA_H 16

67
esp3d/src/modules/display/basic_SSDSH1106.h Normal file
View File

@ -0,0 +1,67 @@
/*
OLED_SSDSH1106.h - ESP3D display data file
Copyright (c) 2014 Luc Lebosse. All rights reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
//Screen size
#define SCREEN_WIDTH 132
#define SCREEN_HEIGHT 64
//Colors
#define TFT_BLACK BLACK
#define TFT_WHITE WHITE
#define SPLASH_FG TFT_BLACK
#define SPLASH_BG TFT_WHITE
#define SCREEN_BG TFT_BLACK
#define PROGRESS_FG TFT_WHITE
#define SIGNAL_FG TFT_WHITE
#define SSID_FG TFT_WHITE
#define IP_FG TFT_WHITE
#define STATUS_FG TFT_WHITE
//Fonts
#define FONTSIGNAL 2
#define FONTSSID 2
#define FONTIP 3
#define FONTSTATUS 2
//Positions
#define SIGNAL_X 132-27
#define SIGNAL_Y 0
#define SIGNAL_W 46
#define SIGNAL_H 10
#define SIGNAL_ICON_X 132-43
#define SIGNAL_ICON_Y 2
#define SIGNAL_ICON_W 15
#define SIGNAL_ICON_H 10
#define SIGNAL_ICON_W_BAR 3
#define SIGNAL_ICON_SPACER_X 1
#define SSID_AREA_X 0
#define SSID_AREA_Y 0
#define SSID_AREA_W 85
#define SSID_AREA_H 12
#define IP_AREA_X 0
#define IP_AREA_Y 16
#define IP_AREA_W 132
#define IP_AREA_H 16
#define STATUS_AREA_X 0
#define STATUS_AREA_Y 48
#define STATUS_AREA_W 132
#define STATUS_AREA_H 16

18
esp3d/src/modules/display/display.cpp → esp3d/src/modules/display/basicdisplay.cpp
View File

@ -1,5 +1,5 @@
/* /*
display.cpp - display functions class advanceddisplay.cpp - display functions class
Copyright (c) 2014 Luc Lebosse. All rights reserved. Copyright (c) 2014 Luc Lebosse. All rights reserved.
@ -19,8 +19,9 @@
*/ */
#include "../../include/esp3d_config.h" #include "../../include/esp3d_config.h"
#if defined (DISPLAY_DEVICE) #if defined (DISPLAY_DEVICE) && (DISPLAY_UI_TYPE == UI_TYPE_BASIC)
#include "display.h"
#include "basicdisplay.h"
#include "../../core/settings_esp3d.h" #include "../../core/settings_esp3d.h"
#include "../../core/esp3doutput.h" #include "../../core/esp3doutput.h"
@ -30,12 +31,12 @@
#if DISPLAY_DEVICE == OLED_I2C_SSD1306 #if DISPLAY_DEVICE == OLED_I2C_SSD1306
#include <SSD1306Wire.h> #include <SSD1306Wire.h>
SSD1306Wire esp3d_screen(DISPLAY_I2C_ADDR, DISPLAY_I2C_PIN_SDA, DISPLAY_I2C_PIN_SCL); SSD1306Wire esp3d_screen(DISPLAY_I2C_ADDR, DISPLAY_I2C_PIN_SDA, DISPLAY_I2C_PIN_SCL);
#include "OLED_SSD1306.h" #include "basic_SSD1306.h"
#endif //DISPLAY_DEVICE == OLED_I2C_SSD1306 #endif //DISPLAY_DEVICE == OLED_I2C_SSD1306
#if DISPLAY_DEVICE == OLED_I2C_SSDSH1106 #if DISPLAY_DEVICE == OLED_I2C_SSDSH1106
#include <SH1106Wire.h> #include <SH1106Wire.h>
SH1106Wire esp3d_screen(DISPLAY_I2C_ADDR, (DISPLAY_I2C_PIN_SDA==-1)?SDA:DISPLAY_I2C_PIN_SDA, (DISPLAY_I2C_PIN_SCL==-1)?SCL:DISPLAY_I2C_PIN_SCL); SH1106Wire esp3d_screen(DISPLAY_I2C_ADDR, (DISPLAY_I2C_PIN_SDA==-1)?SDA:DISPLAY_I2C_PIN_SDA, (DISPLAY_I2C_PIN_SCL==-1)?SCL:DISPLAY_I2C_PIN_SCL);
#include "OLED_SSDSH1106.h" #include "basic_SSDSH1106.h"
#endif //DISPLAY_DEVICE == OLED_I2C_SSDSH1106 #endif //DISPLAY_DEVICE == OLED_I2C_SSDSH1106
#endif //DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106 #endif //DISPLAY_DEVICE == OLED_I2C_SSD1306 || DISPLAY_DEVICE == OLED_I2C_SSDSH1106
#if (DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320) #if (DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
@ -43,10 +44,10 @@ SH1106Wire esp3d_screen(DISPLAY_I2C_ADDR, (DISPLAY_I2C_PIN_SDA==-1)?SDA:DISPLAY
TFT_eSPI esp3d_screen = TFT_eSPI(); TFT_eSPI esp3d_screen = TFT_eSPI();
#include "esp3d_logob.h" #include "esp3d_logob.h"
#if (DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) #if (DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240)
#include "TFT_ILI9341_320X240.h" #include "basic_ILI9341_320X240.h"
#endif //(DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) #endif //(DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240)
#if (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320) #if (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
#include "TFT_ILI9488_480X320.h" #include "basic_ILI9488_480X320.h"
#endif //(DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320) #endif //(DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
#endif //(DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320) #endif //(DISPLAY_DEVICE == TFT_SPI_ILI9341_320X240) || (DISPLAY_DEVICE == TFT_SPI_ILI9488_480X320)
#if defined (WIFI_FEATURE) #if defined (WIFI_FEATURE)
@ -63,7 +64,6 @@ TFT_eSPI esp3d_screen = TFT_eSPI();
#endif //WIFI_FEATURE || ETH_FEATURE) ||BLUETOOTH_FEATURE #endif //WIFI_FEATURE || ETH_FEATURE) ||BLUETOOTH_FEATURE
#define DISPLAY_REFRESH_TIME 1000 #define DISPLAY_REFRESH_TIME 1000
Display esp3d_display;
bool Display::startCalibration() bool Display::startCalibration()
{ {
@ -99,6 +99,8 @@ bool Display::startCalibration()
return res; return res;
} }
Display esp3d_display;
bool Display::splash() bool Display::splash()
{ {
//log_esp3d("Splash"); //log_esp3d("Splash");

70
esp3d/src/modules/display/basicdisplay.h Normal file
View File

@ -0,0 +1,70 @@
/*
basicdisplay.h - display functions class
Copyright (c) 2014 Luc Lebosse. All rights reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define SPLASH_SCREEN 0
#define MAIN_SCREEN 1
#define CALIBRATION_SCREEN 2
#ifndef _BASICDISPLAY_H
#define _BASICDISPLAY_H
class Display
{
public:
Display();
~Display();
bool begin();
void end();
void handle();
void show_screenID(uint8_t screenID);
void update_screen(bool force=false);
void clear_screen();
void progress(uint8_t v);
void SetStatus(const char * status);
bool startCalibration();
private:
bool main_screen(bool force = false);
bool display_signal(bool force = false);
bool display_IP(bool force = false);
bool splash();
bool showStatus(bool force = false);
bool _started;
uint8_t _screenID;
bool _splash_displayed;
uint _screenwidth;
uint _screenheight;
uint16_t sizetoFitSpace(const char * string, uint16_t maxwidth);
void drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t color);
void drawRect(int16_t x, int16_t y, int16_t width, int16_t height, int16_t color);
void fillRect(int16_t x, int16_t y, int16_t width, int16_t height, int16_t color);
void setTextFont(uint8_t font);
void drawString(const char *string, int32_t poX, int32_t poY, int16_t color);
void drawXbm(int16_t x, int16_t y, int16_t width, int16_t height, int16_t color, const uint8_t *xbm);
void drawXbm(int16_t x, int16_t y, int16_t width, int16_t height, uint16_t fgcolor, uint16_t bgcolor, const uint8_t *xbm);
uint16_t getStringWidth(const char* text);
String _status;
};
extern Display esp3d_display;
extern void display_progress(uint8_t v);
#endif //_BASICDISPLAY_H

57
esp3d/src/modules/display/display.h
View File

@ -17,54 +17,9 @@
License along with this library; if not, write to the Free Software License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "../../include/defines.h"
#define SPLASH_SCREEN 0 #if DISPLAY_TYPE == UI_TYPE_BASIC
#define MAIN_SCREEN 1 #include "basicdisplay.h"
#define CALIBRATION_SCREEN 2 #else
#include "advanceddisplay.h"
#ifndef _DISPLAY_H #endif //DISPLAY_TYPE
#define _DISPLAY_H
class Display
{
public:
Display();
~Display();
bool begin();
void end();
void handle();
void show_screenID(uint8_t screenID);
void update_screen(bool force=false);
void clear_screen();
void progress(uint8_t v);
void SetStatus(const char * status);
bool startCalibration();
private:
bool main_screen(bool force = false);
bool display_signal(bool force = false);
bool display_IP(bool force = false);
bool splash();
bool showStatus(bool force = false);
bool _started;
uint8_t _screenID;
bool _splash_displayed;
uint _screenwidth;
uint _screenheight;
uint16_t sizetoFitSpace(const char * string, uint16_t maxwidth);
void drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t color);
void drawRect(int16_t x, int16_t y, int16_t width, int16_t height, int16_t color);
void fillRect(int16_t x, int16_t y, int16_t width, int16_t height, int16_t color);
void setTextFont(uint8_t font);
void drawString(const char *string, int32_t poX, int32_t poY, int16_t color);
void drawXbm(int16_t x, int16_t y, int16_t width, int16_t height, int16_t color, const uint8_t *xbm);
void drawXbm(int16_t x, int16_t y, int16_t width, int16_t height, uint16_t fgcolor, uint16_t bgcolor, const uint8_t *xbm);
uint16_t getStringWidth(const char* text);
String _status;
};
extern Display esp3d_display;
extern void display_progress(uint8_t v);
#endif //_DISPLAY_H