diff --git a/main.go.h b/main.go.h index ee503c4..4fc299a 100644 --- a/main.go.h +++ b/main.go.h @@ -8,7 +8,7 @@ void Vyklyuchit(); void TaskSveta(); -const unsigned long VREMYA_SVETA = 20000; TickType_t loopBlockTime = pdMS_TO_TICKS(1000); TickType_t vklYarkBlockTime = pdMS_TO_TICKS(10); TickType_t vyklYarkBlockTime = pdMS_TO_TICKS(50); bool vkl; unsigned long kogdaVyklyuchit; void initSvet() { +const unsigned long VREMYA_SVETA = 20000; TickType_t loopBlockTime = pdMS_TO_TICKS(1000); int vklYarkBlockTime = 10; TickType_t vyklYarkBlockTime = pdMS_TO_TICKS(50); bool vkl; unsigned long kogdaVyklyuchit; void initSvet() { vkl=false; kogdaVyklyuchit=0; Vyklyuchit(); } void DvizhEst(int start) { @@ -18,7 +18,7 @@ void DvizhaNet() { if (kogdaVyklyuchit>millis()) { return; } if (vkl) { vkl=false; if (DEBUG) { Serial.println("Vykl"); } PlavnoVyklyuchit(); } } void PlavnoVklyuchit(int start) { - digitalWrite(SVET_ONOFF_PIN,1); int i; for(i=start; i>=0; i--) {analogWrite(SVET_YARK_PIN,i); if (DEBUG) { Serial.println(i); } delay(5);} Vklyuchit(); + digitalWrite(SVET_ONOFF_PIN,1); int i; for(i=start; i>=0; i--) {analogWrite(SVET_YARK_PIN,i); if (DEBUG) { Serial.println(i); } delay(vklYarkBlockTime);} Vklyuchit(); } void PlavnoVyklyuchit() { int v; int i; for(i=0; i<=255; i++) {analogWrite(SVET_YARK_PIN,i); if (DEBUG) { Serial.println(i); } v=ulTaskNotifyTake(0,vyklYarkBlockTime); if (v>0) { DvizhEst(i); return; }} Vyklyuchit(); diff --git a/pkg/app/main.go b/pkg/app/main.go index 0b8c5b8..6a6536c 100644 --- a/pkg/app/main.go +++ b/pkg/app/main.go @@ -11,7 +11,7 @@ import ( const VREMYA_SVETA uint32 = 20000 var loopBlockTime task.TickType = task.MS_TO_TICKS(1000) -var vklYarkBlockTime task.TickType = task.MS_TO_TICKS(10) +var vklYarkBlockTime int = 10 var vyklYarkBlockTime task.TickType = task.MS_TO_TICKS(50) var vkl bool @@ -58,7 +58,7 @@ func PlavnoVklyuchit(start int) { if DEBUG { serial.Println(i) } - timer.Delay(5) + timer.Delay(vklYarkBlockTime) } Vklyuchit()