Merge branch 'master' of https://git.efi.th-nuernberg.de/gitea/schmidtsi76327/ESP8266_Treppenlicht
This commit is contained in:
+1
-1
Submodule lib/PCA9685-Arduino updated: a70be39257...23e06c06a6
@@ -198,7 +198,7 @@ void Treppe::task(){
|
|||||||
last_sensor_state[1] = current_sensor_state[1];
|
last_sensor_state[1] = current_sensor_state[1];
|
||||||
|
|
||||||
ledsequence();
|
ledsequence();
|
||||||
|
//Serial.printf("LDR: %f\n", ((float)analogRead(A0))/1023.*3.68);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+10
-1
@@ -42,7 +42,10 @@ void timerCallback(void *pArg)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ===============================================
|
// ===============================================
|
||||||
|
uint8_t inter = 0;
|
||||||
|
ICACHE_RAM_ATTR void int_test(){
|
||||||
|
inter = 1;
|
||||||
|
}
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
#ifdef WITH_DEBUGGING_ON
|
#ifdef WITH_DEBUGGING_ON
|
||||||
@@ -84,6 +87,8 @@ void setup() {
|
|||||||
|
|
||||||
stairs.setup();
|
stairs.setup();
|
||||||
Serial.println("PCA9685 connected !");
|
Serial.println("PCA9685 connected !");
|
||||||
|
//attachInterrupt(digitalPinToInterrupt(2), int_test, RISING);
|
||||||
|
//attachInterrupt(digitalPinToInterrupt(12), int_test, RISING);
|
||||||
|
|
||||||
os_timer_setfn(&timer1, timerCallback, &timer_flag);
|
os_timer_setfn(&timer1, timerCallback, &timer_flag);
|
||||||
os_timer_arm(&timer1, 20, true);
|
os_timer_arm(&timer1, 20, true);
|
||||||
@@ -106,6 +111,10 @@ void loop() {
|
|||||||
// stairs.setDirection(!stairs.getDirection());
|
// stairs.setDirection(!stairs.getDirection());
|
||||||
// stairs.setState(1);
|
// stairs.setState(1);
|
||||||
// }
|
// }
|
||||||
|
if(inter){
|
||||||
|
Serial.printf("interrupt\n");
|
||||||
|
inter = 0;
|
||||||
|
}
|
||||||
if(c++%1000000 == 0)
|
if(c++%1000000 == 0)
|
||||||
httpServer.logt("[%d] starting :)\n", c);
|
httpServer.logt("[%d] starting :)\n", c);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user