Commit 655fde934f1b0c2cadc8e015dcdf13dea9cdb15a
Committed by
GitHub
1 parent
bea85f0e
Update Dali.h
Showing
1 changed file
with
7 additions
and
1 deletions
Dali.h
| @@ -69,6 +69,7 @@ class Dali | @@ -69,6 +69,7 @@ class Dali | ||
| 69 | void busTest(); // bus test | 69 | void busTest(); // bus test |
| 70 | void initialisation(); //initialization of new luminaries | 70 | void initialisation(); //initialization of new luminaries |
| 71 | bool cmdCheck(String & input, int & cmd1, int & cmd2); | 71 | bool cmdCheck(String & input, int & cmd1, int & cmd2); |
| 72 | + uint8_t receive(); //get response | ||
| 72 | 73 | ||
| 73 | int minResponseLevel(); | 74 | int minResponseLevel(); |
| 74 | int maxResponseLevel(); | 75 | int maxResponseLevel(); |
| @@ -76,6 +77,11 @@ class Dali | @@ -76,6 +77,11 @@ class Dali | ||
| 76 | uint8_t speedFactor; | 77 | uint8_t speedFactor; |
| 77 | uint16_t delay1; | 78 | uint16_t delay1; |
| 78 | uint16_t delay2; | 79 | uint16_t delay2; |
| 80 | + uint16_t period; | ||
| 81 | + String errorMsg; //error message of last operation | ||
| 82 | + bool msgMode; //0 - get only response from dali bus to COM; 1 - response with text (comments) | ||
| 83 | + bool getResponse; | ||
| 84 | + uint8_t RxAnalogPin; | ||
| 79 | 85 | ||
| 80 | long daliTimeout = 20000; //us, DALI response timeout | 86 | long daliTimeout = 20000; //us, DALI response timeout |
| 81 | int analogLevel = 870; //analog border level (less - "0"; more - "1") | 87 | int analogLevel = 870; //analog border level (less - "0"; more - "1") |
| @@ -95,7 +101,7 @@ class Dali | @@ -95,7 +101,7 @@ class Dali | ||
| 95 | int readBinaryString(char *s); | 101 | int readBinaryString(char *s); |
| 96 | 102 | ||
| 97 | uint8_t TxPin; | 103 | uint8_t TxPin; |
| 98 | - uint8_t RxAnalogPin; | 104 | + |
| 99 | uint8_t applyWorkAround1Mhz; | 105 | uint8_t applyWorkAround1Mhz; |
| 100 | uint8_t rxAnalogPin = 0; | 106 | uint8_t rxAnalogPin = 0; |
| 101 | 107 |