Revert "Update IR-protocol.ino"

This reverts commit 79bb804bb424d1fb3927ac0f890b3dca57a302be.
This commit is contained in:
DashyFox 2025-01-16 17:53:05 +03:00
parent b6b9d2c820
commit 71f58a4992

View File

@ -4,14 +4,14 @@
#include "MemoryCheck.h" #include "MemoryCheck.h"
/////////////// Pinout /////////////// /////////////// Pinout ///////////////
#define dec0_PIN PIN_IR_DEC_FORWARD #define dec0_PIN PIN_KT1_IN
// #define dec1_PIN PIN_KT2_IN #define dec1_PIN PIN_KT2_IN
// #define dec2_PIN PIN_KT3_IN #define dec2_PIN PIN_KT3_IN
// #define dec3_PIN PIN_KT4_IN #define dec3_PIN PIN_KT4_IN
// #define dec4_PIN PIN_KT5_IN #define dec4_PIN PIN_KT5_IN
// #define dec5_PIN PIN_KT6_IN #define dec5_PIN PIN_KT6_IN
// #define dec6_PIN PIN_KT7_IN #define dec6_PIN PIN_KT7_IN
// #define dec7_PIN PIN_KT8_IN #define dec7_PIN PIN_KT8_IN
// #define dec8_PIN PB8 // #define dec8_PIN PB8
// #define dec9_PIN PB9 // #define dec9_PIN PB9
// #define dec10_PIN PB10 // #define dec10_PIN PB10
@ -43,7 +43,7 @@
//////////////// Var ///////////////// //////////////// Var /////////////////
// IR_Encoder encForward(PA5, 42 /* , &decBackward */); // IR_Encoder encForward(PA5, 42 /* , &decBackward */);
IR_Encoder enc0(PIN_IR_ENC_FORWARD, 42 /* , &decBackward */); IR_Encoder enc0(PIN_KT8_OUT, 42 /* , &decBackward */);
// IR_Encoder enc1(PA1, 127 /* , &decBackward */); // IR_Encoder enc1(PA1, 127 /* , &decBackward */);
// IR_Encoder enc2(PA2, 137 /* , &decBackward */); // IR_Encoder enc2(PA2, 137 /* , &decBackward */);
// IR_Encoder enc3(PA3, 777 /* , &decBackward */); // IR_Encoder enc3(PA3, 777 /* , &decBackward */);
@ -59,19 +59,18 @@ IR_Encoder enc0(PIN_IR_ENC_FORWARD, 42 /* , &decBackward */);
void EncoderISR() void EncoderISR()
{ {
IR_Encoder::isr(); IR_Encoder::isr();
digitalToggle(PIN_LED_BACKWARD);
} }
//------------------------------------------------------------------- //-------------------------------------------------------------------
dec_Ini(0); dec_Ini(0);
// dec_Ini(1); dec_Ini(1);
// dec_Ini(2); dec_Ini(2);
// dec_Ini(3); dec_Ini(3);
// dec_Ini(4); dec_Ini(4);
// dec_Ini(5); dec_Ini(5);
// dec_Ini(6); dec_Ini(6);
// dec_Ini(7); dec_Ini(7);
// dec_Ini(8); // dec_Ini(8);
// dec_Ini(9); // dec_Ini(9);
// dec_Ini(10); // dec_Ini(10);
@ -182,8 +181,8 @@ Timer t1(500, millis, []()
// encBackward.sendData(IR_Broadcast, data2); // encBackward.sendData(IR_Broadcast, data2);
// encTree.sendData(IR_Broadcast, rawData3); // encTree.sendData(IR_Broadcast, rawData3);
}); });
Timer t2(50, millis, []() // Timer t2(50, millis, []()
{ digitalToggle(PIN_LED_SPECIAL_1); }); // { digitalToggle(LED_BUILTIN); });
Timer signalDetectTimer; Timer signalDetectTimer;
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
@ -198,17 +197,10 @@ void setup()
NVIC_SetPriority(IRQn_Type::TIM3_IRQn, 0); NVIC_SetPriority(IRQn_Type::TIM3_IRQn, 0);
IR_Timer.resume(); IR_Timer.resume();
pinMode(PIN_IR_DEC_FORWARD, INPUT_PULLUP);
pinMode(PIN_LED_BACKWARD, OUTPUT);
pinMode(PIN_LED_FORWARD, OUTPUT);
pinMode(PIN_LED_SPECIAL_1, OUTPUT); // test
pinMode(PIN_LED_SPECIAL_2, OUTPUT); // test
Serial.begin(SERIAL_SPEED); Serial.begin(SERIAL_SPEED);
Serial.println(F(INFO)); Serial.println(F(INFO));
// pinMode(LoopOut, OUTPUT); pinMode(LoopOut, OUTPUT);
// pinMode(SignalDetectLed, OUTPUT); // pinMode(SignalDetectLed, OUTPUT);
pinMode(dec0_PIN, INPUT_PULLUP); pinMode(dec0_PIN, INPUT_PULLUP);
@ -216,13 +208,13 @@ void setup()
static IR_DecoderRaw *blind[]{ static IR_DecoderRaw *blind[]{
&dec0, &dec0,
// &dec1, &dec1,
// &dec2, &dec2,
// &dec3, &dec3,
// &dec4, &dec4,
// &dec5, &dec5,
// &dec6, &dec6,
// &dec7, &dec7,
// &dec8, // &dec8,
// &dec9, // &dec9,
// &dec10, // &dec10,
@ -238,13 +230,13 @@ void setup()
// enc10.setBlindDecoders(blind, sizeof(blind) / sizeof(IR_DecoderRaw *)); // enc10.setBlindDecoders(blind, sizeof(blind) / sizeof(IR_DecoderRaw *));
decSetup(0); decSetup(0);
// decSetup(1); decSetup(1);
// decSetup(2); decSetup(2);
// decSetup(3); decSetup(3);
// decSetup(4); decSetup(4);
// decSetup(5); decSetup(5);
// decSetup(6); decSetup(6);
// decSetup(7); decSetup(7);
// decSetup(8); // decSetup(8);
// decSetup(9); // decSetup(9);
// decSetup(10); // decSetup(10);
@ -255,21 +247,20 @@ void setup()
void loop() void loop()
{ {
// digitalToggle(LoopOut); digitalToggle(LoopOut);
digitalWrite(PIN_LED_SPECIAL_2, digitalRead(PIN_IR_DEC_FORWARD));
Timer::tick(); Timer::tick();
IR_Decoder::tick(); IR_Decoder::tick();
bool rx_flag; bool rx_flag;
decStat(0); decStat(0);
// decStat(1); decStat(1);
// decStat(2); decStat(2);
// decStat(3); decStat(3);
// decStat(4); decStat(4);
// decStat(5); decStat(5);
// decStat(6); decStat(6);
// decStat(7); decStat(7);
// decStat(8); // decStat(8);
// decStat(9); // decStat(9);
// decStat(10); // decStat(10);
@ -327,9 +318,6 @@ void detectSignal()
// digitalWrite(SignalDetectLed, HIGH); // digitalWrite(SignalDetectLed, HIGH);
// signalDetectTimer.delay(50, millis, []() // signalDetectTimer.delay(50, millis, []()
// { digitalWrite(SignalDetectLed, LOW); }); // { digitalWrite(SignalDetectLed, LOW); });
digitalToggle(PIN_LED_FORWARD);
} }
// test // test