Merge branch 'master' of https://git.efi.th-nuernberg.de/gitea/schmidtsi76327/ESP8266_Treppenlicht

lib/treppe/treppe.cpp

@@ -112,12 +112,12 @@ bool Treppe::read_sensor(int sensor)
 {
 
   /*
-        reads sensors with edge detection
-        
-        returns true if motion was detected
-        returns false if no motion was detected
-        returns false if motion was detected, but state did not change back to not detected
-        */
+  reads sensors with edge detection
+  
+  returns true if motion was detected
+  returns false if no motion was detected
+  returns false if motion was detected, but state did not change back to not detected
+  */
   uint8_t pegel = digitalRead(sensor);
   static uint8_t pegel_alt[2] = {0, 0};
 

lib/treppe/treppe.h

@@ -33,17 +33,11 @@ private:
     uint16_t ticks_pro_stufe = 0;
     float differenz_pwm_pro_tick = 0.0;
     
-    bool dimm_stufe(uint8_t stufe);
-    void anim_tick();
-    void start_animation();
-    void berechne_dimmer();
-
     // initialize with i2c-Address 0, use Wire Library
     PCA9685 pwmController;     
     FSMTreppeModelClass FSMTreppe_Obj;
     FSMTreppeModelClass::ExtU_FSMTreppe_T fsm_inputs;
     FSMTreppeModelClass::ExtY_FSMTreppe_T fsm_outputs;
-    void print_state_on_change();
     enum fsm_status_t {
         ST_INAKTIV_LDR      =0,
         ST_RUHEZUSTAND      =1,
@@ -63,6 +57,14 @@ private:
         DR_AUFDIMMEN=1
     };
 
+    /* DIMM */
+    bool dimm_stufe(uint8_t stufe);
+    void anim_tick();
+    void start_animation();
+    void berechne_dimmer();
+    void print_state_on_change();
+
+    /* LDR */
     bool read_sensor(int sensor);
     float read_ldr();
     bool check_ldr();

templ_platformio_ini

@@ -16,7 +16,8 @@ data_dir = data_gz
 
 [env:hardware]
 platform = espressif8266
-board = nodemcuv2
+; board = nodemcuv2
+board = huzzah
 framework = arduino
 
 ; for pio check
@@ -31,7 +32,7 @@ check_skip_packages = yes
 board_build.filesystem = littlefs
 board_build.ldscript = eagle.flash.4m1m.ld
 extra_scripts = pre:create_gz_files.py
-monitor_speed = 115200
+monitor_speed = 76800
 
 [env:serial]
 extends = env:hardware