schmidtsi76327/ESP8266_Treppenlicht
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added log messages

Browse Source
This commit is contained in:
Simon Schmidt 2021-07-19 12:01:20 +02:00
parent e47cae30a8
commit 125b39a418
2 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/httpserver/httpserver.cpp
View File

@ -45,18 +45,23 @@ void HTTPServer::start_apps() {
if (argName(i).equals("range_act_pwm")) {
treppe->set_active_pwm(arg(i).toInt(), VORGABE_PROZENT);
logt("set_active_pwm = %d %\n", arg(i).toInt());
}
else if (argName(i).equals("range_idl_pwm")) {
treppe->set_idle_pwm_max(arg(i).toInt(), VORGABE_PROZENT);
logt("set_idle_pwm_max = %d %\n", arg(i).toInt());
}
else if (argName(i).equals("range_tim_sta")) {
treppe->set_time_per_stair(arg(i).toInt());
logt("set_time_per_stair = %d\n", arg(i).toInt());
}
else if (argName(i).equals("range_tim_ldr")) {
treppe->set_time_ldr(arg(i).toInt());
logt("set_time_ldr = %d\n", arg(i).toInt());
}
else if (argName(i).equals("range_ldr_shw")) {
treppe->set_ldr_schwelle(arg(i).toInt(), VORGABE_PROZENT);
logt("set_ldr_schwelle = %d %\n", arg(i).toInt());
}
}

71
src/main.cpp
View File

@ -5,8 +5,8 @@
#endif
#include "PCA9685.h"
extern "C" {
#include "user_interface.h"
extern "C" {
#include "user_interface.h"
}
// OTA & WEB
#include "httpserver.h"
@ -25,33 +25,39 @@ uint8_t timer_flag = 0;
Treppe stairs(16);
// WIFI
const char* ssid = STASSID;
const char* password = STAPSK;
const char *ssid = STASSID;
const char *password = STAPSK;
// port 80, root directory of server '/'
HTTPServer httpServer(80, "/", &stairs);
uint32_t _t=0;
#define SP_US(_str,_a) Serial.print(_str); Serial.print(" took: "); Serial.print(_a); Serial.println("us")
#define TIMEIF_US(_f, _l, _str) _t=micros(); _f; _t=micros()-_t; if(_t > (_l)) { SP_US(_str, _t); }
uint32_t _t = 0;
#define SP_US(_str, _a) \
Serial.print(_str); \
Serial.print(" took: "); \
Serial.print(_a); \
Serial.println("us")
#define TIMEIF_US(_f, _l, _str) \
_t = micros(); \
_f; \
_t = micros() - _t; \
if (_t > (_l)) { \
SP_US(_str, _t); \
}
struct { // Struct for wifi-data, 40 Bytes each SSID and PW
char SSID[40] = "";
char PW[40] = "";
} wifi_data;
struct { // Struct for wifi-data, 40 Bytes each SSID and PW
char SSID[40] = "";
char PW[40] = "";
} wifi_data;
void timerCallback(void *pArg)
{
void timerCallback(void *pArg) {
*(static_cast<int *>(pArg)) += 1;
stairs.task();
}
// ===============================================
uint8_t inter = 0;
ICACHE_RAM_ATTR void int_test(){
inter = 1;
}
ICACHE_RAM_ATTR void int_test() { inter = 1; }
void setup() {
#ifdef WITH_DEBUGGING_ON
@ -63,20 +69,21 @@ void setup() {
Serial.println("Booting ....");
pinMode(ESP12_LED, OUTPUT);
EEPROM.begin(512); // init virtual "EEPROM" with size 512 Bytes
EEPROM.begin(512); // init virtual "EEPROM" with size 512 Bytes
//strncpy(wifi_data.SSID, "donotconnect", 40);
//strncpy(wifi_data.PW, "unsafe lol", 40);
// strncpy(wifi_data.SSID, "donotconnect", 40);
// strncpy(wifi_data.PW, "unsafe lol", 40);
EEPROM.get(0, wifi_data);
//EEPROM.commit();
// EEPROM.commit();
Wire.begin(); // Wire must be started first
Wire.setClock(1000000); // Supported baud rates are 100kHz, 400kHz, and 1000kHz
Wire.begin(); // Wire must be started first
Wire.setClock(
1000000); // Supported baud rates are 100kHz, 400kHz, and 1000kHz
stairs.setup();
Serial.println("PCA9685 connected !");
//attachInterrupt(digitalPinToInterrupt(2), int_test, RISING);
//attachInterrupt(digitalPinToInterrupt(12), int_test, RISING);
// attachInterrupt(digitalPinToInterrupt(2), int_test, RISING);
// attachInterrupt(digitalPinToInterrupt(12), int_test, RISING);
WiFi.mode(WIFI_STA);
WiFi.begin(ssid, password);
@ -102,22 +109,16 @@ void setup() {
os_timer_setfn(&timer1, timerCallback, &timer_flag);
os_timer_arm(&timer1, 20, true);
Serial.println("SSID: " + String(wifi_data.SSID) + " PW: " + String(wifi_data.PW));
Serial.println("SSID: " + String(wifi_data.SSID) +
" PW: " + String(wifi_data.PW));
}
uint32_t c = 0;
void loop() {
if(inter != 0u){
if (inter != 0u) {
Serial.printf("interrupt\n");
inter = 0;
}
if(c++%1000000 == 0) { { {
httpServer.logt("[%d] starting :)\n", c);
}
}
}
TIMEIF_US(ArduinoOTA.handle(), 10000, "OTA");
TIMEIF_US(httpServer.handleClient(), 10000, "HTTP");
}