From a9f098097c1ddf52d827dbd59e1de2fffec693fb Mon Sep 17 00:00:00 2001 From: Dominik Bartsch Date: Wed, 30 Jun 2021 16:09:46 +0200 Subject: [PATCH 1/2] switched to linear phase balance --- lib/PCA9685-Arduino | 2 +- lib/treppe/treppe.cpp | 10 +++++++--- lib/treppe/treppe.h | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/PCA9685-Arduino b/lib/PCA9685-Arduino index a70be39..2edc89a 160000 --- a/lib/PCA9685-Arduino +++ b/lib/PCA9685-Arduino @@ -1 +1 @@ -Subproject commit a70be39257e317d35e9118b385006a1e030e6452 +Subproject commit 2edc89a3a9926c9ae870a69933696b3933f6c520 diff --git a/lib/treppe/treppe.cpp b/lib/treppe/treppe.cpp index 8aa7466..993d8e3 100644 --- a/lib/treppe/treppe.cpp +++ b/lib/treppe/treppe.cpp @@ -139,10 +139,12 @@ void Treppe::setup(){ // 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.init(PCA9685_PhaseBalancer_None); + pwmController.init(PCA9685_PhaseBalancer_Linear); + pwmController.setPWMFrequency(100); pwmController.setAllChannelsPWM(idle_brightness); - + + pinMode(A0, INPUT); pinMode(SENSOR1, INPUT); pinMode(SENSOR2, INPUT); pinMode(OE, OUTPUT); @@ -196,6 +198,8 @@ void Treppe::task(){ last_sensor_state[1] = current_sensor_state[1]; ledsequence(); + + Serial.printf("LDR raw: %d\n", analogRead(A0)); } diff --git a/lib/treppe/treppe.h b/lib/treppe/treppe.h index 804d525..8f577af 100644 --- a/lib/treppe/treppe.h +++ b/lib/treppe/treppe.h @@ -13,7 +13,7 @@ private: uint8_t stairs; uint16_t time_per_stair = 300; // dimmtime per stair [ms] uint16_t idle_brightness = 0; - uint16_t active_brightness = 500; + uint16_t active_brightness = 3000; uint8_t direction = 0; uint8_t switch_direction = 0; From 5b197288bcb62e6e67a6b52342f3f493be562d89 Mon Sep 17 00:00:00 2001 From: Dominik Bartsch Date: Wed, 30 Jun 2021 16:50:00 +0200 Subject: [PATCH 2/2] back to normal --- lib/PCA9685-Arduino | 2 +- lib/treppe/treppe.cpp | 5 ++--- lib/treppe/treppe.h | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/PCA9685-Arduino b/lib/PCA9685-Arduino index 2edc89a..23e06c0 160000 --- a/lib/PCA9685-Arduino +++ b/lib/PCA9685-Arduino @@ -1 +1 @@ -Subproject commit 2edc89a3a9926c9ae870a69933696b3933f6c520 +Subproject commit 23e06c06a6026801a856141f64a6de54dd493b47 diff --git a/lib/treppe/treppe.cpp b/lib/treppe/treppe.cpp index 993d8e3..a46dc12 100644 --- a/lib/treppe/treppe.cpp +++ b/lib/treppe/treppe.cpp @@ -139,8 +139,8 @@ void Treppe::setup(){ // 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.init(PCA9685_PhaseBalancer_Linear); + pwmController.init(PCA9685_PhaseBalancer_None); + //pwmController.init(PCA9685_PhaseBalancer_Linear); pwmController.setPWMFrequency(100); pwmController.setAllChannelsPWM(idle_brightness); @@ -199,7 +199,6 @@ void Treppe::task(){ ledsequence(); - Serial.printf("LDR raw: %d\n", analogRead(A0)); } diff --git a/lib/treppe/treppe.h b/lib/treppe/treppe.h index 8f577af..64fee9c 100644 --- a/lib/treppe/treppe.h +++ b/lib/treppe/treppe.h @@ -2,7 +2,7 @@ #include "PCA9685.h" -#define SENSOR1 16 +#define SENSOR1 2 #define SENSOR2 12 #define OE 14 @@ -12,8 +12,8 @@ class Treppe { private: uint8_t stairs; uint16_t time_per_stair = 300; // dimmtime per stair [ms] - uint16_t idle_brightness = 0; - uint16_t active_brightness = 3000; + uint16_t idle_brightness = 100; + uint16_t active_brightness = 2048; uint8_t direction = 0; uint8_t switch_direction = 0;