From fd62972717e490ac3ec48e855707b66dd2b4b448 Mon Sep 17 00:00:00 2001 From: DashyFox Date: Tue, 16 Apr 2024 16:01:50 +0300 Subject: [PATCH 1/3] modified: IR-protocol.ino --- IR-protocol.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IR-protocol.ino b/IR-protocol.ino index 8364702..511edf9 100644 --- a/IR-protocol.ino +++ b/IR-protocol.ino @@ -167,7 +167,7 @@ void setup() Timer3.setPeriod(1000000U / carrierFrec / 2); // Timer3.attachCompare1Interrupt(EncoderISR); - Timer1.setMode(1,timer_mode::TIMER_INPUT_CAPTURE); + // Timer1.setMode(1,timer_mode::TIMER_INPUT_CAPTURE); Serial.begin(SERIAL_SPEED); Serial.println(F(INFO)); From 9643670942e6c3a37679d03cc2fb114be9b26f87 Mon Sep 17 00:00:00 2001 From: DashyFox Date: Tue, 16 Apr 2024 17:28:16 +0300 Subject: [PATCH 2/3] upd --- IR-protocol.ino | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/IR-protocol.ino b/IR-protocol.ino index 511edf9..16e57e4 100644 --- a/IR-protocol.ino +++ b/IR-protocol.ino @@ -7,11 +7,13 @@ #define encForward_PIN PB5 #define encBackward_PIN PB4 -#define dec1_PIN PB7 +#define dec1_PIN PA8 #define dec2_PIN PB8 -#define LoopOut PB3 -// #define ISR_Out 10 +#define LoopOut PB12 + +#define ISR_1_Out PB6 +#define ISR_2_Out PB7 // #define TestOut 13 @@ -24,8 +26,8 @@ //////////////// Var ///////////////// -IR_Decoder decForward(PB7, 555); -IR_Decoder decBackward(PB8, 777); +IR_Decoder decForward(dec1_PIN, 555); +IR_Decoder decBackward(dec2_PIN, 777); IR_Encoder encForward(42 /* , &decBackward */); // IR_Encoder encBackward(321, encBackward_PIN); @@ -166,23 +168,20 @@ void setup() Timer3.setPeriod(1000000U / carrierFrec / 2); // Timer3.attachCompare1Interrupt(EncoderISR); - - // Timer1.setMode(1,timer_mode::TIMER_INPUT_CAPTURE); + Serial.begin(SERIAL_SPEED); Serial.println(F(INFO)); - // pinMode(A0, INPUT_PULLUP); - // pinMode(A1, INPUT_PULLUP); - // pinMode(A2, INPUT_PULLUP); - // pinMode(A3, INPUT_PULLUP); + pinMode(ISR_1_Out,OUTPUT); + pinMode(ISR_2_Out,OUTPUT); pinMode(LoopOut, OUTPUT); pinMode(SignalDetectLed, OUTPUT); // pinMode(ISR_Out, OUTPUT); - pinMode(2, INPUT_PULLUP); - pinMode(3, INPUT_PULLUP); + // pinMode(dec1_PIN, INPUT_PULLUP); + // pinMode(dec2_PIN, INPUT_PULLUP); // pinMode(8, OUTPUT); // pinMode(9, OUTPUT); From 0b888a58404c7ac773ffe7a99904a312d8434cef Mon Sep 17 00:00:00 2001 From: DashyFox Date: Tue, 16 Apr 2024 17:42:24 +0300 Subject: [PATCH 3/3] clean --- IR-protocol.ino | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/IR-protocol.ino b/IR-protocol.ino index 16e57e4..e14e88e 100644 --- a/IR-protocol.ino +++ b/IR-protocol.ino @@ -178,15 +178,11 @@ void setup() pinMode(LoopOut, OUTPUT); pinMode(SignalDetectLed, OUTPUT); - // pinMode(ISR_Out, OUTPUT); // pinMode(dec1_PIN, INPUT_PULLUP); // pinMode(dec2_PIN, INPUT_PULLUP); - // pinMode(8, OUTPUT); - // pinMode(9, OUTPUT); - // pinMode(11, OUTPUT); - // pinMode(13, OUTPUT); + pinMode(encForward_PIN, OUTPUT); pinMode(encBackward_PIN, OUTPUT); pinMode(LED_BUILTIN, OUTPUT);