Skip to content
Snippets Groups Projects
Commit c217d4e3 authored by Sebastian Pape's avatar Sebastian Pape
Browse files

Adapting to new Library versions of the Arduino ESP32 environment

parent a2217733
No related branches found
No related tags found
No related merge requests found
...@@ -41,6 +41,11 @@ MotionToPhotonServer server(result_buffer, result_buffer_length, getPhotoDiodeRe ...@@ -41,6 +41,11 @@ MotionToPhotonServer server(result_buffer, result_buffer_length, getPhotoDiodeRe
/* Multicore */ /* Multicore */
TaskHandle_t TaskCore0; TaskHandle_t TaskCore0;
TaskHandle_t TaskCore1; TaskHandle_t TaskCore1;
const esp_task_wdt_config_t twdt_config = {
.timeout_ms = 6000,
.idle_core_mask = 0b00000011, // Disable on all cores
.trigger_panic = false,
};
void core1( void * pvParameters ){ void core1( void * pvParameters ){
while(true){ while(true){
...@@ -104,7 +109,7 @@ void setup() { ...@@ -104,7 +109,7 @@ void setup() {
server.setup(); server.setup();
esp_task_wdt_init(6000,false); esp_task_wdt_init(&twdt_config);
xTaskCreatePinnedToCore( xTaskCreatePinnedToCore(
core0, // Task function. core0, // Task function.
"Server", // name of task. "Server", // name of task.
...@@ -123,8 +128,7 @@ void setup() { ...@@ -123,8 +128,7 @@ void setup() {
&TaskCore1, // Task handle to keep track of created task &TaskCore1, // Task handle to keep track of created task
1); // pin task to core 1 1); // pin task to core 1
delay(500); delay(500);
disableCore0WDT(); esp_task_wdt_deinit();
disableCore1WDT();
} }
void loop(){} //Still needed for arduino core to work void loop(){} //Still needed for arduino core to work
......
...@@ -109,14 +109,14 @@ ...@@ -109,14 +109,14 @@
} }
void MotionToPhotonServer::pageResults(){ void MotionToPhotonServer::pageResults(){
Serial.println("Client wants index page."); Serial.println("Client wants results page.");
server.setContentLength(CONTENT_LENGTH_UNKNOWN); server.setContentLength(CONTENT_LENGTH_UNKNOWN);
server.send(200, "text/plain", ""); server.send(200, "text/plain", "");
unsigned int currentNumberOfResults = getCurrentNumberOfResults(); unsigned int currentNumberOfResults = getCurrentNumberOfResults();
for(unsigned int i = 0; i < currentNumberOfResults; i++){ for(unsigned int i = 0; i < currentNumberOfResults; i++){
server.sendContent(String(result_buffer[i]) + ((i != currentNumberOfResults-1) ? ",\n":"")); server.sendContent(String(result_buffer[i]) + ((i != currentNumberOfResults-1) ? ",\n":""));
} }
server.client().stop(); server.sendContent("");
} }
void MotionToPhotonServer::pageIndex(){ void MotionToPhotonServer::pageIndex(){
......
...@@ -2,8 +2,10 @@ ...@@ -2,8 +2,10 @@
#define MotionToPhotonServer_h #define MotionToPhotonServer_h
#include "Arduino.h" #include "Arduino.h"
#include <WiFi.h>
#include <WebServer.h> #include <WebServer.h>
#include "SPIFFS.h" #include "SPIFFS.h"
#include "FS.h"
class MotionToPhotonServer class MotionToPhotonServer
{ {
...@@ -18,7 +20,7 @@ class MotionToPhotonServer ...@@ -18,7 +20,7 @@ class MotionToPhotonServer
void (* abortMeasurement)(); void (* abortMeasurement)();
/* Put your SSID & Password */ /* Put your SSID & Password */
const char* ssid = "Calibratio"; // Enter SSID here const char* ssid = "Calibratio2"; // Enter SSID here
const char* password = ""; //Enter Password here const char* password = ""; //Enter Password here
/* Put IP Address details */ /* Put IP Address details */
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<meta charset="ISO-8859-1"> <meta charset="ISO-8859-1">
<title>Calibratio V1.1</title> <title>Calibratio V2</title>
<!-- Hello you there, reading the code! This was coded by Sebastian Pape aka PapeCoding.de --> <!-- Hello you there, reading the code! This was coded by Sebastian Pape aka PapeCoding.de -->
<style> <style>
* { * {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment