moved to treppe.h instead of pwm.h :)

lib/treppe/treppe.cpp

@@ -15,17 +15,15 @@ uint8_t Treppe::softstart_led(uint8_t led, uint16_t startval, uint16_t stopval){
 
     static uint8_t lastled = 255;
     static float current_pwm = 0;
-    static float stepsize = 0.5;
+    static float stepsize = 1.0;
     if(led != lastled){
       pwmController.setChannelPWM(led, (uint16_t)startval);
       lastled = led;
       current_pwm = startval;
-      stepsize = 20*abs(stopval - startval)/(float)time_per_stair;      // only valid at 1ms function call interval
+      stepsize = INT_TIME*abs(stopval - startval)/(float)time_per_stair;      // only valid at 1ms function call interval
       return 1;
     }
     
-    if(current_pwm > stopval - stepsize && current_pwm < stopval + stepsize) return 0;
-    // todo: duty cycle zero!
     if(startval > stopval){
       current_pwm -= stepsize;
     }
@@ -34,6 +32,10 @@ uint8_t Treppe::softstart_led(uint8_t led, uint16_t startval, uint16_t stopval){
     }
     Serial.println((uint16_t)current_pwm);
     pwmController.setChannelPWM(led, (uint16_t)current_pwm);
+    if(current_pwm > stopval - stepsize && current_pwm < stopval + stepsize){
+      if(stopval == 0) pwmController.setChannelPWM(led, 0);
+      return 0;
+    } 
     return 1;
 }
 
@@ -41,10 +43,8 @@ void Treppe::ledsequence(){
   static int8_t led = 0;
   static uint16_t brightness = 0;
   static uint16_t lastbrightness = 0;
-  static uint8_t finish = 1;
   static uint16_t status = 0;
   uint16_t status_build = 0;
-
   status_build |= direction << 8;
   status_build |= state;
   if(status_build != status){                 // check if any parameter changed
@@ -93,7 +93,6 @@ void Treppe::ledsequence(){
 }
 
 
-
 void Treppe::task_2()
 {
   if(state) {
@@ -141,25 +140,59 @@ void Treppe::setup(){
    
     pwmController.resetDevices();
     
-    // Deactivate PCA9685_PhaseBalancer due to LED Flickering
+    // Deactive PCA9685 Phase Balancer due to LED Flickering
     // https://github.com/NachtRaveVL/PCA9685-Arduino/issues/15
     // see also lib/PCA9685-Arduin/PCA9685.h:204
     pwmController.init(PCA9685_PhaseBalancer_None);
     pwmController.setPWMFrequency(200);
+    pwmController.setAllChannelsPWM(idle_brightness);
+
+    pinMode(SENSOR1, INPUT);
+    pinMode(SENSOR2, INPUT);
     Serial.println("Hello from Treppe");
     Serial.print("Treppe: initial parameters: stairs=");
     Serial.println(stairs);
-    
-    for(uint8_t i=0; i<stairs; i++) {
-        pwmController.setChannelPWM(i, idle_brightness); 
-    }
 }
 
 void Treppe::task(){
-    //ledsequence();
-    task_2();
+
+  if(finish){
+    direction = switch_direction;
+    state = switch_state;
+  }  
+  static uint8_t last_sensor_state[2] = {0,0}; 
+  uint8_t current_sensor_state[2] = {0,0};
+  current_sensor_state[0] = digitalRead(SENSOR1);
+  current_sensor_state[1] = digitalRead(SENSOR2);
+  
+  if(current_sensor_state[0] && !last_sensor_state[0] && state == 0){
+    setDirection(1);
+    setState(1);
+  }
+
+  if(current_sensor_state[1] && !last_sensor_state[1] && state == 0){
+    setDirection(0);
+    setState(1);
+  }
+
+  // first switch - off approach, use timer later
+  if(!current_sensor_state[0] && last_sensor_state[0] && state == 1){
+    setDirection(1);
+    setState(0);
+  }
+
+  if(!current_sensor_state[1] && last_sensor_state[1] && state == 1){
+    setDirection(0);
+    setState(0);
+  }
+
+  last_sensor_state[0] = current_sensor_state[0];
+  last_sensor_state[1] = current_sensor_state[1];
+  ledsequence();
+
 }
 
+
 uint16_t Treppe::setIdle(uint16_t _idle_brightness){
     idle_brightness = _idle_brightness;
     Serial.println("Treppe: idle brightness changed!");
@@ -177,17 +210,21 @@ uint16_t Treppe::setTime(uint16_t _time_per_stair){
 }
 
 uint8_t Treppe::setDirection(uint8_t _direction){
-    direction = _direction;
-    Serial.printf("Treppe: Direction: %d!\n",direction);
+    switch_direction = _direction;
+    Serial.println("Treppe: Direction changed!");
+    if(finish) Serial.println("apply direction request immediately");
+    else  Serial.println("currently active, dir change afterwards");
     // to do: implement state command variable to determine dimm-state
-    return direction;
+    return switch_direction;
 }
 
 uint8_t Treppe::setState(uint8_t _state){
     if(state == _state) return 1;
     else{
-        state = _state;
-        Serial.printf("Treppe: State: %d!\n",state);
+        switch_state = _state;
+        Serial.println("Treppe: State Request changed!");
+        if(finish) Serial.println("apply state request immediately");
+        else Serial.println("currently active, state changes after activity");
     }  
     return 0;
-}
+}

lib/treppe/treppe.h

@@ -2,6 +2,11 @@
 
 #include "PCA9685.h"
 
+#define SENSOR1 15
+#define SENSOR2 12
+
+#define INT_TIME 20         // interrupt intervall [ms]
+
 class Treppe {
 private:
     uint8_t stairs;
@@ -10,8 +15,10 @@ private:
     uint16_t active_brightness = 500;
 
     uint8_t direction = 0;
+    uint8_t switch_direction = 0;
     uint8_t state = 0;
     uint8_t switch_state = 0;
+    uint8_t finish = 1;
 
     uint32_t tick = 0;
     uint32_t stufe = 0;