alban/esp32-timed-switch
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
main
esp32-timed-switch/esp32-timed-switch.ino

491 lines
21 KiB
Arduino
Raw Permalink Normal View History

[init]
2023-10-28 15:53:13 +00:00
#include "esp_system.h"
#include "sntp.h"
#include "time.h"
#include <WiFi.h>
#include <WiFiUdp.h>
#include <Preferences.h>
#include "scheduler.h"
#include "scheduler_prefs.h"
fix; wip for prefs
2024-04-04 16:58:37 +00:00
// #include "wifi_prefs.h"
[init]
2023-10-28 15:53:13 +00:00
wip: html
2023-11-09 19:07:34 +00:00
// --------------------------------------------
[init]
2023-10-28 15:53:13 +00:00
// Init const and global objects
wip: html
2023-11-09 19:07:34 +00:00
// --------------------------------------------
[init]
2023-10-28 15:53:13 +00:00
fix; wip for prefs
2024-04-04 16:58:37 +00:00
const char* html_app="<html><head><title>ESP32 timed Switch</title><script src=\"https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.8.3/angular.js\"></script><link rel=\"manifest\" href=\"manifest.json\" /><meta charset=\"UTF-8\"></head><body><h1>Scheduler</h1><script>class Schedule {constructor(scheduleArray) {if (scheduleArray && scheduleArray.length === 24) {this.schedule = scheduleArray.slice();} else {this.schedule = new Array(24).fill(0x000);}}loadFromArrayBuffer = function(buffer) {var view = new DataView(buffer);for (var i = 0; i < 24; i++) {this.schedule[i] = view.getUint16(i * 2);}};updateSegment(hour, segment, state) {if (hour < 0 || hour >= 24) {throw new Error('Hour must be between 0 and 23.');}if (segment < 0 || segment >= 12) {throw new Error('Segment must be between 0 and 11.');}const bitPosition = 11 - segment;if (state) {this.schedule[hour] |= (1 << bitPosition);} else {this.schedule[hour] &= ~(1 << bitPosition);}}serializeForDisplay() {return this.schedule.map(hour => {if (hour === 0xFFF) {return { displayValue: ' ', class: 'on' };} else if (hour === 0x00) {return { displayValue: ' ', class: 'off' };} else {return { displayValue: ' ', class: 'partial' };}});}prepareEditMatrix() {const editMatrix = [];for (let hour = 0; hour < 24; hour++) {const hourSegments = [];for (let segment = 0; segment < 12; segment++) {hourSegments.push({value: (this.schedule[hour] & (1 << segment)) !== 0 ? 1 : 0});}editMatrix.push(hourSegments.reverse());}return editMatrix;}updateFromEditMatrix(editMatrix) {for (let hour = 0; hour < 24; hour++) {let hourValue = 0;for (let segment = 0; segment < 12; segment++) {if (editMatrix[hour][11 - segment].value) {hourValue |= (1 << segment);}}this.schedule[hour] = hourValue;}}serializeToArrayBuffer = function() {var buffer = new ArrayBuffer(24 * 2);var view = new DataView(buffer);for (var i = 0; i < 24; i++) {view.setUint16( i*2, this.schedule[i]);}return buffer;};}var app = angular.module('plugSchedulerApp', []);app.value('api_host', window.location.host);app.factory(\"data\", function(){var sharedData = { api_host: window.location.host};return {getSharedData: function () {return sharedData;}};});app.controller('ApiHostController', ['$scope', 'api_host', 'data', function( $scope, api_host, data) {var ctrl = this;$scope.data = data.getSharedData();window.ctrl = $scope}]);app.controller('PlugScheduleController', ['$scope', '$http', 'data', function( $scope, $http, data) {var ctrl = this;ctrl.editMode = false;$scope.data = data.getSharedData();ctrl.$onInit = function() {ctrl.scheduleObj = new Schedule();ctrl.getSchedule();};ctrl.getSchedule = function() {if (ctrl.plugId === undefined) {return;}var url = `http://${$scope.data.api_host}/api/schedule/${ctrl.plugId}`;$http.get(url, { responseType: 'arraybuffer' }).then(function(response) {ctrl.scheduleObj.loadFromArrayBuffer(response.data);ctrl.displaySchedule = ctrl.scheduleObj.serializeForDisplay();}).catch(function(error) {console.error('Error fetching schedule:', error);});};ctrl.modifySchedule = function() {ctrl.editMode = true;ctrl.editMatrix = ctrl.scheduleObj.prepareEditMatrix();};ctrl.saveSchedule = function() {ctrl.editMode = false;ctrl.scheduleObj.updateFromEditMatrix(ctrl.editMatrix);ctrl.updateSchedule();};ctrl.updateSchedule = function() {var url = `http://${$scope.data.api_host}/api/schedule/${ctrl.plugId}`;var serializedSchedule = ctrl.scheduleObj.serializeToArrayBuffer();$http.post(url, serializedSchedule, {headers: {'Content-Type': 'application/octet-stream'},responseType: 'arraybuffer',transformRequest: []}).then(function(response) {console.log(\"successfully updated\");ctrl.displaySchedule = ctrl.scheduleObj.serializeForDisplay();}, function(error) {alert('Error updating schedule:', error);});};ctrl.checkAll = function(hourIndex) {ctrl.editMatrix[hourIndex].forEach(segment => {segment.value = 1;});};ctrl.uncheckAll = function(hourIndex) {ctrl.editMatrix[hourIndex].forEach(segment => {segment.value = 0;});};ctrl.invertAll = function(hourIndex) {ctrl.editMatrix[hourIndex].forEach(segment => {var inverted = Math.abs( segment.
feat: http server
2023-12-07 18:52:59 +00:00
// PREFERENCES
[init]
2023-10-28 15:53:13 +00:00
Preferences preferences;
#define RW_MODE false
#define RO_MODE true
feat: preferences should work
2023-11-02 22:27:48 +00:00
// WIFI
fix: HTTP server should work
2024-01-18 18:32:12 +00:00
// const char* ssid = "Wokwi-GUEST";
// const char* password = "";
fix: renamed files
2023-10-28 17:06:10 +00:00
const uint8_t wifi_loop_max = 10;
[init]
2023-10-28 15:53:13 +00:00
// NTP
bool sntp_initialized = false;
const char* ntpServer1 = "pool.ntp.org";
const char* ntpServer2 = "time.nist.gov";
const long gmtOffset_sec = 2 * 3600; // GMT + 2
const int daylightOffset_sec = 0;
feat: preferences should work
2023-11-02 22:27:48 +00:00
// TIMER
[init]
2023-10-28 15:53:13 +00:00
hw_timer_t*timer_main = NULL;
uint32_t timer_interval = 3000000;
uint16_t timer_interval_in_secs = timer_interval / 1000000;
;
feat: preferences should work
2023-11-02 22:27:48 +00:00
// SCHEDULER
bool brun_scheduler = true;
[init]
2023-10-28 15:53:13 +00:00
uint8_t current_hour = HOUR_DEFAULT;
uint8_t current_minute = MINUTE_DEFAULT;
uint8_t current_second = 0;
uint32_t current_ts = 0;
uint32_t next_event_ts = 0;
feat: preferences should work
2023-11-02 22:27:48 +00:00
int scheduler_1[24] ; // = {A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60,A60};
int scheduler_2[24] ; // = {A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00};
fix: HTTP server should work
2024-01-18 18:32:12 +00:00
int scheduler_3[24] ; // = {A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00};
int scheduler_4[24] ; // = {A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00};
int scheduler_5[24] ; // = {A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00};
int scheduler_6[24] ; // = {A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00};
int scheduler_7[24] ; // = {A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00};
int scheduler_8[24] ; // = {A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00,A00};
feat: preferences should work
2023-11-02 22:27:48 +00:00
int* scheduler_list[] = {
[init]
2023-10-28 15:53:13 +00:00
scheduler_1,
fix: HTTP server should work
2024-01-18 18:32:12 +00:00
scheduler_2,
scheduler_3,
scheduler_4,
scheduler_5,
scheduler_6,
scheduler_7,
scheduler_8,
[init]
2023-10-28 15:53:13 +00:00
};
feat: preferences should work
2023-11-02 22:27:48 +00:00
// PINS
unsigned int PIN_1 = 12;
unsigned int PIN_2 = 14;
unsigned int PIN_3 = 27;
unsigned int PIN_4 = 26;
unsigned int PIN_5 = 20;
unsigned int PIN_6 = 33;
unsigned int PIN_7 = 32;
unsigned int PIN_8 = 35;
wip: POST
2024-01-27 18:15:53 +00:00
unsigned int pin_list[8] = {
[init]
2023-10-28 15:53:13 +00:00
PIN_1,
fix: HTTP server should work
2024-01-18 18:32:12 +00:00
PIN_2,
PIN_3,
PIN_4,
PIN_5,
PIN_6,
PIN_7,
PIN_8
[init]
2023-10-28 15:53:13 +00:00
};
feat: preferences should work
2023-11-02 22:27:48 +00:00
// HTTP
feat: http server
2023-12-07 18:52:59 +00:00
WiFiClient client;
wip: html
2023-11-09 19:07:34 +00:00
WiFiServer http_server(3000);
feat: preferences should work
2023-11-02 22:27:48 +00:00
String request;
wip: html
2023-11-09 19:07:34 +00:00
// --------------------------------------------
[init]
2023-10-28 15:53:13 +00:00
// Local functions
wip: html
2023-11-09 19:07:34 +00:00
// --------------------------------------------
[init]
2023-10-28 15:53:13 +00:00
// Time helper
uint32_t get_timestamp( uint8_t hour, uint8_t minute, uint8_t second){
return ( 3600 * hour + 60 * minute + second) % 86400;
}
feat: preferences should work
2023-11-02 22:27:48 +00:00
bool event_keep_waiting( uint32_t current_ts, uint32_t event_ts ){
[init]
2023-10-28 15:53:13 +00:00
feat: preferences should work
2023-11-02 22:27:48 +00:00
// basic case
// ts: 11h 41m 11s
// ev: 11h 44m 0s
// ts < ev => TRUE
[init]
2023-10-28 15:53:13 +00:00
if ( current_ts < event_ts ){
feat: preferences should work
2023-11-02 22:27:48 +00:00
return true;
[init]
2023-10-28 15:53:13 +00:00
}
feat: preferences should work
2023-11-02 22:27:48 +00:00
// if time looped at midnight
// ts: 23h 57m 21s
// ev: 0h 1m 0s
// ts > ev => TRUE (for high to very low values )
[init]
2023-10-28 15:53:13 +00:00
if( (current_ts - event_ts) > 600 && event_ts < 300 ) {
feat: preferences should work
2023-11-02 22:27:48 +00:00
return true;
[init]
2023-10-28 15:53:13 +00:00
}
feat: preferences should work
2023-11-02 22:27:48 +00:00
// ts: 11h 44m 11s
// ev: 11h 44m 0s
// ts > ev => FALSE
return false;
[init]
2023-10-28 15:53:13 +00:00
}
// NTP Callback
void timeavailable(struct timeval *t)
{
Serial.println("NTP::Got time adjustment from NTP!");
sntp_initialized = true;
return;
}
// TIMER Callback
void IRAM_ATTR onTimer(){
feat: preferences should work
2023-11-02 22:27:48 +00:00
brun_scheduler = true;
fix: renamed files
2023-10-28 17:06:10 +00:00
}
fix: use light timer callback
2023-11-02 20:12:18 +00:00
feat: preferences should work
2023-11-02 22:27:48 +00:00
void run_scheduler(){
// Serial.println("onTimer::run");
[init]
2023-10-28 15:53:13 +00:00
// Get the current time via NTP, or downgrade
if ( sntp_initialized ){
struct tm timeinfo;
time_t now;
time(&now);
localtime_r(&now, &timeinfo);
current_hour = timeinfo.tm_hour;
current_minute = timeinfo.tm_min;
current_second = timeinfo.tm_sec;
fix: renamed files
2023-10-28 17:06:10 +00:00
[init]
2023-10-28 15:53:13 +00:00
// If no NTP clock
}else{
fix: renamed files
2023-10-28 17:06:10 +00:00
// Serial.println("onTimer::NO NTP");
[init]
2023-10-28 15:53:13 +00:00
current_second += timer_interval_in_secs;
if(current_second >= 60) {
current_second = 0;
current_minute += 1;
if(current_minute >= 60) {
current_minute = 0;
current_hour += 1;
if(current_hour >= 24) {
current_hour = 0;
}
}
}
feat: preferences should work
2023-11-02 22:27:48 +00:00
}
[init]
2023-10-28 15:53:13 +00:00
// If not expected to run exit
current_ts = get_timestamp( current_hour, current_minute, current_second );
fix: HTTP server should work
2024-01-18 18:32:12 +00:00
// Serial.printf("onTimer::check event %d %d\n", current_ts, next_event_ts);
feat: preferences should work
2023-11-02 22:27:48 +00:00
if( event_keep_waiting( current_ts, next_event_ts ) ){
[init]
2023-10-28 15:53:13 +00:00
return;
}
// Set the next target
next_event_ts = get_timestamp( current_hour, current_minute + EVENT_INC_MINUTE, current_second );
Serial.println("Reconfigure the Relays!");
// Run the relays reconfiguration
wip: fixing the post action
2024-02-01 21:55:41 +00:00
for ( int i = 0; i < 8; i++ ) {
[init]
2023-10-28 15:53:13 +00:00
// Get a pointer to the current array
feat: preferences should work
2023-11-02 22:27:48 +00:00
int* scheduler = scheduler_list[i];
[init]
2023-10-28 15:53:13 +00:00
unsigned int pin = pin_list[i];
// Set the expected status
uint8_t minutes_by_5 = (current_minute / 5);
feat: preferences should work
2023-11-02 22:27:48 +00:00
int hourly_12_values = scheduler[current_hour];
[init]
2023-10-28 15:53:13 +00:00
// Serial.printf("Check hour(%d) >> minutes(%d x 5)\n", hourly_12_values, minutes_by_5);
char buffer[40];
if (( hourly_12_values >> minutes_by_5 ) & 1) {
digitalWrite(pin, HIGH);
sprintf (buffer, "Pin %d is up ", pin);
} else {
digitalWrite(pin, LOW);
sprintf (buffer, "Pin %d is down ", pin);
}
Serial.println(buffer); // Get the expected status
}
Serial.println("Reconfiguration over");
return;
}
wip: html
2023-11-09 19:07:34 +00:00
// HTTP
wip: fixing the post action
2024-02-01 21:55:41 +00:00
const char* getPreferenceName( int plug_id){
switch (plug_id) {
case 0:
return RELAY_1_SCHEDULE;
break;
case 1:
return RELAY_2_SCHEDULE;
break;
case 2:
return RELAY_3_SCHEDULE;
break;
case 3:
return RELAY_4_SCHEDULE;
break;
case 4:
return RELAY_5_SCHEDULE;
break;
case 5:
return RELAY_6_SCHEDULE;
break;
case 6:
return RELAY_7_SCHEDULE;
break;
case 7:
return RELAY_8_SCHEDULE;
break;
}
wip: html
2023-11-09 19:07:34 +00:00
}
fix; wip for prefs
2024-04-04 16:58:37 +00:00
void saveSchedule( int plug_id, uint16_t data[24]){
wip: fixing the post action
2024-02-01 21:55:41 +00:00
const char* preference_name = getPreferenceName( plug_id );
fix; wip for prefs
2024-04-04 16:58:37 +00:00
preferences.putBytes(preference_name, data, 48);
Serial.print("saving size:");
Serial.print(sizeof(data));
Serial.print(" to ");
wip: rework the preferences API
2024-02-03 15:07:29 +00:00
Serial.println(preference_name);
fix; wip for prefs
2024-04-04 16:58:37 +00:00
uint16_t buf[24];
preferences.getBytes(preference_name, buf, 48);
for ( int iterator=0; iterator < 24; iterator++){
Serial.print(iterator);
Serial.print(" : ");
Serial.print(data[iterator]);
Serial.print(" / ");
Serial.println(buf[iterator]);
}
delay(2000);
wip: fixing the post action
2024-02-01 21:55:41 +00:00
}
wip: html
2023-11-09 19:07:34 +00:00
wip: rework the preferences API
2024-02-03 15:07:29 +00:00
void sendSchedule(WiFiClient &client, int plug_id) {
fix; wip for prefs
2024-04-04 16:58:37 +00:00
uint16_t buf[24];
wip: rework the preferences API
2024-02-03 15:07:29 +00:00
const char* preference_name = getPreferenceName( plug_id );
fix; wip for prefs
2024-04-04 16:58:37 +00:00
Serial.print("sending ");
Serial.println(preference_name);
preferences.getBytes(preference_name, buf, 48);
for ( int iterator=0; iterator < 24; iterator++){
Serial.print(iterator);
Serial.print(" : ");
Serial.println(buf[iterator]);
}
Serial.println("---------------------------");
client.write((const uint8_t*)buf, 24 * sizeof(uint16_t));
wip: html
2023-11-09 19:07:34 +00:00
}
// --------------------------------------------
// ARDUINO Functions
// --------------------------------------------
[init]
2023-10-28 15:53:13 +00:00
void setup(){
// HARDWARE
Serial.begin(115200);
delay(1000);
Serial.println("Starting.");
pinMode(PIN_1, OUTPUT);
pinMode(PIN_2, OUTPUT);
fix; wip for prefs
2024-04-04 16:58:37 +00:00
pinMode(PIN_3, OUTPUT);
pinMode(PIN_4, OUTPUT);
pinMode(PIN_5, OUTPUT);
pinMode(PIN_6, OUTPUT);
pinMode(PIN_7, OUTPUT);
pinMode(PIN_8, OUTPUT);
[init]
2023-10-28 15:53:13 +00:00
// PREFERENCES
Serial.println("Setup::PREFERENCES");
preferences.begin(PREF_NAMESPACE, RW_MODE);
fix; wip for prefs
2024-04-04 16:58:37 +00:00
// preferences.clear();
wip: html
2023-11-09 19:07:34 +00:00
feat: preferences should work
2023-11-02 22:27:48 +00:00
bool pref_init = preferences.isKey("test");
fix; wip for prefs
2024-04-04 16:58:37 +00:00
if (true || pref_init == false) {
feat: preferences should work
2023-11-02 22:27:48 +00:00
Serial.println("preferences not exist");
preferences.putBool("test", true);
wip: rework the preferences API
2024-02-03 15:07:29 +00:00
saveSchedule(1,scheduler_default_deactivate);
fix; wip for prefs
2024-04-04 16:58:37 +00:00
wip: rework the preferences API
2024-02-03 15:07:29 +00:00
saveSchedule(2,scheduler_default_deactivate);
saveSchedule(3,scheduler_default_deactivate);
saveSchedule(4,scheduler_default_deactivate);
fix; wip for prefs
2024-04-04 16:58:37 +00:00
/*
wip: rework the preferences API
2024-02-03 15:07:29 +00:00
saveSchedule(5,scheduler_default_deactivate);
saveSchedule(6,scheduler_default_deactivate);
saveSchedule(7,scheduler_default_deactivate);
saveSchedule(8,scheduler_default_deactivate);
*/
[init]
2023-10-28 15:53:13 +00:00
}
fix; wip for prefs
2024-04-04 16:58:37 +00:00
[init]
2023-10-28 15:53:13 +00:00
preferences.getBytes(RELAY_1_SCHEDULE, scheduler_1, preferences.getBytesLength(RELAY_1_SCHEDULE));
preferences.getBytes(RELAY_2_SCHEDULE, scheduler_2, preferences.getBytesLength(RELAY_2_SCHEDULE));
wip: POST
2024-01-27 18:15:53 +00:00
preferences.getBytes(RELAY_3_SCHEDULE, scheduler_2, preferences.getBytesLength(RELAY_3_SCHEDULE));
preferences.getBytes(RELAY_4_SCHEDULE, scheduler_2, preferences.getBytesLength(RELAY_4_SCHEDULE));
preferences.getBytes(RELAY_5_SCHEDULE, scheduler_2, preferences.getBytesLength(RELAY_5_SCHEDULE));
preferences.getBytes(RELAY_6_SCHEDULE, scheduler_2, preferences.getBytesLength(RELAY_6_SCHEDULE));
preferences.getBytes(RELAY_7_SCHEDULE, scheduler_2, preferences.getBytesLength(RELAY_7_SCHEDULE));
preferences.getBytes(RELAY_8_SCHEDULE, scheduler_2, preferences.getBytesLength(RELAY_8_SCHEDULE));
fix; wip for prefs
2024-04-04 16:58:37 +00:00
[init]
2023-10-28 15:53:13 +00:00
preferences.end();
feat: preferences should work
2023-11-02 22:27:48 +00:00
Serial.println("Setup::PREFERENCES::end");
[init]
2023-10-28 15:53:13 +00:00
// WIFI
Serial.println("Setup::WIFI");
Serial.printf("Connecting to %s ", ssid);
WiFi.begin(ssid, password);
fix: renamed files
2023-10-28 17:06:10 +00:00
uint8_t wifi_loop_count = 0;
feat: preferences should work
2023-11-02 22:27:48 +00:00
while (WiFi.status() != WL_CONNECTED or wifi_loop_count < wifi_loop_max ) {
wip: html
2023-11-09 19:07:34 +00:00
delay(1000);
fix: renamed files
2023-10-28 17:06:10 +00:00
wifi_loop_count++;
[init]
2023-10-28 15:53:13 +00:00
Serial.print(".");
}
wip: html
2023-11-09 19:07:34 +00:00
[init]
2023-10-28 15:53:13 +00:00
// TIMER
Serial.println("Setup::Timer");
timer_main = timerBegin(0, 80, true);
timerAttachInterrupt(timer_main, &onTimer, true);
timerAlarmWrite(timer_main, timer_interval, true);
timerAlarmEnable(timer_main);
// NTP
Serial.println("Setup::NTP");
sntp_set_time_sync_notification_cb(timeavailable);
configTime(gmtOffset_sec, daylightOffset_sec, ntpServer1, ntpServer2);
delay(5000);
// SCHEDULER
Serial.println("Setup::SCHEDULER");
fix: renamed files
2023-10-28 17:06:10 +00:00
next_event_ts = get_timestamp( HOUR_DEFAULT, MINUTE_DEFAULT, 10 );
[init]
2023-10-28 15:53:13 +00:00
// HTTP
Serial.println("Setup::HTTP");
wip: html
2023-11-09 19:07:34 +00:00
http_server.begin();
feat: preferences should work
2023-11-02 22:27:48 +00:00
Serial.print("Connect to IP Address: ");
Serial.print("http://");
Serial.println(WiFi.localIP());
[init]
2023-10-28 15:53:13 +00:00
// Todo
fix: HTTP server should work
2024-01-18 18:32:12 +00:00
[init]
2023-10-28 15:53:13 +00:00
}
feat: preferences should work
2023-11-02 22:27:48 +00:00
[init]
2023-10-28 15:53:13 +00:00
void loop(){
feat: preferences should work
2023-11-02 22:27:48 +00:00
if( brun_scheduler == true ){
brun_scheduler = false;
run_scheduler();
fix: renamed files
2023-10-28 17:06:10 +00:00
}
[init]
2023-10-28 15:53:13 +00:00
feat: http server
2023-12-07 18:52:59 +00:00
client = http_server.available();
if (!client) {
fix: HTTP server should work
2024-01-18 18:32:12 +00:00
// Serial.println("Server not available... skip...");
feat: preferences should work
2023-11-02 22:27:48 +00:00
return;
}
wip: html
2023-11-09 19:07:34 +00:00
String request = client.readStringUntil('\r');
wip: POST
2024-01-27 18:15:53 +00:00
Serial.print("request: ");
Serial.println(request);
feat: preferences should work
2023-11-02 22:27:48 +00:00
wip: html
2023-11-09 19:07:34 +00:00
// GET request
if (request.indexOf("GET /api/schedule/") >= 0) {
feat: add minifier and update esp32 HTML
2024-02-28 21:10:06 +00:00
int startIdIndex = 18;
int endIdIndex = 19;
fix: HTTP server should work
2024-01-18 18:32:12 +00:00
wip: fixing the post action
2024-02-01 21:55:41 +00:00
String plug_idStr = request.substring(startIdIndex, endIdIndex);
int plug_id = plug_idStr.toInt() - 1; // Adjust for 0 index
Serial.print("plug_id " );
Serial.println(plug_id);
if (plug_id >= 0 && plug_id < 8) {
wip: html
2023-11-09 19:07:34 +00:00
client.println("HTTP/1.1 200 OK");
fix: HTTP server should work
2024-01-18 18:32:12 +00:00
client.println("Content-Type: text/html");
wip: html
2023-11-09 19:07:34 +00:00
client.println("Connection: close");
client.println();
wip: rework the preferences API
2024-02-03 15:07:29 +00:00
sendSchedule(client, plug_id);
wip: html
2023-11-09 19:07:34 +00:00
} else {
client.println("HTTP/1.1 404 Not Found");
client.println("Connection: close");
client.println();
}
feat: http server
2023-12-07 18:52:59 +00:00
// GET homepage
} else if (request.indexOf("GET /") >= 0) {
client.println("HTTP/1.1 200 OK");
fix: HTTP server should work
2024-01-18 18:32:12 +00:00
client.println("Content-Type: text/html");
feat: http server
2023-12-07 18:52:59 +00:00
client.println("Connection: close");
client.println();
client.println(html_app);
fix: HTTP server should work
2024-01-18 18:32:12 +00:00
} else {
wip: POST
2024-01-27 18:15:53 +00:00
fix: HTTP server should work
2024-01-18 18:32:12 +00:00
// POST request
int slashIndex = request.indexOf("POST /api/schedule/");
if (slashIndex != -1) {
wip: POST
2024-01-27 18:15:53 +00:00
Serial.print("slashIndex: ");
Serial.println(slashIndex);
int nextSlashIndex = slashIndex + 19;
fix: HTTP server should work
2024-01-18 18:32:12 +00:00
// Extract the plug ID
wip: fixing the post action
2024-02-01 21:55:41 +00:00
String plug_idStr = request.substring(nextSlashIndex, nextSlashIndex + 1);
Serial.print("plug_idStr ");
Serial.println(plug_idStr);
int plug_id = plug_idStr.toInt() - 1;
// Force a new line
client.readStringUntil('\n');
fix: HTTP server should work
2024-01-18 18:32:12 +00:00
// Read the next line which should have the POST body/content
fix; wip for prefs
2024-04-04 16:58:37 +00:00
String header ;
while ( header = client.readStringUntil('\n') ){
Serial.print("header: '");
Serial.print(header);
Serial.print(" / ");
Serial.print(header.length());
Serial.println("'");
if( header.length() < 2 ){
Serial.println("parsed headers");
wip: POST
2024-01-27 18:15:53 +00:00
break;
}
}
wip: fixing the post action
2024-02-01 21:55:41 +00:00
Serial.println("Done reading. Going for binary.");
feat: add minifier and update esp32 HTML
2024-02-28 21:10:06 +00:00
fix; wip for prefs
2024-04-04 16:58:37 +00:00
char post_body[48];
client.readBytes(post_body, 48);
wip: rework the preferences API
2024-02-03 15:07:29 +00:00
Serial.print("Read post_body: ");
Serial.println(post_body);
fix: HTTP server should work
2024-01-18 18:32:12 +00:00
// Update the schedule for the specified plug
wip: fixing the post action
2024-02-01 21:55:41 +00:00
if (plug_id >= 0 && plug_id < 8) {
wip: rework the preferences API
2024-02-03 15:07:29 +00:00
fix; wip for prefs
2024-04-04 16:58:37 +00:00
uint16_t byte_value[24];
wip: rework the preferences API
2024-02-03 15:07:29 +00:00
for (int i=0; i < 24; i++) {
fix; wip for prefs
2024-04-04 16:58:37 +00:00
byte_value[i] = (char) post_body[i*2] * 256 + post_body[(i*2)+1];
Serial.print("Byte ");
Serial.print(i);
Serial.print(" : ");
Serial.print(byte_value[i]);
Serial.println("");
wip: rework the preferences API
2024-02-03 15:07:29 +00:00
}
saveSchedule(plug_id, byte_value );
wip: fixing the post action
2024-02-01 21:55:41 +00:00
Serial.println("Schedule updated for plug " + plug_idStr);
fix: HTTP server should work
2024-01-18 18:32:12 +00:00
} else {
Serial.println("Invalid plug ID");
}
wip: POST
2024-01-27 18:15:53 +00:00
client.println("HTTP/1.1 200 OK");
client.println("Content-Type: text/plain");
client.println("Connection: close");
client.println();
feat: preferences should work
2023-11-02 22:27:48 +00:00
}
}
feat: http server
2023-12-07 18:52:59 +00:00
client.stop();
feat: preferences should work
2023-11-02 22:27:48 +00:00
[init]
2023-10-28 15:53:13 +00:00
fix: renamed files
2023-10-28 17:06:10 +00:00
}
Reference in New Issue Copy Permalink