Merge branch 'master' of https://git.efi.th-nuernberg.de/gitea/schmidtsi76327/ESP8266_Treppenlicht
This commit is contained in:
commit
09aff91b31
29
src/main.cpp
29
src/main.cpp
@ -14,16 +14,24 @@ os_timer_t Timer1; // Verwaltungsstruktur des Timers
|
||||
int c;
|
||||
bool toggle = false;
|
||||
uint32_t m=0;
|
||||
|
||||
uint32_t dimmtimer = 0;
|
||||
uint8_t direction = 1;
|
||||
uint8_t onoff = 1;
|
||||
|
||||
|
||||
void ledsequence(uint8_t direction, uint8_t onoff, uint8_t factor);
|
||||
uint8_t softstart_led(uint8_t led, uint16_t startval, uint16_t stopval, uint8_t factor);
|
||||
|
||||
void timerCallback(void *pArg)
|
||||
{
|
||||
*((int *) pArg) += 1;
|
||||
toggle = !toggle;
|
||||
digitalWrite(NODEMCU_LED, toggle);
|
||||
|
||||
Serial.print("[");
|
||||
Serial.print(micros()-m);
|
||||
Serial.print("] timerCallback\n");
|
||||
m = micros();
|
||||
ledsequence(direction, onoff, 4);
|
||||
// Serial.print("[");
|
||||
// Serial.print(micros()-m);
|
||||
// Serial.print("] timerCallback\n");
|
||||
// m = micros();
|
||||
}
|
||||
|
||||
// OTA & WEB
|
||||
@ -189,7 +197,8 @@ void setup() {
|
||||
}
|
||||
|
||||
os_timer_setfn(&Timer1, timerCallback, &c);
|
||||
os_timer_arm(&Timer1, 1000, true);
|
||||
os_timer_arm(&Timer1, 1, true);
|
||||
|
||||
|
||||
Serial.println("Ready");
|
||||
Serial.print("IP address: ");
|
||||
@ -289,12 +298,10 @@ void ledsequence(uint8_t direction, uint8_t onoff, uint8_t factor){
|
||||
|
||||
void loop() {
|
||||
|
||||
static uint32_t dimmtimer = 0;
|
||||
static uint8_t direction = 1;
|
||||
static uint8_t onoff = 1;
|
||||
|
||||
|
||||
if(millis() - dimmtimer > 2){
|
||||
ledsequence(direction, onoff, 4);
|
||||
//ledsequence(direction, onoff, 4);
|
||||
dimmtimer = millis();
|
||||
}
|
||||
if(millis() > 25000 && onoff == 1 && direction == 1) onoff = 0;
|
||||
|
Loading…
x
Reference in New Issue
Block a user