jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 03:36:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Theo Arends 2024-01-06 21:57:09 +01:00
parent 8e06dcdcc3
commit ec75462905
3 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -9,7 +9,7 @@ All notable changes to this project will be documented in this file.
- Berry add support for `tcpclientasync` in `tcpserver` (#20401) - Berry add support for `tcpclientasync` in `tcpserver` (#20401)
- Berry add `tasmota.urlbecload(url:string) -> bool` (#20412) - Berry add `tasmota.urlbecload(url:string) -> bool` (#20412)
- GPIO Viewer to see realtime GPIO states. Enable with define USE_GPIO_VIEWER - GPIO Viewer to see realtime GPIO states. Enable with define USE_GPIO_VIEWER
- Berry `gpio.read_pwm` and `gpio.read_pwm_resolution` - Berry `gpio.read_pwm` and `gpio.read_pwm_resolution` (#20414)
### Breaking Changed ### Breaking Changed

1
RELEASENOTES.md
View File

@ -129,6 +129,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
- Berry `introspect.set()` for class attributes [#20339](https://github.com/arendst/Tasmota/issues/20339) - Berry `introspect.set()` for class attributes [#20339](https://github.com/arendst/Tasmota/issues/20339)
- Berry add support for `tcpclientasync` in `tcpserver` [#20401](https://github.com/arendst/Tasmota/issues/20401) - Berry add support for `tcpclientasync` in `tcpserver` [#20401](https://github.com/arendst/Tasmota/issues/20401)
- Berry add `tasmota.urlbecload(url:string) -> bool` [#20412](https://github.com/arendst/Tasmota/issues/20412) - Berry add `tasmota.urlbecload(url:string) -> bool` [#20412](https://github.com/arendst/Tasmota/issues/20412)
- Berry `gpio.read_pwm` and `gpio.read_pwm_resolution` [#20414](https://github.com/arendst/Tasmota/issues/20414)
- HASPmota `haspmota.page_show()` to change page [#20333](https://github.com/arendst/Tasmota/issues/20333) - HASPmota `haspmota.page_show()` to change page [#20333](https://github.com/arendst/Tasmota/issues/20333)
- HASPmota type `chart` [#20372](https://github.com/arendst/Tasmota/issues/20372) - HASPmota type `chart` [#20372](https://github.com/arendst/Tasmota/issues/20372)
- Matter support for password for remote Tasmota devices [#20296](https://github.com/arendst/Tasmota/issues/20296) - Matter support for password for remote Tasmota devices [#20296](https://github.com/arendst/Tasmota/issues/20296)

57
tasmota/tasmota_xdrv_driver/xdrv_121_gpioviewer.ino
View File

@ -23,12 +23,10 @@ const char *GVRelease = "1.0.5";
#define GV_BASE_URL "https://thelastoutpostworkshop.github.io/microcontroller_devkit/gpio_viewer/assets/" #define GV_BASE_URL "https://thelastoutpostworkshop.github.io/microcontroller_devkit/gpio_viewer/assets/"
#ifdef ESP32 #ifdef ESP32
const int GVMaxGPIOPins = 49;
// Global variables to capture PMW pins // Global variables to capture PMW pins
const int GVMaxChannels = 64; const int GVMaxChannels = 64;
#endif // ESP32 #endif // ESP32
#ifdef ESP8266 #ifdef ESP8266
const int GVMaxGPIOPins = 18;
// Global variables to capture PMW pins // Global variables to capture PMW pins
const int GVMaxChannels = MAX_PWMS; const int GVMaxChannels = MAX_PWMS;
#endif // ESP8266 #endif // ESP8266
@ -49,7 +47,7 @@ const char HTTP_GV_PAGE[] PROGMEM =
"var ip='%s';" // WiFi.localIP().toString().c_str() "var ip='%s';" // WiFi.localIP().toString().c_str()
"var source=new EventSource('http://%s:" STR(GV_PORT) "/events');" // WiFi.localIP().toString().c_str() "var source=new EventSource('http://%s:" STR(GV_PORT) "/events');" // WiFi.localIP().toString().c_str()
"var sampling_interval='" STR(GV_SAMPLING_INTERVAL) "';" "var sampling_interval='" STR(GV_SAMPLING_INTERVAL) "';"
"var freeSketchSpace='%d';" // GV.freeRAM "var freeSketchSpace='%s';" // GVFormatBytes(ESP_getFreeSketchSpace()).c_str()
"</script>" "</script>"
"</head>" "</head>"
"<body>" "<body>"
@ -66,6 +64,13 @@ const char HTTP_GV_PAGE[] PROGMEM =
"</body>" "</body>"
"</html>"; "</html>";
const char HTTP_GV_EVENT[] PROGMEM =
"HTTP/1.1 200 OK\n"
"Content-Type: text/event-stream;\n"
"Connection: keep-alive\n"
"Cache-Control: no-cache\n"
"Access-Control-Allow-Origin: *\n\n";
enum GVPinTypes { enum GVPinTypes {
digitalPin = 0, digitalPin = 0,
PWMPin = 1, PWMPin = 1,
@ -76,12 +81,12 @@ struct {
WiFiClient WebClient; WiFiClient WebClient;
ESP8266WebServer *WebServer; ESP8266WebServer *WebServer;
int freeHeap; int freeHeap;
uint32_t lastPinStates[GVMaxGPIOPins]; uint32_t lastPinStates[MAX_GPIO_PIN];
int ledcChannelPin[GVMaxChannels][2]; int ledcChannelPin[GVMaxChannels][2];
int ledcChannelPinCount; int ledcChannelPinCount;
int ledcChannelResolution[GVMaxChannels][2]; int ledcChannelResolution[GVMaxChannels][2];
int ledcChannelResolutionCount; int ledcChannelResolutionCount;
bool first; bool sse_ready;
bool active; bool active;
} GV; } GV;
@ -215,13 +220,13 @@ void GVResetStatePins(void) {
uint32_t pintype; uint32_t pintype;
AddLog(LOG_LEVEL_INFO, "IOV: GPIOViewer Connected, sampling interval is " STR(GV_SAMPLING_INTERVAL) "ms"); AddLog(LOG_LEVEL_INFO, "IOV: GPIOViewer Connected, sampling interval is " STR(GV_SAMPLING_INTERVAL) "ms");
for (int i = 0; i < GVMaxGPIOPins; i++) { for (int i = 0; i < MAX_GPIO_PIN; i++) {
GV.lastPinStates[i] = GVReadGPIO(i, &originalValue, &pintype); GV.lastPinStates[i] = GVReadGPIO(i, &originalValue, &pintype);
} }
} }
//void GVEventsSend(const char *message, const char *event=NULL, uint32_t id=0, uint32_t reconnect=0); //void GVEventSend(const char *message, const char *event=NULL, uint32_t id=0, uint32_t reconnect=0);
void GVEventsSend(const char *message, const char *event, uint32_t id) { void GVEventSend(const char *message, const char *event, uint32_t id) {
if (GV.WebClient.connected()) { if (GV.WebClient.connected()) {
// generateEventMessage() in AsyncEventSource.cpp // generateEventMessage() in AsyncEventSource.cpp
// GV.WebClient.printf_P(PSTR("retry: 0\r\nid: %u\r\nevent: %s\r\ndata: %s\r\n\r\n"), id, event, message); // GV.WebClient.printf_P(PSTR("retry: 0\r\nid: %u\r\nevent: %s\r\ndata: %s\r\n\r\n"), id, event, message);
@ -237,7 +242,7 @@ void GVMonitorTask(void) {
String jsonMessage = "{"; String jsonMessage = "{";
bool hasChanges = false; bool hasChanges = false;
for (int i = 0; i < GVMaxGPIOPins; i++) { for (int i = 0; i < MAX_GPIO_PIN; i++) {
int currentState = GVReadGPIO(i, &originalValue, &pintype); int currentState = GVReadGPIO(i, &originalValue, &pintype);
if (originalValue != GV.lastPinStates[i]) { if (originalValue != GV.lastPinStates[i]) {
@ -254,14 +259,14 @@ void GVMonitorTask(void) {
if (hasChanges) { if (hasChanges) {
// events->send(jsonMessage.c_str(), "gpio-state", millis()); // events->send(jsonMessage.c_str(), "gpio-state", millis());
GVEventsSend(jsonMessage.c_str(), "gpio-state", millis()); GVEventSend(jsonMessage.c_str(), "gpio-state", millis());
} }
uint32_t heap = ESP_getFreeHeap(); uint32_t heap = ESP_getFreeHeap();
if (heap != GV.freeHeap) { if (heap != GV.freeHeap) {
GV.freeHeap = heap; GV.freeHeap = heap;
// events->send(GVFormatBytes(GV.freeHeap).c_str(), "free_heap", millis()); // events->send(GVFormatBytes(GV.freeHeap).c_str(), "free_heap", millis());
GVEventsSend(GVFormatBytes(GV.freeHeap).c_str(), "free_heap", millis()); GVEventSend(GVFormatBytes(GV.freeHeap).c_str(), "free_heap", millis());
} }
} }
@ -269,44 +274,40 @@ void GVBegin(void) {
GVPrintPWNTraps(); GVPrintPWNTraps();
GV.WebServer = new ESP8266WebServer(GV_PORT); GV.WebServer = new ESP8266WebServer(GV_PORT);
// GV.WebServer->setContentLength(CONTENT_LENGTH_UNKNOWN); // the payload can go on forever
// Set CORS headers for global responses // Set CORS headers for global responses
GV.WebServer->sendHeader("Access-Control-Allow-Origin", "*"); GV.WebServer->sendHeader("Access-Control-Allow-Origin", "*");
GV.WebServer->sendHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS"); GV.WebServer->sendHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
GV.WebServer->sendHeader("Access-Control-Allow-Headers", "Content-Type"); GV.WebServer->sendHeader("Access-Control-Allow-Headers", "Content-Type");
GV.WebServer->on("/events", GVHandleEvents); GV.WebServer->on("/events", GVHandleEvents);
GV.WebServer->on("/", GVHandleRoot); GV.WebServer->on("/", GVHandleRoot);
GV.WebServer->on("/release", GVHandleRelease); GV.WebServer->on("/release", GVHandleRelease);
GV.WebServer->begin(); GV.WebServer->begin();
} }
void GVHandleEvents(void) { void GVHandleEvents(void) {
if (!GV.first) { GVResetStatePins();
GVResetStatePins();
GV.first = true;
GV.WebClient = GV.WebServer->client(); GV.WebClient = GV.WebServer->client();
GV.WebClient.setNoDelay(true); GV.WebClient.setNoDelay(true);
// GV.WebClient.setSync(true); // GV.WebClient.setSync(true);
GV.WebServer->setContentLength(CONTENT_LENGTH_UNKNOWN); // The payload can go on forever GV.WebServer->setContentLength(CONTENT_LENGTH_UNKNOWN); // The payload can go on forever
GV.WebServer->sendContent_P(PSTR("HTTP/1.1 200 OK\nContent-Type: text/event-stream;\nConnection: keep-alive\nCache-Control: no-cache\nAccess-Control-Allow-Origin: *\n\n")); GV.WebServer->sendContent_P(HTTP_GV_EVENT);
}
GV.sse_ready = true; // Ready for async updates
} }
void GVHandleRoot(void) { void GVHandleRoot(void) {
char* content = ext_snprintf_malloc_P(HTTP_GV_PAGE, char* content = ext_snprintf_malloc_P(HTTP_GV_PAGE,
WiFi.localIP().toString().c_str(), WiFi.localIP().toString().c_str(),
WiFi.localIP().toString().c_str(), WiFi.localIP().toString().c_str(),
GVFormatBytes(ESP.getFreeSketchSpace()).c_str()); GVFormatBytes(ESP_getFreeSketchSpace()).c_str());
if (content == nullptr) { return; } // Avoid crash if (content == nullptr) { return; } // Avoid crash
GV.WebServer->send_P(200, "text/html", content); GV.WebServer->send_P(200, "text/html", content);
free(content); free(content);
GV.sse_ready = false; // Allow restart of updates on page load
} }
void GVHandleRelease(void) { void GVHandleRelease(void) {
@ -328,7 +329,7 @@ bool Xdrv121(uint32_t function) {
if (GV.WebServer) { GV.WebServer->handleClient(); } if (GV.WebServer) { GV.WebServer->handleClient(); }
break; break;
case FUNC_EVERY_100_MSECOND: case FUNC_EVERY_100_MSECOND:
if (GV.first) { GVMonitorTask(); } if (GV.sse_ready) { GVMonitorTask(); }
break; break;
case FUNC_ACTIVE: case FUNC_ACTIVE:
result = true; result = true;