mirror of
https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git
synced 2025-08-05 00:50:45 +08:00

### Maintenance page * Add add tab color for mobile view * Add spellcheck off / autocorect off in input * Add disconnect button when authenticate enabled * Add Invalid user or password message when authentication failed ### Board support * Add ESP32 S2 support * Add ESP32 S3 support * Add ESP32 C3 support ### ESP commands * Add command 701 to control GCODE streaming * Remove command 901 as duplicate * Update command 420 to add more details * Use text as default output * All json on all commands for formated output ### Core * Add benchmak function to check transfer speed (for test only-not production) * Merge code for ESP3DLib support * Add better printer display support (M117 / Serial TFT) * Use ESP32 analogWrite instead of emulated one ### Modules * Display * Refactor code * Remove SPI ILI 9341 / 9488 support as not suitable * Add ST7789 support (135x240 / 240x240) * Filesystem * Bug fixes due to esp core updates * Better SD sharing mecanism * Better global FS management * FTP * Add SD sharing support * Better global FS management * GCODE Host * Add basic support for macro files * Add ESP command support * Use not blocking method to stream commands / handle response * Notifications * Add IFTTT notification service * Add WebUI notification * Add ESP3D display notification * WebDav * Add SD sharing support * Add bug fix from https://github.com/d-a-v/ESPWebDAV * Better global FS management * Websocket * Add function to handle zombies connections * WiFi * Fix connection to AP sometime fail * Fix low signal not diplayed in ESP420 even connected * Add AP Setup mode ### Libraries * Update SDFat-2.0.6 to 2.1.2 * Update ESP32SSDP 1.1.1 to 1.2.0 * Update TFT_eSPI-1.4.11 to 2.4.61 * Update arduinoWebSockets-2.3.5 to 2.3.6 * Update esp8266-oled-ssd1306-4.0.0 to 4.3.0 * Remove lvgl support ### Tools * Add I2C scanner script * Add python script to simulate/stress printer serial communication ### PlatformIO * Use latest 4.4.0 Espressif32 release (ESP32-arduino core 2.0.3) * Add fix for Flash more than 4MB * Add Esp32 S2/S3/C3 env * Add ESP32-ST7789 / esp32-TTGO_T_Display env
213 lines
7.3 KiB
C++
213 lines
7.3 KiB
C++
/**
|
|
The MIT License (MIT)
|
|
|
|
Copyright (c) 2018 by ThingPulse, Daniel Eichhorn
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
of this software and associated documentation files (the "Software"), to deal
|
|
in the Software without restriction, including without limitation the rights
|
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
copies of the Software, and to permit persons to whom the Software is
|
|
furnished to do so, subject to the following conditions:
|
|
|
|
The above copyright notice and this permission notice shall be included in all
|
|
copies or substantial portions of the Software.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
SOFTWARE.
|
|
|
|
ThingPulse invests considerable time and money to develop these open source libraries.
|
|
Please support us by buying our products (and not the clones) from
|
|
https://thingpulse.com
|
|
|
|
*/
|
|
|
|
// Install https://github.com/PaulStoffregen/Time
|
|
#include <TimeLib.h>
|
|
|
|
// Include the correct display library
|
|
// For a connection via I2C using Wire include
|
|
#include <Wire.h> // Only needed for Arduino 1.6.5 and earlier
|
|
#include "SSD1306Wire.h" // legacy include: `#include "SSD1306.h"`
|
|
// or #include "SH1106Wire.h", legacy include: `#include "SH1106.h"`
|
|
// For a connection via I2C using brzo_i2c (must be installed) include
|
|
// #include <brzo_i2c.h> // Only needed for Arduino 1.6.5 and earlier
|
|
// #include "SSD1306Brzo.h"
|
|
// #include "SH1106Brzo.h"
|
|
// For a connection via SPI include
|
|
// #include <SPI.h> // Only needed for Arduino 1.6.5 and earlier
|
|
// #include "SSD1306Spi.h"
|
|
// #include "SH1106SPi.h"
|
|
|
|
// Include the UI lib
|
|
#include "OLEDDisplayUi.h"
|
|
|
|
// Include custom images
|
|
#include "images.h"
|
|
|
|
// Use the corresponding display class:
|
|
|
|
// Initialize the OLED display using SPI
|
|
// D5 -> CLK
|
|
// D7 -> MOSI (DOUT)
|
|
// D0 -> RES
|
|
// D2 -> DC
|
|
// D8 -> CS
|
|
// SSD1306Spi display(D0, D2, D8);
|
|
// or
|
|
// SH1106Spi display(D0, D2);
|
|
|
|
// Initialize the OLED display using brzo_i2c
|
|
// D3 -> SDA
|
|
// D5 -> SCL
|
|
// SSD1306Brzo display(0x3c, D3, D5);
|
|
// or
|
|
// SH1106Brzo display(0x3c, D3, D5);
|
|
|
|
// Initialize the OLED display using Wire library
|
|
SSD1306Wire display(0x3c, SDA, SCL); // ADDRESS, SDA, SCL - SDA and SCL usually populate automatically based on your board's pins_arduino.h e.g. https://github.com/esp8266/Arduino/blob/master/variants/nodemcu/pins_arduino.h
|
|
// SH1106Wire display(0x3c, SDA, SCL);
|
|
|
|
OLEDDisplayUi ui ( &display );
|
|
|
|
int screenW = 128;
|
|
int screenH = 64;
|
|
int clockCenterX = screenW / 2;
|
|
int clockCenterY = ((screenH - 16) / 2) + 16; // top yellow part is 16 px height
|
|
int clockRadius = 23;
|
|
|
|
// utility function for digital clock display: prints leading 0
|
|
String twoDigits(int digits) {
|
|
if (digits < 10) {
|
|
String i = '0' + String(digits);
|
|
return i;
|
|
}
|
|
else {
|
|
return String(digits);
|
|
}
|
|
}
|
|
|
|
void clockOverlay(OLEDDisplay *display, OLEDDisplayUiState* state) {
|
|
|
|
}
|
|
|
|
void analogClockFrame(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
|
|
// ui.disableIndicator();
|
|
|
|
// Draw the clock face
|
|
// display->drawCircle(clockCenterX + x, clockCenterY + y, clockRadius);
|
|
display->drawCircle(clockCenterX + x, clockCenterY + y, 2);
|
|
//
|
|
//hour ticks
|
|
for ( int z = 0; z < 360; z = z + 30 ) {
|
|
//Begin at 0° and stop at 360°
|
|
float angle = z ;
|
|
angle = ( angle / 57.29577951 ) ; //Convert degrees to radians
|
|
int x2 = ( clockCenterX + ( sin(angle) * clockRadius ) );
|
|
int y2 = ( clockCenterY - ( cos(angle) * clockRadius ) );
|
|
int x3 = ( clockCenterX + ( sin(angle) * ( clockRadius - ( clockRadius / 8 ) ) ) );
|
|
int y3 = ( clockCenterY - ( cos(angle) * ( clockRadius - ( clockRadius / 8 ) ) ) );
|
|
display->drawLine( x2 + x , y2 + y , x3 + x , y3 + y);
|
|
}
|
|
|
|
// display second hand
|
|
float angle = second() * 6 ;
|
|
angle = ( angle / 57.29577951 ) ; //Convert degrees to radians
|
|
int x3 = ( clockCenterX + ( sin(angle) * ( clockRadius - ( clockRadius / 5 ) ) ) );
|
|
int y3 = ( clockCenterY - ( cos(angle) * ( clockRadius - ( clockRadius / 5 ) ) ) );
|
|
display->drawLine( clockCenterX + x , clockCenterY + y , x3 + x , y3 + y);
|
|
//
|
|
// display minute hand
|
|
angle = minute() * 6 ;
|
|
angle = ( angle / 57.29577951 ) ; //Convert degrees to radians
|
|
x3 = ( clockCenterX + ( sin(angle) * ( clockRadius - ( clockRadius / 4 ) ) ) );
|
|
y3 = ( clockCenterY - ( cos(angle) * ( clockRadius - ( clockRadius / 4 ) ) ) );
|
|
display->drawLine( clockCenterX + x , clockCenterY + y , x3 + x , y3 + y);
|
|
//
|
|
// display hour hand
|
|
angle = hour() * 30 + int( ( minute() / 12 ) * 6 ) ;
|
|
angle = ( angle / 57.29577951 ) ; //Convert degrees to radians
|
|
x3 = ( clockCenterX + ( sin(angle) * ( clockRadius - ( clockRadius / 2 ) ) ) );
|
|
y3 = ( clockCenterY - ( cos(angle) * ( clockRadius - ( clockRadius / 2 ) ) ) );
|
|
display->drawLine( clockCenterX + x , clockCenterY + y , x3 + x , y3 + y);
|
|
}
|
|
|
|
void digitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y) {
|
|
String timenow = String(hour()) + ":" + twoDigits(minute()) + ":" + twoDigits(second());
|
|
display->setTextAlignment(TEXT_ALIGN_CENTER);
|
|
display->setFont(ArialMT_Plain_24);
|
|
display->drawString(clockCenterX + x , clockCenterY + y, timenow );
|
|
}
|
|
|
|
// This array keeps function pointers to all frames
|
|
// frames are the single views that slide in
|
|
FrameCallback frames[] = { analogClockFrame, digitalClockFrame };
|
|
|
|
// how many frames are there?
|
|
int frameCount = 2;
|
|
|
|
// Overlays are statically drawn on top of a frame eg. a clock
|
|
OverlayCallback overlays[] = { clockOverlay };
|
|
int overlaysCount = 1;
|
|
|
|
void setup() {
|
|
Serial.begin(115200);
|
|
Serial.println();
|
|
|
|
// The ESP is capable of rendering 60fps in 80Mhz mode
|
|
// but that won't give you much time for anything else
|
|
// run it in 160Mhz mode or just set it to 30 fps
|
|
ui.setTargetFPS(60);
|
|
|
|
// Customize the active and inactive symbol
|
|
ui.setActiveSymbol(activeSymbol);
|
|
ui.setInactiveSymbol(inactiveSymbol);
|
|
|
|
// You can change this to
|
|
// TOP, LEFT, BOTTOM, RIGHT
|
|
ui.setIndicatorPosition(TOP);
|
|
|
|
// Defines where the first frame is located in the bar.
|
|
ui.setIndicatorDirection(LEFT_RIGHT);
|
|
|
|
// You can change the transition that is used
|
|
// SLIDE_LEFT, SLIDE_RIGHT, SLIDE_UP, SLIDE_DOWN
|
|
ui.setFrameAnimation(SLIDE_LEFT);
|
|
|
|
// Add frames
|
|
ui.setFrames(frames, frameCount);
|
|
|
|
// Add overlays
|
|
ui.setOverlays(overlays, overlaysCount);
|
|
|
|
// Initialising the UI will init the display too.
|
|
ui.init();
|
|
|
|
display.flipScreenVertically();
|
|
|
|
unsigned long secsSinceStart = millis();
|
|
// Unix time starts on Jan 1 1970. In seconds, that's 2208988800:
|
|
const unsigned long seventyYears = 2208988800UL;
|
|
// subtract seventy years:
|
|
unsigned long epoch = secsSinceStart - seventyYears * SECS_PER_HOUR;
|
|
setTime(epoch);
|
|
|
|
}
|
|
|
|
|
|
void loop() {
|
|
int remainingTimeBudget = ui.update();
|
|
|
|
if (remainingTimeBudget > 0) {
|
|
// You can do some work here
|
|
// Don't do stuff if you are below your
|
|
// time budget.
|
|
delay(remainingTimeBudget);
|
|
}
|
|
}
|