This commit is contained in:
2024-04-22 16:44:03 +03:00
parent 59d6e7aa23
commit b785535f8c

View File

@ -53,8 +53,12 @@ void EncoderISR()
} }
//------------------------------------------------------------------ //------------------------------------------------------------------
#define dec_ISR(n) \ #define dec_ISR(n) void dec_##n##_ISR() { dec##n.isr(); }
void dec_##n##_ISR() { dec##n.isr(); } #define decPinMode(n) pinMode(dec##n##_PIN, INPUT_PULLUP);
#define decAttach(n) attachInterrupt(dec##n##_PIN, dec_##n##_ISR, CHANGE);
#define decSetup(n) /* decPinMode(n); */ decAttach(n);
#define decTick(n) dec##n.tick();
#define decStat(n) rx_flag |= statusSimple(dec##n);
dec_ISR(0); dec_ISR(0);
dec_ISR(1); dec_ISR(1);
@ -183,11 +187,6 @@ void setup()
pinMode(encBackward_PIN, OUTPUT); pinMode(encBackward_PIN, OUTPUT);
pinMode(LED_BUILTIN, OUTPUT); pinMode(LED_BUILTIN, OUTPUT);
#define decPinMode(n) pinMode(dec##n##_PIN, INPUT_PULLUP);
#define decAttach(n) attachInterrupt(dec##n##_PIN, dec_##n##_ISR, CHANGE);
#define decSetup(n) /* decPinMode(n); */ decAttach(n);
#define decTick(n) dec##n.tick();
#define decStat(n) rx_flag |= statusSimple(dec##n);
decSetup(0); decSetup(0);
@ -243,10 +242,12 @@ void detectSignal()
// test // test
bool statusSimple(IR_Decoder &dec){ bool statusSimple(IR_Decoder &dec){
if (dec.gotData.available()) bool ret;
if (ret = dec.gotData.available())
{ {
Serial.print("DEC "); Serial.println(dec.id); Serial.print("DEC "); Serial.println(dec.id);
} }
return ret;
} }
void status(IR_Decoder &dec) void status(IR_Decoder &dec)