Merge branch 'master' of https://git.efi.th-nuernberg.de/gitea/schmidtsi76327/ESP8266_Treppenlicht

src/main.cpp

@@ -11,13 +11,23 @@ os_timer_t Timer1;         // Verwaltungsstruktur des Timers
 uint32_t c;
 
 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;
   
-  Serial.print("hallo\n");
+  //Serial.print("hallo\n");
-  Serial.println(micros()-m);
+  //Serial.println(micros()-m);
-  m = micros();
+  //m = micros();
+  ledsequence(direction, onoff, 4);
 } 
 
 
@@ -182,9 +192,10 @@ void setup() {
     delay(5000);
     ESP.restart();
   }
- 
+
-  os_timer_setfn(&Timer1, timerCallback, NULL);
+  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: ");
@@ -284,12 +295,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;