This commit is contained in:
Simon Schmidt 2021-07-05 15:16:43 +02:00
parent 6b5cabb1f4
commit 5e36ef55df
3 changed files with 19 additions and 16 deletions

View File

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

View File

@ -17,8 +17,8 @@ class Treppe {
private: private:
const uint8_t stufen; const uint8_t stufen;
uint16_t time_per_stair = 300; // dimmtime per stair [ms] uint16_t time_per_stair = 300; // dimmtime per stair [ms]
uint16_t idle_brightness = 0; uint16_t idle_brightness = 100;
uint16_t active_brightness = 500; uint16_t active_brightness = 700;
uint16_t ldr_schwelle = 7; // activation value for FSM [lx] uint16_t ldr_schwelle = 7; // activation value for FSM [lx]
@ -32,17 +32,11 @@ private:
uint16_t ticks_pro_stufe = 0; uint16_t ticks_pro_stufe = 0;
float differenz_pwm_pro_tick = 0.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 // initialize with i2c-Address 0, use Wire Library
PCA9685 pwmController; PCA9685 pwmController;
FSMTreppeModelClass FSMTreppe_Obj; FSMTreppeModelClass FSMTreppe_Obj;
FSMTreppeModelClass::ExtU_FSMTreppe_T fsm_inputs; FSMTreppeModelClass::ExtU_FSMTreppe_T fsm_inputs;
FSMTreppeModelClass::ExtY_FSMTreppe_T fsm_outputs; FSMTreppeModelClass::ExtY_FSMTreppe_T fsm_outputs;
void print_state_on_change();
enum fsm_status_t { enum fsm_status_t {
ST_INAKTIV_LDR =0, ST_INAKTIV_LDR =0,
ST_RUHEZUSTAND =1, ST_RUHEZUSTAND =1,
@ -62,6 +56,14 @@ private:
DR_AUFDIMMEN=1 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); bool read_sensor(int sensor);
float read_ldr(); float read_ldr();
bool check_ldr(); bool check_ldr();

View File

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