Skip to content

fix: resolve ESP32 compile errors and duplicate define #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
netmindz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: resolve ESP32 compile errors and duplicate define #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions qqqDALI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ uint8_t Dali::_man_weight(uint8_t i) {
}

//call with bitpos <= DALI_RX_BUF_SIZE*8-8;
uint8_t Dali::_man_sample(uint8_t *edata, uint16_t bitpos, uint8_t *stop_coll) {
uint8_t Dali::_man_sample(volatile uint8_t *edata, uint16_t bitpos, uint8_t *stop_coll) {
uint8_t pos = bitpos>>3;
uint8_t shift = bitpos & 0x7;
uint8_t sample = (edata[pos] << shift) | (edata[pos+1] >> (8-shift));
Expand All @@ -279,7 +279,7 @@ uint8_t Dali::_man_sample(uint8_t *edata, uint16_t bitpos, uint8_t *stop_coll) {

//decode 8 times oversampled encoded data
//returns bitlen of decoded data, or 0 on collision
uint8_t Dali::_man_decode(uint8_t *edata, uint8_t ebitlen, uint8_t *ddata) {
uint8_t Dali::_man_decode(volatile uint8_t *edata, uint8_t ebitlen, uint8_t *ddata) {
uint8_t dbitlen = 0;
uint16_t ebitpos = 1;
while(ebitpos+1<ebitlen) {
Expand Down
6 changes: 3 additions & 3 deletions qqqDALI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ class Dali {


uint8_t _man_weight(uint8_t i);
uint8_t _man_sample(uint8_t *edata, uint16_t bitpos, uint8_t *stop_coll);
uint8_t _man_decode(uint8_t *edata, uint8_t ebitlen, uint8_t *ddata);
uint8_t _man_sample(volatile uint8_t *edata, uint16_t bitpos, uint8_t *stop_coll);
uint8_t _man_decode(volatile uint8_t *edata, uint8_t ebitlen, uint8_t *ddata);

//-------------------------------------------------
//HIGH LEVEL PRIVATE
Expand Down Expand Up @@ -398,7 +398,7 @@ class Dali {
#define DALI_QUERY_REFARENCE_RUNNING 249 //249 IEC62386-207 - Returns whetherReference System Power is in operation. (Command that exist only in IEC62386-207)
#define DALI_QUERY_REFERENCE_MEASURMENT_FAILED 250 //250 IEC62386-207 - Returns bit7 reference measurement failed of ‘FAILURE STATUS’ (Command that exist only in IEC62386-207)
#define DALI_QUERY_CURRENT_PROTECTOR_ENABLE 251 //251 IEC62386-207 - Returns state of Curent protector (Command that exist only in IEC62386-207)
#define DALI_QUERY_OPERATING_MODE 252 //252 IEC62386-207 - Returns ‘OPERATING MODE’ (Command that exist only in IEC62386-207)
#define DALI_QUERY_OPERATING_MODE_207 252 //252 IEC62386-207 - Returns ‘OPERATING MODE’ (Command that exist only in IEC62386-207)
#define DALI_QUERY_FAST_FADE_TIME 253 //253 IEC62386-207 - Returns set Fast fade time. (Command that exist only in IEC62386-207)
#define DALI_QUERY_MIN_FAST_FADE_TIME 254 //254 IEC62386-207 - Returns set Minimum fast fade time (Command that exist only in IEC62386-207)
#define DALI_QUERY_EXTENDED_VERSION_NUMBER 255 //255 IEC62386-207 - The version number of the extended support? IEC62386-207: 1, Other: NO(no response)
Expand Down