DashyFox/IR-protocol
1
0
Fork 0
mirror of https://github.com/Show-maket/IR-protocol.git synced 2025-06-28 05:09:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
DashyFox
2024-04-23 13:35:49 +03:00
parent 06d27f2590
commit e951111c53
11 changed files with 443 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
IR-protocol.ino
View File

@ -7,14 +7,36 @@
#define encForward_PIN PA0
#define encBackward_PIN PA1
#define dec1_PIN PB0
#define dec2_PIN PB1
#define dec0_PIN PB0
#define dec1_PIN PB1
#define dec2_PIN PA2
#define dec3_PIN PB3
#define dec4_PIN PB4
#define dec5_PIN PB5
#define dec6_PIN PB6
#define dec7_PIN PB7
#define dec8_PIN PB8
#define dec9_PIN PB9
#define dec10_PIN PB10
#define dec11_PIN PB11
#define dec12_PIN PB12
#define dec13_PIN PB13
#define dec14_PIN PB14
#define dec15_PIN PB15
#define LoopOut PA7
// #define TestOut 13
#define dec_ISR(n) \
void dec_##n##_ISR() { dec##n.isr(); }
#define dec_Ini(n) \
IR_Decoder dec##n(dec##n##_PIN, n); \
dec_ISR(n)
#define SignalDetectLed PA6
#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);
//////////////// Ini /////////////////
@ -23,43 +45,35 @@
//////////////// Var /////////////////
IR_Decoder decForward(dec1_PIN, 555);
IR_Decoder decBackward(dec2_PIN, 777);
IR_Encoder encForward(42 /* , &decBackward */);
IR_Encoder encForward(PA5, 42 /* , &decBackward */);
// IR_Encoder encBackward(321, encBackward_PIN);
// IR_Encoder encTree(325, A2);
//////////////////////// Функции прерываний ////////////////////////
void decForwardISR()
{
decForward.isr();
// Serial.println("ISR");
}
void decBackwardISR()
{
decBackward.isr();
// Serial.println("ISR");
}
static uint8_t *portOut;
void EncoderISR()
{
encForward.isr();
// encBackward.isr();
// encTree.isr();
// TODO: Сделать выбор порта
// *portOut = (*portOut & 0b11001111) |
// (
// encForward.ir_out_virtual << 5U
// // | encBackward.ir_out_virtual << 6U
// // | encTree.ir_out_virtual << 2U
// );
digitalWrite(PB5, encForward.ir_out_virtual);
// Serial.println("EncoderISR");
IR_Encoder::isr();
}
//-------------------------------------------------------------------
dec_Ini(0);
dec_Ini(1);
dec_Ini(2);
dec_Ini(3);
dec_Ini(4);
dec_Ini(5);
dec_Ini(6);
dec_Ini(7);
dec_Ini(8);
dec_Ini(9);
dec_Ini(10);
dec_Ini(11);
dec_Ini(12);
dec_Ini(13);
/////////////////////////////////////////////////////////////////////
uint8_t data0[] = {};
uint8_t data1[] = {42};
@ -159,39 +173,44 @@ Timer t1(500, millis, []()
Timer signalDetectTimer;
/////////////////////////////////////////////////////////////////////
HardwareTimer IR_Timer(TIM3);
HardwareTimer MicrosTimer(TIM1);
void MicrosTimerISR(){
}
void setup()
{
// MicrosTimer.setOve
IR_Timer.setOverflow(carrierFrec*2, HERTZ_FORMAT);
IR_Timer.setOverflow(carrierFrec * 2, HERTZ_FORMAT);
IR_Timer.attachInterrupt(1, EncoderISR);
IR_Timer.resume();
Serial.begin(SERIAL_SPEED);
Serial.println(F(INFO));
pinMode(LoopOut, OUTPUT);
pinMode(SignalDetectLed, OUTPUT);
// pinMode(SignalDetectLed, OUTPUT);
pinMode(dec1_PIN, INPUT_PULLUP);
// pinMode(dec2_PIN, INPUT_PULLUP);
pinMode(encForward_PIN, OUTPUT);
pinMode(encBackward_PIN, OUTPUT);
pinMode(LED_BUILTIN, OUTPUT);
// IR_DecoderRaw* blindFromForward [] { &decForward, &decBackward };
// encForward.setBlindDecoders(blindFromForward, sizeof(blindFromForward) / sizeof(IR_DecoderRaw*));
attachInterrupt(dec1_PIN, decForwardISR, CHANGE); // D2
// attachInterrupt(dec2_PIN, decBackwardISR, CHANGE); // D3
decSetup(0);
decSetup(1);
decSetup(2);
decSetup(3);
decSetup(4);
decSetup(5);
decSetup(6);
decSetup(7);
decSetup(8);
decSetup(9);
decSetup(10);
decSetup(11);
decSetup(12);
decSetup(13);
}
void loop()
@ -199,10 +218,25 @@ void loop()
digitalToggle(LoopOut);
Timer::tick();
decForward.tick();
decBackward.tick();
IR_Decoder::tick();
status(decForward);
bool rx_flag;
decStat(0);
decStat(1);
decStat(2);
decStat(3);
decStat(4);
decStat(5);
decStat(6);
decStat(7);
decStat(8);
decStat(9);
decStat(10);
decStat(11);
decStat(12);
decStat(13);
// status(decForward);
// status(decBackward);
// Serial.println(micros() - loopTimer);
@ -230,12 +264,28 @@ void loop()
}
}
}
Timer statusSimpleDelay;
bool statusSimple(IR_Decoder &dec)
{
bool ret;
if (ret = dec.gotData.available())
{
Serial.print("DEC: ");
Serial.print(dec.getId());
Serial.print(" err: ");
Serial.print(dec.gotData.getErrorCount());
Serial.print("\n");
statusSimpleDelay.delay(100, millis, []()
{ Serial.print("\n\n\n\n"); });
}
return ret;
}
void detectSignal()
{
digitalWrite(SignalDetectLed, HIGH);
signalDetectTimer.delay(50, millis, []()
{ digitalWrite(SignalDetectLed, LOW); });
// digitalWrite(SignalDetectLed, HIGH);
// signalDetectTimer.delay(50, millis, []()
// { digitalWrite(SignalDetectLed, LOW); });
}
// test