Skip to content

Commit

Permalink
updated waveshare code, cosmetical changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Yattien
Yattien committed Nov 2, 2020
1 parent 30cdbc4 commit 138fb46
Show file tree
Hide file tree
Showing 17 changed files with 2,234 additions and 1,475 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Version v17

- Fix display 2in13 V2 is reset if no data available
- Updated waveshare code to version 29.20.2020

## Version v16

Expand Down
4 changes: 2 additions & 2 deletions ESPEInk_ESP8266.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void getConfig() {
}
}
} else {
Serial.println(" Failed to mount FS.");
Serial.println(" Failed to mount FS (probably initial start), continuing w/o config...");
}
}

Expand All @@ -132,7 +132,7 @@ void setupWifi() {
requestMqttParameters(&wifiManager);
initAccessPointName();
if (!wifiManager.autoConnect(accessPointName)) {
Serial.println("failed to connect, resetting");
Serial.println(" Failed to connect, resetting.");
WiFi.disconnect();
delay(1000);
ESP.restart();
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Erweiterung des ESP8266-Waveshare-Treibers um Wifi-Einrichtungsassistent, Deepsl
![GitHub issues](https://img.shields.io/github/issues-raw/Yattien/ESPEInk_ESP8266)

# Waveshare-Treiberversion
[28.02.2020](https://www.waveshare.com/wiki/File:E-Paper_ESP8266_Driver_Board_Code.7z)
[29.10.2020](https://www.waveshare.com/wiki/File:E-Paper_ESP8266_Driver_Board_Code.7z)

# Installation
Das fertige Image kann per OTA (siehe auch OTA-Beispiel-Sketche) oder auch per [`esptool`](https://github.com/espressif/esptool) auf den ESP8266 geladen werden.
Expand Down
288 changes: 144 additions & 144 deletions css.h
View file
Original file line number Diff line number Diff line change
@@ -1,145 +1,145 @@
/**
******************************************************************************
* @file css.h
* @author Waveshare Team
* @version V1.0.0
* @date 23-January-2018
* @brief This file describes the sending of Cascade Style Sheet to a client
*
******************************************************************************
*/
extern ESP8266WebServer server;
void sendCSS()
{
server.send(200, "text/css",
".menu_button {\r\n"
"width: 100%;\r\n"
"height: 30px;\r\n"
"border-radius: 4px;\r\n"
"text-align: center;\r\n"
"cursor: pointer;\r\n"
"display: block;\r\n"
"margin-bottom:5px;\r\n"
"font: 14px/30px Tahoma;\r\n"
"transition: all 0.18s ease-in-out;\r\n"
"border: 1px solid #4FD666;\r\n"
"background: linear-gradient(to top right, #3EC97A, #69EA49 20%, rgba(255, 255, 255, 0) 80%, rgba(255, 255, 255, 0)) top right/500% 500%;\r\n"
"color: green;\r\n"
"}\r\n"

".menu_button:hover {\r\n"
"color: white;\r\n"
"background-position: bottom left;\r\n"
"}\r\n"

".hidden_input {\r\n"
"width: 0.1px;\r\n"
"height: 0.1px;\r\n"
"opacity: 0;\r\n"
"overflow: hidden;\r\n"
"position: absolute;\r\n"
"z-index: -1;\r\n"
"}\r\n"

".imgBox\r\n"
"{\r\n"
"border: 2px dashed green;\r\n"
"border-radius: 8px;\r\n"
"background: lightyellow;\r\n"
"background-repeat: no-repeat;\r\n"
"text-align: center;\r\n"
"margin-top:10px;\r\n"
"}\r\n"

".mesBox {\r\n"
"margin: 100px 70px;\r\n"
"color: green;\r\n"
"font-size: 25px;\r\n"
"font-family: Verdana, Arial, sans-serif;\r\n"
"}\r\n"

".header_back\r\n"
"{\r\n"
"width:100%;\r\n"
"height:100px;\r\n"
"background:#EEEEEE;\r\n"
"}\r\n"

".content_back\r\n"
"{\r\n"
"width:100%;\r\n"
"background:#EEEEEE;\r\n"
"}\r\n"

".footer_back\r\n"
"{\r\n"
"width:100%;\r\n"
"height:100px;\r\n"
"background:#EEEEEE;\r\n"
"}\r\n"

".header_face\r\n"
"{\r\n"
"width:1024px;\r\n"
"height:100px;\r\n"
"margin:0 auto;\r\n"
"background:#CCFFCC;\r\n"
"}\r\n"

".content_face\r\n"
"{\r\n"
"width:1024px;\r\n"
"height:100%;\r\n"
"margin:0 auto;\r\n"
"background:#FFFFFF;\r\n"
"}\r\n"

".footer_face\r\n"
"{\r\n"
"width:1024px;\r\n"
"height:100%;\r\n"
"margin:0 auto;\r\n"
"background:#CCFFCC;\r\n"
"}\r\n"

".menu_bar\r\n"
"{\r\n"
"border-right:1px solid #4FD666;\r\n"
"background:#EEFFEE;\r\n"
"vertical-align:top;\r\n"
"padding:15px;\r\n"
"width:200px;\r\n"
"height:100%\r\n"
"}\r\n"

".content_body\r\n"
"{\r\n"
"vertical-align:top;\r\n"
"text-align:center;\r\n"
"height:100%;\r\n"
"padding:30px;\r\n"
"padding-left:15px;\r\n"
"}\r\n"

".title\r\n"
"{\r\n"
"color:green;\r\n"
"font-size:32px;\r\n"
"font-family: arial;\r\n"
"}\r\n"

".comment\r\n"
"{\r\n"
"width:100%;\r\n"
"color:green;\r\n"
"font-size:16px;\r\n"
"font-style:italic;\r\n"
"font-family: arial;\r\n"
"text-align:center;\r\n"
"}\r\n"

".nud\r\n"
"{\r\n"
"width:70px;\r\n"
"}\r\n");
/**
******************************************************************************
* @file css.h
* @author Waveshare Team
* @version V1.0.0
* @date 23-January-2018
* @brief This file describes the sending of Cascade Style Sheet to a client
*
******************************************************************************
*/
extern ESP8266WebServer server;
void sendCSS()
{
server.send(200, "text/css",
".menu_button {\r\n"
"width: 100%;\r\n"
"height: 30px;\r\n"
"border-radius: 4px;\r\n"
"text-align: center;\r\n"
"cursor: pointer;\r\n"
"display: block;\r\n"
"margin-bottom:5px;\r\n"
"font: 14px/30px Tahoma;\r\n"
"transition: all 0.18s ease-in-out;\r\n"
"border: 1px solid #4FD666;\r\n"
"background: linear-gradient(to top right, #3EC97A, #69EA49 20%, rgba(255, 255, 255, 0) 80%, rgba(255, 255, 255, 0)) top right/500% 500%;\r\n"
"color: green;\r\n"
"}\r\n"

".menu_button:hover {\r\n"
"color: white;\r\n"
"background-position: bottom left;\r\n"
"}\r\n"

".hidden_input {\r\n"
"width: 0.1px;\r\n"
"height: 0.1px;\r\n"
"opacity: 0;\r\n"
"overflow: hidden;\r\n"
"position: absolute;\r\n"
"z-index: -1;\r\n"
"}\r\n"

".imgBox\r\n"
"{\r\n"
"border: 2px dashed green;\r\n"
"border-radius: 8px;\r\n"
"background: lightyellow;\r\n"
"background-repeat: no-repeat;\r\n"
"text-align: center;\r\n"
"margin-top:10px;\r\n"
"}\r\n"

".mesBox {\r\n"
"margin: 100px 70px;\r\n"
"color: green;\r\n"
"font-size: 25px;\r\n"
"font-family: Verdana, Arial, sans-serif;\r\n"
"}\r\n"

".header_back\r\n"
"{\r\n"
"width:100%;\r\n"
"height:100px;\r\n"
"background:#EEEEEE;\r\n"
"}\r\n"

".content_back\r\n"
"{\r\n"
"width:100%;\r\n"
"background:#EEEEEE;\r\n"
"}\r\n"

".footer_back\r\n"
"{\r\n"
"width:100%;\r\n"
"height:100px;\r\n"
"background:#EEEEEE;\r\n"
"}\r\n"

".header_face\r\n"
"{\r\n"
"width:1024px;\r\n"
"height:100px;\r\n"
"margin:0 auto;\r\n"
"background:#CCFFCC;\r\n"
"}\r\n"

".content_face\r\n"
"{\r\n"
"width:1024px;\r\n"
"height:100%;\r\n"
"margin:0 auto;\r\n"
"background:#FFFFFF;\r\n"
"}\r\n"

".footer_face\r\n"
"{\r\n"
"width:1024px;\r\n"
"height:100%;\r\n"
"margin:0 auto;\r\n"
"background:#CCFFCC;\r\n"
"}\r\n"

".menu_bar\r\n"
"{\r\n"
"border-right:1px solid #4FD666;\r\n"
"background:#EEFFEE;\r\n"
"vertical-align:top;\r\n"
"padding:15px;\r\n"
"width:200px;\r\n"
"height:100%\r\n"
"}\r\n"

".content_body\r\n"
"{\r\n"
"vertical-align:top;\r\n"
"text-align:center;\r\n"
"height:100%;\r\n"
"padding:30px;\r\n"
"padding-left:15px;\r\n"
"}\r\n"

".title\r\n"
"{\r\n"
"color:green;\r\n"
"font-size:32px;\r\n"
"font-family: arial;\r\n"
"}\r\n"

".comment\r\n"
"{\r\n"
"width:100%;\r\n"
"color:green;\r\n"
"font-size:16px;\r\n"
"font-style:italic;\r\n"
"font-family: arial;\r\n"
"text-align:center;\r\n"
"}\r\n"

".nud\r\n"
"{\r\n"
"width:70px;\r\n"
"}\r\n");
}
Loading

0 comments on commit 138fb46

Please sign in to comment.