mirror of
https://github.com/Show-maket/IR-protocol.git
synced 2025-06-27 20:59:37 +00:00
Compare commits
39 Commits
dev-STM32
...
2db1ef7805
| Author | SHA1 | Date | |
|---|---|---|---|
| 2db1ef7805 | |||
| 1353ab6f75 | |||
| d1cb167aaf | |||
| 30ad816c2a | |||
| ecfb3b5f98 | |||
| 70a22463ef | |||
| 71f58a4992 | |||
| b6b9d2c820 | |||
| 98a21f5e56 | |||
| 591727546e | |||
| 79bb804bb4 | |||
| 0471b8cc89 | |||
| 90c41cfe2b | |||
| 1ecc33e9c4 | |||
| 7ef8158a00 | |||
| 341ff3a470 | |||
| e6dbdcee74 | |||
| cf5a6641f4 | |||
| da152c65ee | |||
| 8f77c60cba | |||
| fd51a4935c | |||
| aa862d8f2c | |||
| 7c9529d42f | |||
| d4dd0e95fd | |||
| 04af094f4b | |||
| 2f4ac3ddf8 | |||
| 784365181e | |||
| c66d47e464 | |||
| 3057e78aeb | |||
| a958c1d3b2 | |||
| 2147bf0788 | |||
| e37d4d79f1 | |||
| 373cd43b73 | |||
| 96f0ac623e | |||
| d46640b145 | |||
| e752d0fb50 | |||
| 5a5142e0aa | |||
| e951111c53 | |||
| 06d27f2590 |
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,5 +1,5 @@
|
||||
.vscode/*
|
||||
bin/*
|
||||
!.vscode/arduino.json
|
||||
!.vscode/launch.json
|
||||
log/*
|
||||
log/*
|
||||
/.vscode
|
||||
|
||||
5
.vscode/arduino.json
vendored
5
.vscode/arduino.json
vendored
@ -1,8 +1,7 @@
|
||||
{
|
||||
"configuration": "pnum=BLUEPILL_F103C8,upload_method=swdMethod,xserial=none,usb=CDCgen,xusb=FS,opt=osstd,dbg=none,rtlib=nano",
|
||||
"board": "STMicroelectronics:stm32:GenF1",
|
||||
"board": "STMicroelectronics:stm32:GenF4",
|
||||
"port": "COM17",
|
||||
"output": "bin",
|
||||
"prebuild": "if exist bin rd /s /q bin",
|
||||
"configuration": "clock=25MHz,pnum=MAKET_F401RETX,upload_method=swdMethod,xserial=generic,usb=CDCgen,xusb=FS,opt=osstd,dbg=none,rtlib=nano",
|
||||
"sketch": "IR-protocol.ino"
|
||||
}
|
||||
387
IR-protocol.ino
387
IR-protocol.ino
@ -4,20 +4,24 @@
|
||||
#include "MemoryCheck.h"
|
||||
/////////////// Pinout ///////////////
|
||||
|
||||
#define encForward_PIN PB5
|
||||
#define encBackward_PIN PB4
|
||||
#define dec0_PIN PIN_KT1_IN
|
||||
#define dec1_PIN PIN_KT2_IN
|
||||
#define dec2_PIN PIN_KT3_IN
|
||||
#define dec3_PIN PIN_KT4_IN
|
||||
#define dec4_PIN PIN_KT5_IN
|
||||
#define dec5_PIN PIN_KT6_IN
|
||||
#define dec6_PIN PIN_KT7_IN
|
||||
#define dec7_PIN PIN_KT8_IN
|
||||
// #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 dec1_PIN PA8
|
||||
#define dec2_PIN PB8
|
||||
|
||||
#define LoopOut PB12
|
||||
|
||||
#define ISR_1_Out PB6
|
||||
#define ISR_2_Out PB7
|
||||
|
||||
// #define TestOut 13
|
||||
|
||||
#define SignalDetectLed PB15
|
||||
#define LoopOut PC13
|
||||
|
||||
//////////////// Ini /////////////////
|
||||
|
||||
@ -25,44 +29,70 @@
|
||||
#define SERIAL_SPEED 115200
|
||||
|
||||
//////////////// Var /////////////////
|
||||
// IR_Encoder encForward(PA5, 42 /* , &decBackward */);
|
||||
|
||||
IR_Decoder decForward(dec1_PIN, 555);
|
||||
IR_Decoder decBackward(dec2_PIN, 777);
|
||||
IR_Encoder enc0(PIN_KT8_OUT, 42 /* , &decBackward */);
|
||||
// IR_Encoder enc1(PA1, 127 /* , &decBackward */);
|
||||
// IR_Encoder enc2(PA2, 137 /* , &decBackward */);
|
||||
// IR_Encoder enc3(PA3, 777 /* , &decBackward */);
|
||||
// IR_Encoder enc10(PA4, 555 /* , &decBackward */);
|
||||
// IR_Encoder enc11(PC14, 127 /* , &decBackward */);
|
||||
// IR_Encoder enc12(PC13, 137 /* , &decBackward */);
|
||||
// IR_Encoder enc13(PA12, 777 /* , &decBackward */);
|
||||
|
||||
IR_Encoder encForward(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);
|
||||
IR_Encoder::isr();
|
||||
}
|
||||
|
||||
//-------------------------------------------------------------------
|
||||
|
||||
IR_Decoder dec0(dec0_PIN, 0);
|
||||
void dec_0_ISR() { dec0.isr(); }
|
||||
|
||||
IR_Decoder dec1(dec1_PIN, 1);
|
||||
void dec_1_ISR() { dec1.isr(); }
|
||||
|
||||
IR_Decoder dec2(dec2_PIN, 2);
|
||||
void dec_2_ISR() { dec2.isr(); }
|
||||
|
||||
IR_Decoder dec3(dec3_PIN, 3);
|
||||
void dec_3_ISR() { dec3.isr(); }
|
||||
|
||||
IR_Decoder dec4(dec4_PIN, 4);
|
||||
void dec_4_ISR() { dec4.isr(); }
|
||||
|
||||
IR_Decoder dec5(dec5_PIN, 5);
|
||||
void dec_5_ISR() { dec5.isr(); }
|
||||
|
||||
IR_Decoder dec6(dec6_PIN, 6);
|
||||
void dec_6_ISR() { dec6.isr(); }
|
||||
|
||||
IR_Decoder dec7(dec7_PIN, 7);
|
||||
void dec_7_ISR() { dec7.isr(); }
|
||||
|
||||
// IR_Decoder dec8(dec8_PIN, 8);
|
||||
// void dec_8_ISR() { dec8.isr(); }
|
||||
|
||||
// IR_Decoder dec9(dec9_PIN, 9);
|
||||
// void dec_9_ISR() { dec9.isr(); }
|
||||
|
||||
// IR_Decoder dec10(dec10_PIN, 10);
|
||||
// void dec_10_ISR() { dec10.isr(); }
|
||||
|
||||
// IR_Decoder dec11(dec11_PIN, 11);
|
||||
// void dec_11_ISR() { dec11.isr(); }
|
||||
|
||||
// IR_Decoder dec12(dec12_PIN, 12);
|
||||
// void dec_12_ISR() { dec12.isr(); }
|
||||
|
||||
// IR_Decoder dec13(dec13_PIN, 13);
|
||||
// void dec_13_ISR() { dec13.isr(); }
|
||||
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
uint8_t data0[] = {};
|
||||
uint8_t data1[] = {42};
|
||||
@ -73,147 +103,172 @@ uint8_t data4[] = {42, 127, 137, 255};
|
||||
uint32_t loopTimer;
|
||||
uint8_t sig = 0;
|
||||
uint16_t targetAddr = IR_Broadcast;
|
||||
|
||||
Timer t1(500, millis, []()
|
||||
{
|
||||
// Serial.println( digitalPinToBitMask(enc0.getPin()), BIN);
|
||||
// enc0.sendData(IR_Broadcast, data4, sizeof(data4));
|
||||
// enc1.sendData(IR_Broadcast, data3, sizeof(data3));
|
||||
// enc2.sendData(IR_Broadcast, data2, sizeof(data2));
|
||||
// enc3.sendData(IR_Broadcast, data1, sizeof(data1));
|
||||
// enc10.sendData(IR_Broadcast, data4, sizeof(data4));
|
||||
// enc11.sendData(IR_Broadcast, data3, sizeof(data3));
|
||||
// enc12.sendData(IR_Broadcast, data2, sizeof(data2));
|
||||
// enc13.sendData(IR_Broadcast, data1, sizeof(data1));
|
||||
|
||||
// Serial.println(sig);
|
||||
|
||||
switch (sig)
|
||||
{
|
||||
case 0:
|
||||
encForward.sendData(targetAddr);
|
||||
break;
|
||||
case 1:
|
||||
encForward.sendData(targetAddr, data1, sizeof(data1));
|
||||
break;
|
||||
case 2:
|
||||
encForward.sendData(targetAddr, data2, sizeof(data2));
|
||||
break;
|
||||
case 3:
|
||||
encForward.sendData(targetAddr, data3, sizeof(data3));
|
||||
break;
|
||||
case 4:
|
||||
encForward.sendData(targetAddr, data4, sizeof(data4));
|
||||
break;
|
||||
// switch (sig)
|
||||
// {
|
||||
// case 0:
|
||||
// encForward.sendData(targetAddr);
|
||||
// break;
|
||||
// case 1:
|
||||
// encForward.sendData(targetAddr, data1, sizeof(data1));
|
||||
// break;
|
||||
// case 2:
|
||||
// encForward.sendData(targetAddr, data2, sizeof(data2));
|
||||
// break;
|
||||
// case 3:
|
||||
// encForward.sendData(targetAddr, data3, sizeof(data3));
|
||||
// break;
|
||||
// case 4:
|
||||
// encForward.sendData(targetAddr, data4, sizeof(data4));
|
||||
// break;
|
||||
|
||||
case 10:
|
||||
encForward.sendData(targetAddr, data0, sizeof(data0), true);
|
||||
break;
|
||||
case 11:
|
||||
encForward.sendData(targetAddr, data1, sizeof(data1), true);
|
||||
break;
|
||||
case 12:
|
||||
encForward.sendData(targetAddr, data2, sizeof(data2), true);
|
||||
break;
|
||||
case 13:
|
||||
encForward.sendData(targetAddr, data3, sizeof(data3), true);
|
||||
break;
|
||||
case 14:
|
||||
encForward.sendData(targetAddr, data4, sizeof(data4), true);
|
||||
break;
|
||||
// case 10:
|
||||
// encForward.sendData(targetAddr, data0, sizeof(data0), true);
|
||||
// break;
|
||||
// case 11:
|
||||
// encForward.sendData(targetAddr, data1, sizeof(data1), true);
|
||||
// break;
|
||||
// case 12:
|
||||
// encForward.sendData(targetAddr, data2, sizeof(data2), true);
|
||||
// break;
|
||||
// case 13:
|
||||
// encForward.sendData(targetAddr, data3, sizeof(data3), true);
|
||||
// break;
|
||||
// case 14:
|
||||
// encForward.sendData(targetAddr, data4, sizeof(data4), true);
|
||||
// break;
|
||||
|
||||
case 20:
|
||||
encForward.sendBack();
|
||||
break;
|
||||
case 21:
|
||||
encForward.sendBack(data1, sizeof(data1));
|
||||
break;
|
||||
case 22:
|
||||
encForward.sendBack(data2, sizeof(data2));
|
||||
break;
|
||||
case 23:
|
||||
encForward.sendBack(data3, sizeof(data3));
|
||||
break;
|
||||
case 24:
|
||||
encForward.sendBack(data4, sizeof(data4));
|
||||
break;
|
||||
// case 20:
|
||||
// encForward.sendBack();
|
||||
// break;
|
||||
// case 21:
|
||||
// encForward.sendBack(data1, sizeof(data1));
|
||||
// break;
|
||||
// case 22:
|
||||
// encForward.sendBack(data2, sizeof(data2));
|
||||
// break;
|
||||
// case 23:
|
||||
// encForward.sendBack(data3, sizeof(data3));
|
||||
// break;
|
||||
// case 24:
|
||||
// encForward.sendBack(data4, sizeof(data4));
|
||||
// break;
|
||||
|
||||
case 30:
|
||||
encForward.sendBackTo(targetAddr);
|
||||
break;
|
||||
case 31:
|
||||
encForward.sendBackTo(targetAddr, data1, sizeof(data1));
|
||||
break;
|
||||
case 32:
|
||||
encForward.sendBackTo(targetAddr, data2, sizeof(data2));
|
||||
break;
|
||||
case 33:
|
||||
encForward.sendBackTo(targetAddr, data3, sizeof(data3));
|
||||
break;
|
||||
case 34:
|
||||
encForward.sendBackTo(targetAddr, data4, sizeof(data4));
|
||||
break;
|
||||
// case 30:
|
||||
// encForward.sendBackTo(targetAddr);
|
||||
// break;
|
||||
// case 31:
|
||||
// encForward.sendBackTo(targetAddr, data1, sizeof(data1));
|
||||
// break;
|
||||
// case 32:
|
||||
// encForward.sendBackTo(targetAddr, data2, sizeof(data2));
|
||||
// break;
|
||||
// case 33:
|
||||
// encForward.sendBackTo(targetAddr, data3, sizeof(data3));
|
||||
// break;
|
||||
// case 34:
|
||||
// encForward.sendBackTo(targetAddr, data4, sizeof(data4));
|
||||
// break;
|
||||
|
||||
case 41:
|
||||
encForward.sendRequest(targetAddr);
|
||||
break;
|
||||
case 42:
|
||||
encForward.sendAccept(targetAddr);
|
||||
break;
|
||||
// case 41:
|
||||
// encForward.sendRequest(targetAddr);
|
||||
// break;
|
||||
// case 42:
|
||||
// encForward.sendAccept(targetAddr);
|
||||
// break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
// default:
|
||||
// break;
|
||||
// }
|
||||
// encBackward.sendData(IR_Broadcast, data2);
|
||||
// encTree.sendData(IR_Broadcast, rawData3);
|
||||
});
|
||||
|
||||
// Timer t2(50, millis, []()
|
||||
// { digitalToggle(LED_BUILTIN); });
|
||||
|
||||
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);
|
||||
|
||||
NVIC_SetPriority(IRQn_Type::TIM3_IRQn, 0);
|
||||
IR_Timer.resume();
|
||||
|
||||
Serial.begin(SERIAL_SPEED);
|
||||
Serial.println(F(INFO));
|
||||
|
||||
pinMode(ISR_1_Out,OUTPUT);
|
||||
pinMode(ISR_2_Out,OUTPUT);
|
||||
|
||||
pinMode(LoopOut, OUTPUT);
|
||||
pinMode(SignalDetectLed, OUTPUT);
|
||||
|
||||
// pinMode(dec1_PIN, INPUT_PULLUP);
|
||||
// pinMode(dec2_PIN, INPUT_PULLUP);
|
||||
pinMode(dec0_PIN, INPUT_PULLUP);
|
||||
pinMode(dec1_PIN, INPUT_PULLUP);
|
||||
pinMode(dec2_PIN, INPUT_PULLUP);
|
||||
pinMode(dec3_PIN, INPUT_PULLUP);
|
||||
pinMode(dec4_PIN, INPUT_PULLUP);
|
||||
pinMode(dec5_PIN, INPUT_PULLUP);
|
||||
pinMode(dec6_PIN, INPUT_PULLUP);
|
||||
pinMode(dec7_PIN, INPUT_PULLUP);
|
||||
// pinMode(dec8_PIN, INPUT_PULLUP);
|
||||
// pinMode(dec9_PIN, INPUT_PULLUP);
|
||||
// pinMode(dec10_PIN, INPUT_PULLUP);
|
||||
// pinMode(dec11_PIN, INPUT_PULLUP);
|
||||
// pinMode(dec12_PIN, INPUT_PULLUP);
|
||||
// pinMode(dec13_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
|
||||
attachInterrupt(dec0_PIN, dec_0_ISR, CHANGE);
|
||||
attachInterrupt(dec1_PIN, dec_1_ISR, CHANGE);
|
||||
attachInterrupt(dec2_PIN, dec_2_ISR, CHANGE);
|
||||
attachInterrupt(dec3_PIN, dec_3_ISR, CHANGE);
|
||||
attachInterrupt(dec4_PIN, dec_4_ISR, CHANGE);
|
||||
attachInterrupt(dec5_PIN, dec_5_ISR, CHANGE);
|
||||
attachInterrupt(dec6_PIN, dec_6_ISR, CHANGE);
|
||||
attachInterrupt(dec7_PIN, dec_7_ISR, CHANGE);
|
||||
// attachInterrupt(dec8_PIN, dec_8_ISR, CHANGE);
|
||||
// attachInterrupt(dec9_PIN, dec_9_ISR, CHANGE);
|
||||
// attachInterrupt(dec10_PIN, dec_10_ISR, CHANGE);
|
||||
// attachInterrupt(dec11_PIN, dec_11_ISR, CHANGE);
|
||||
// attachInterrupt(dec12_PIN, dec_12_ISR, CHANGE);
|
||||
// attachInterrupt(dec13_PIN, dec_13_ISR, CHANGE);
|
||||
}
|
||||
|
||||
void loop()
|
||||
{
|
||||
digitalToggle(LoopOut);
|
||||
Timer::tick();
|
||||
IR_Decoder::tick();
|
||||
|
||||
decForward.tick();
|
||||
decBackward.tick();
|
||||
|
||||
status(decForward);
|
||||
// status(decBackward);
|
||||
|
||||
// Serial.println(micros() - loopTimer);
|
||||
// loopTimer = micros();
|
||||
// delayMicroseconds(120*5);
|
||||
bool rx_flag = false;
|
||||
rx_flag |= status(dec0);
|
||||
rx_flag |= status(dec1);
|
||||
rx_flag |= status(dec2);
|
||||
rx_flag |= status(dec3);
|
||||
rx_flag |= status(dec4);
|
||||
rx_flag |= status(dec5);
|
||||
rx_flag |= status(dec6);
|
||||
rx_flag |= status(dec7);
|
||||
// rx_flag |= status(dec8);
|
||||
// rx_flag |= status(dec9);
|
||||
// rx_flag |= status(dec10);
|
||||
// rx_flag |= status(dec11);
|
||||
// rx_flag |= status(dec12);
|
||||
// rx_flag |= status(dec13);
|
||||
|
||||
if (Serial.available())
|
||||
{
|
||||
@ -229,7 +284,6 @@ void loop()
|
||||
case 102:
|
||||
targetAddr = 777;
|
||||
break;
|
||||
|
||||
default:
|
||||
sig = in;
|
||||
break;
|
||||
@ -237,25 +291,43 @@ 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
|
||||
void status(IR_Decoder &dec)
|
||||
bool status(IR_Decoder &dec)
|
||||
{
|
||||
if (dec.gotData.available())
|
||||
{
|
||||
detectSignal();
|
||||
Serial.println(micros());
|
||||
// Serial.println(micros());
|
||||
String str;
|
||||
if (/* dec.gotData.getDataPrt()[1] */ 1)
|
||||
{
|
||||
str += ("Data on pin ");
|
||||
str += (dec.isrPin);
|
||||
str += (dec.getPin());
|
||||
str += "\n";
|
||||
|
||||
uint8_t msg = dec.gotData.getMsgRAW();
|
||||
@ -329,7 +401,7 @@ void status(IR_Decoder &dec)
|
||||
if (/* dec.gotData.getDataPrt()[1] */ 1)
|
||||
{
|
||||
str += ("BackData on pin ");
|
||||
str += (dec.isrPin);
|
||||
str += (dec.getPin());
|
||||
str += "\n";
|
||||
|
||||
uint8_t msg = dec.gotBackData.getMsgRAW();
|
||||
@ -401,7 +473,7 @@ void status(IR_Decoder &dec)
|
||||
if (/* dec.gotData.getDataPrt()[1] */ 1)
|
||||
{
|
||||
str += ("Accept on pin ");
|
||||
str += (dec.isrPin);
|
||||
str += (dec.getPin());
|
||||
str += "\n";
|
||||
|
||||
uint8_t msg = dec.gotAccept.getMsgRAW();
|
||||
@ -453,7 +525,7 @@ void status(IR_Decoder &dec)
|
||||
if (/* dec.gotData.getDataPrt()[1] */ 1)
|
||||
{
|
||||
str += ("Request on pin ");
|
||||
str += (dec.isrPin);
|
||||
str += (dec.getPin());
|
||||
str += "\n";
|
||||
|
||||
uint8_t msg = dec.gotRequest.getMsgRAW();
|
||||
@ -496,4 +568,5 @@ void status(IR_Decoder &dec)
|
||||
// obj->resetAvailable();
|
||||
Serial.write(str.c_str());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
105
IR_Decoder.cpp
Normal file
105
IR_Decoder.cpp
Normal file
@ -0,0 +1,105 @@
|
||||
#include "IR_Decoder.h"
|
||||
|
||||
std::list<IR_Decoder *> &IR_Decoder::get_dec_list() // определение функции
|
||||
{
|
||||
static std::list<IR_Decoder *> dec_list; // статическая локальная переменная
|
||||
return dec_list; // возвращается ссылка на переменную
|
||||
}
|
||||
|
||||
// IR_Decoder::IR_Decoder() {};
|
||||
IR_Decoder::IR_Decoder(const uint8_t pin, uint16_t addr, IR_Encoder *encPair, bool autoHandle)
|
||||
: IR_DecoderRaw(pin, addr, encPair)
|
||||
{
|
||||
get_dec_list().push_back(this);
|
||||
if(autoHandle){
|
||||
enable();
|
||||
}
|
||||
};
|
||||
|
||||
void IR_Decoder::enable()
|
||||
{
|
||||
auto &dec_list = get_dec_list();
|
||||
if (std::find(dec_list.begin(), dec_list.end(), this) == dec_list.end())
|
||||
{
|
||||
dec_list.push_back(this);
|
||||
}
|
||||
pinMode(pin, INPUT_PULLUP);
|
||||
attachInterrupt(pin, (*this)(), CHANGE);
|
||||
}
|
||||
|
||||
void IR_Decoder::disable()
|
||||
{
|
||||
detachInterrupt(pin);
|
||||
pinMode(pin, INPUT);
|
||||
auto &dec_list = get_dec_list();
|
||||
auto it = std::find(dec_list.begin(), dec_list.end(), this);
|
||||
if (it != dec_list.end())
|
||||
{
|
||||
dec_list.erase(it);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
std::function<void()> IR_Decoder::operator()()
|
||||
{
|
||||
return std::bind(&IR_Decoder::isr, this);
|
||||
}
|
||||
|
||||
IR_Decoder::~IR_Decoder()
|
||||
{
|
||||
IR_Decoder::get_dec_list().remove(this);
|
||||
}
|
||||
|
||||
void IR_Decoder::tick()
|
||||
{
|
||||
for (const auto &element : IR_Decoder::get_dec_list())
|
||||
{
|
||||
element->_tick();
|
||||
}
|
||||
}
|
||||
|
||||
void IR_Decoder::_tick()
|
||||
{
|
||||
IR_DecoderRaw::tick();
|
||||
if (availableRaw())
|
||||
{
|
||||
#ifdef IRDEBUG_INFO
|
||||
Serial.println("PARSING RAW DATA");
|
||||
#endif
|
||||
isWaitingAcceptSend = false;
|
||||
switch (packInfo.buffer[0] >> 5 & IR_MASK_MSG_TYPE)
|
||||
{
|
||||
case IR_MSG_DATA_ACCEPT:
|
||||
case IR_MSG_DATA_NOACCEPT:
|
||||
gotData.set(&packInfo, id);
|
||||
break;
|
||||
case IR_MSG_BACK:
|
||||
case IR_MSG_BACK_TO:
|
||||
gotBackData.set(&packInfo, id);
|
||||
break;
|
||||
case IR_MSG_REQUEST:
|
||||
gotRequest.set(&packInfo, id);
|
||||
break;
|
||||
case IR_MSG_ACCEPT:
|
||||
gotAccept.set(&packInfo, id);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
if (gotData.isAvailable && (gotData.getMsgType() == IR_MSG_DATA_ACCEPT))
|
||||
{
|
||||
acceptSendTimer = millis();
|
||||
addrAcceptSendTo = gotData.getAddrFrom();
|
||||
acceptCustomByte = crc8(gotData.getDataPrt(), 0, gotData.getDataSize(), poly1);
|
||||
if (addrAcceptSendTo && addrAcceptSendTo < IR_Broadcast)
|
||||
isWaitingAcceptSend = true;
|
||||
}
|
||||
gotRaw.set(&packInfo, id);
|
||||
}
|
||||
if (isWaitingAcceptSend && millis() - acceptSendTimer > acceptDelay)
|
||||
{
|
||||
encoder->sendAccept(addrAcceptSendTo, acceptCustomByte);
|
||||
isWaitingAcceptSend = false;
|
||||
}
|
||||
}
|
||||
65
IR_Decoder.h
65
IR_Decoder.h
@ -5,11 +5,16 @@
|
||||
|
||||
class IR_Decoder : public IR_DecoderRaw
|
||||
{
|
||||
private:
|
||||
// static std::list<IR_Decoder *> dec_list;
|
||||
static std::list<IR_Decoder*>& get_dec_list();
|
||||
void _tick();
|
||||
|
||||
uint32_t acceptSendTimer;
|
||||
bool isWaitingAcceptSend;
|
||||
uint16_t addrAcceptSendTo;
|
||||
|
||||
uint16_t acceptDelay = 75;
|
||||
uint16_t acceptDelay = IR_ResponseDelay;
|
||||
uint8_t acceptCustomByte;
|
||||
|
||||
public:
|
||||
@ -19,59 +24,23 @@ public:
|
||||
PacketTypes::Request gotRequest;
|
||||
PacketTypes::BasePack gotRaw;
|
||||
|
||||
IR_Decoder(const uint8_t isrPin, uint16_t addr, IR_Encoder *encPair = nullptr) : IR_DecoderRaw(isrPin, addr, encPair) {}
|
||||
// IR_Decoder();
|
||||
IR_Decoder(const uint8_t pin, uint16_t addr = 0, IR_Encoder *encPair = nullptr, bool autoHandle = true);
|
||||
|
||||
void tick()
|
||||
{
|
||||
IR_DecoderRaw::tick();
|
||||
if (availableRaw())
|
||||
{
|
||||
#ifdef IRDEBUG_INFO
|
||||
Serial.println("PARSING RAW DATA");
|
||||
#endif
|
||||
isWaitingAcceptSend = false;
|
||||
switch (packInfo.buffer[0] >> 5 & IR_MASK_MSG_TYPE)
|
||||
{
|
||||
case IR_MSG_DATA_ACCEPT:
|
||||
case IR_MSG_DATA_NOACCEPT:
|
||||
gotData.set(&packInfo, id);
|
||||
break;
|
||||
case IR_MSG_BACK:
|
||||
case IR_MSG_BACK_TO:
|
||||
gotBackData.set(&packInfo, id);
|
||||
break;
|
||||
case IR_MSG_REQUEST:
|
||||
gotRequest.set(&packInfo, id);
|
||||
break;
|
||||
case IR_MSG_ACCEPT:
|
||||
gotAccept.set(&packInfo, id);
|
||||
break;
|
||||
std::function<void()> operator()();
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
if (gotData.isAvailable && (gotData.getMsgType() == IR_MSG_DATA_ACCEPT))
|
||||
{
|
||||
acceptSendTimer = millis();
|
||||
addrAcceptSendTo = gotData.getAddrFrom();
|
||||
acceptCustomByte = crc8(gotData.getDataPrt(), 0, gotData.getDataSize(), poly1);
|
||||
if (addrAcceptSendTo && addrAcceptSendTo < IR_Broadcast)
|
||||
isWaitingAcceptSend = true;
|
||||
}
|
||||
gotRaw.set(&packInfo, id);
|
||||
}
|
||||
if (isWaitingAcceptSend && millis() - acceptSendTimer > 75)
|
||||
{
|
||||
encoder->sendAccept(addrAcceptSendTo, acceptCustomByte);
|
||||
isWaitingAcceptSend = false;
|
||||
}
|
||||
}
|
||||
void enable();
|
||||
void disable();
|
||||
|
||||
void setAcceptDelay(uint16_t acceptDelay)
|
||||
~IR_Decoder();
|
||||
|
||||
static void tick();
|
||||
|
||||
inline void setAcceptDelay(uint16_t acceptDelay)
|
||||
{
|
||||
this->acceptDelay = acceptDelay;
|
||||
}
|
||||
uint16_t getAcceptDelay()
|
||||
inline uint16_t getAcceptDelay()
|
||||
{
|
||||
return this->acceptDelay;
|
||||
}
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
#include "IR_DecoderRaw.h"
|
||||
#include "IR_Encoder.h"
|
||||
|
||||
IR_DecoderRaw::IR_DecoderRaw(const uint8_t isrPin, uint16_t addr, IR_Encoder *encPair) : isrPin(isrPin), encoder(encPair)
|
||||
IR_DecoderRaw::IR_DecoderRaw(const uint8_t pin, uint16_t addr, IR_Encoder *encPair) : encoder(encPair)
|
||||
{
|
||||
setPin(pin);
|
||||
id = addr;
|
||||
prevRise = prevFall = prevPrevFall = prevPrevRise = 0;
|
||||
if (encPair != nullptr)
|
||||
@ -20,18 +21,45 @@ IR_DecoderRaw::IR_DecoderRaw(const uint8_t isrPin, uint16_t addr, IR_Encoder *en
|
||||
#endif
|
||||
}
|
||||
|
||||
bool IR_DecoderRaw::isSubOverflow()
|
||||
{
|
||||
noInterrupts();
|
||||
volatile bool ret = isSubBufferOverflow;
|
||||
interrupts();
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool IR_DecoderRaw::availableRaw()
|
||||
{
|
||||
if (isAvailable)
|
||||
{
|
||||
isAvailable = false;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
//////////////////////////////////// isr ///////////////////////////////////////////
|
||||
volatile uint32_t time_;
|
||||
|
||||
void IR_DecoderRaw::isr()
|
||||
{
|
||||
// Serial.print("ISR\n");
|
||||
if(isPairSending){
|
||||
return;
|
||||
}
|
||||
|
||||
noInterrupts();
|
||||
// time_ = HAL_GetTick() * 1000 + ((SysTick->LOAD + 1 - SysTick->VAL) * 1000) / SysTick->LOAD + 1;
|
||||
time_ = micros();
|
||||
interrupts();
|
||||
if (time_ < oldTime)
|
||||
{
|
||||
#ifdef IRDEBUG
|
||||
|
||||
#ifdef IRDEBUG
|
||||
Serial.print("\n");
|
||||
Serial.print("count: ");
|
||||
Serial.println(wrongCounter++);
|
||||
@ -47,7 +75,7 @@ void IR_DecoderRaw::isr()
|
||||
oldTime = time_;
|
||||
|
||||
FrontStorage edge;
|
||||
edge.dir = digitalRead(isrPin);
|
||||
edge.dir = port->IDR & mask;
|
||||
edge.time = time_;
|
||||
|
||||
subBuffer.push(edge);
|
||||
@ -55,7 +83,6 @@ void IR_DecoderRaw::isr()
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
uint32_t wrCounter;
|
||||
void IR_DecoderRaw::firstRX()
|
||||
{
|
||||
|
||||
@ -77,9 +104,9 @@ void IR_DecoderRaw::firstRX()
|
||||
|
||||
isPreamb = true;
|
||||
riseSyncTime = bitTime /* 1100 */;
|
||||
|
||||
#ifdef IRDEBUG
|
||||
wrCounter = 0;
|
||||
|
||||
#endif
|
||||
memset(dataBuffer, 0x00, dataByteSizeMax);
|
||||
}
|
||||
|
||||
@ -92,6 +119,7 @@ void IR_DecoderRaw::listenStart()
|
||||
firstRX();
|
||||
}
|
||||
}
|
||||
|
||||
void IR_DecoderRaw::tick()
|
||||
{
|
||||
FrontStorage currentFront;
|
||||
@ -539,31 +567,31 @@ void IR_DecoderRaw::writeToBuffer(bool bit)
|
||||
isAvailable = crcCheck(packSize - crcBytes, crcValue);
|
||||
|
||||
#ifdef BRUTEFORCE_CHECK
|
||||
if (!isAvailable) // Исправление первого бита // Очень большая затычка...
|
||||
for (size_t i = 0; i < min(uint16_t(packSize - crcBytes*2U), uint16_t(dataByteSizeMax)); ++i)
|
||||
if (!isAvailable) // Исправление первого бита // Очень большая затычка...
|
||||
for (size_t i = 0; i < min(uint16_t(packSize - crcBytes * 2U), uint16_t(dataByteSizeMax)); ++i)
|
||||
{
|
||||
for (int j = 0; j < 8; ++j)
|
||||
{
|
||||
for (int j = 0; j < 8; ++j)
|
||||
// инвертируем бит
|
||||
dataBuffer[i] ^= 1 << j;
|
||||
|
||||
isAvailable = crcCheck(min(uint16_t(packSize - crcBytes), uint16_t(dataByteSizeMax - 1U)), crcValue);
|
||||
// обратно инвертируем бит в исходное состояние
|
||||
|
||||
if (isAvailable)
|
||||
{
|
||||
#ifdef IRDEBUG_INFO
|
||||
Serial.println("!!!INV!!!");
|
||||
#endif
|
||||
goto OUT_BRUTEFORCE;
|
||||
}
|
||||
else
|
||||
{
|
||||
// инвертируем бит
|
||||
dataBuffer[i] ^= 1 << j;
|
||||
|
||||
isAvailable = crcCheck(min(uint16_t(packSize - crcBytes), uint16_t(dataByteSizeMax - 1U)), crcValue);
|
||||
// обратно инвертируем бит в исходное состояние
|
||||
|
||||
if (isAvailable)
|
||||
{
|
||||
#ifdef IRDEBUG_INFO
|
||||
Serial.println("!!!INV!!!");
|
||||
#endif
|
||||
goto OUT_BRUTEFORCE;
|
||||
}
|
||||
else
|
||||
{
|
||||
dataBuffer[i] ^= 1 << j;
|
||||
}
|
||||
}
|
||||
}
|
||||
OUT_BRUTEFORCE:;
|
||||
}
|
||||
OUT_BRUTEFORCE:;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@ -14,8 +14,6 @@
|
||||
#define up PA3
|
||||
#define down PA2
|
||||
#endif
|
||||
#define up PA3
|
||||
#define down PA2
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@ -25,6 +23,7 @@
|
||||
#define riseTimeMin (riseTime - riseTolerance)
|
||||
#define aroundRise(t) (riseTimeMin < t && t < riseTimeMax)
|
||||
#define IR_timeout (riseTimeMax * (8 + syncBits + 1)) // us // таймаут в 8 data + 3 sync + 1
|
||||
constexpr uint16_t IR_ResponseDelay = ((uint16_t)(((bitTime+riseTolerance) * (8 + syncBits + 1))*2.7735))/1000;
|
||||
|
||||
class IR_Encoder;
|
||||
class IR_DecoderRaw : virtual public IR_FOX
|
||||
@ -34,43 +33,22 @@ class IR_DecoderRaw : virtual public IR_FOX
|
||||
protected:
|
||||
PackInfo packInfo;
|
||||
IR_Encoder *encoder; // Указатель на парный передатчик
|
||||
bool availableRaw()
|
||||
{
|
||||
if (isAvailable)
|
||||
{
|
||||
isAvailable = false;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
};
|
||||
bool availableRaw();
|
||||
|
||||
public:
|
||||
const uint8_t isrPin; // Пин прерывания
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
/// @brief Конструктор
|
||||
/// @param isrPin Номер вывода прерывания/данных от приёмника (2 или 3 для atmega 328p)
|
||||
/// @param pin Номер вывода прерывания/данных от приёмника (2 или 3 для atmega 328p)
|
||||
/// @param addr Адрес приёмника
|
||||
/// @param encPair Указатель на передатчик, работающий в паре
|
||||
IR_DecoderRaw(const uint8_t isrPin, uint16_t addr, IR_Encoder *encPair = nullptr);
|
||||
IR_DecoderRaw(const uint8_t pin, uint16_t addr, IR_Encoder *encPair = nullptr);
|
||||
|
||||
void isr(); // Функция прерывания
|
||||
void tick(); // Обработка приёмника, необходима для работы
|
||||
void tickOld();
|
||||
|
||||
bool isOverflow() { return isBufferOverflow; }; // Буффер переполнился
|
||||
bool isSubOverflow()
|
||||
{
|
||||
|
||||
// noInterrupts();
|
||||
volatile bool ret = isSubBufferOverflow;
|
||||
// interrupts();
|
||||
return ret;
|
||||
};
|
||||
bool isReciving() { return isBufferOverflow; }; // Возвращает true, если происходит приём пакета
|
||||
inline bool isOverflow() { return isBufferOverflow; }; // Буффер переполнился
|
||||
bool isSubOverflow();
|
||||
inline bool isReciving() { return isBufferOverflow; }; // Возвращает true, если происходит приём пакета
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
private:
|
||||
@ -150,8 +128,9 @@ private:
|
||||
/// @return Результат
|
||||
uint16_t ceil_div(uint16_t val, uint16_t divider);
|
||||
|
||||
#if true //def IRDEBUG
|
||||
#ifdef IRDEBUG
|
||||
uint32_t wrCounter;
|
||||
inline void errPulse(uint8_t pin, uint8_t count);
|
||||
inline void infoPulse(uint8_t pin, uint8_t count);
|
||||
#endif
|
||||
};
|
||||
};
|
||||
|
||||
142
IR_Encoder.cpp
142
IR_Encoder.cpp
@ -5,8 +5,15 @@
|
||||
#define ISR_Out 10
|
||||
#define TestOut 13
|
||||
|
||||
IR_Encoder::IR_Encoder(uint16_t addr, IR_DecoderRaw *decPair)
|
||||
std::list<IR_Encoder *> &IR_Encoder::get_enc_list() // определение функции
|
||||
{
|
||||
static std::list<IR_Encoder *> dec_list; // статическая локальная переменная
|
||||
return dec_list; // возвращается ссылка на переменную
|
||||
}
|
||||
|
||||
IR_Encoder::IR_Encoder(uint8_t pin, uint16_t addr, IR_DecoderRaw *decPair, bool autoHandle)
|
||||
{
|
||||
setPin(pin);
|
||||
id = addr;
|
||||
this->decPair = decPair;
|
||||
signal = noSignal;
|
||||
@ -14,8 +21,7 @@ IR_Encoder::IR_Encoder(uint16_t addr, IR_DecoderRaw *decPair)
|
||||
#if disablePairDec
|
||||
if (decPair != nullptr)
|
||||
{
|
||||
blindDecoders = new IR_DecoderRaw *[1]
|
||||
{ decPair };
|
||||
blindDecoders = new IR_DecoderRaw *[1]{decPair};
|
||||
decodersCount = 1;
|
||||
}
|
||||
#endif
|
||||
@ -23,7 +29,51 @@ IR_Encoder::IR_Encoder(uint16_t addr, IR_DecoderRaw *decPair)
|
||||
{
|
||||
decPair->encoder = this;
|
||||
}
|
||||
|
||||
if (autoHandle)
|
||||
{
|
||||
get_enc_list().push_back(this);
|
||||
}
|
||||
};
|
||||
|
||||
HardwareTimer IR_Encoder::IR_Timer;
|
||||
|
||||
inline HardwareTimer* IR_Encoder::get_IR_Timer(){return &IR_Encoder::IR_Timer;}
|
||||
// void Encoder_ISR(){
|
||||
// IR_Encoder::isr();
|
||||
// }
|
||||
void IR_Encoder::begin(HardwareTimer timer, uint8_t channel, IRQn_Type IRQn){
|
||||
//TODO: check std::bind isr func
|
||||
// IR_Timer = timer;
|
||||
// IR_Timer.setOverflow(carrierFrec * 2, HERTZ_FORMAT);
|
||||
// IR_Timer.attachInterrupt(channel, Encoder_ISR);
|
||||
// NVIC_SetPriority(IRQn, 0);
|
||||
// IR_Timer.resume();
|
||||
}
|
||||
|
||||
|
||||
void IR_Encoder::enable()
|
||||
{
|
||||
auto &enc_list = get_enc_list();
|
||||
if (std::find(enc_list.begin(), enc_list.end(), this) == enc_list.end())
|
||||
{
|
||||
enc_list.push_back(this);
|
||||
}
|
||||
pinMode(pin, OUTPUT);
|
||||
|
||||
}
|
||||
|
||||
void IR_Encoder::disable()
|
||||
{
|
||||
auto &enc_list = get_enc_list();
|
||||
auto it = std::find(enc_list.begin(), enc_list.end(), this);
|
||||
if (it != enc_list.end())
|
||||
{
|
||||
enc_list.erase(it);
|
||||
}
|
||||
pinMode(pin, INPUT);
|
||||
}
|
||||
|
||||
void IR_Encoder::setBlindDecoders(IR_DecoderRaw *decoders[], uint8_t count)
|
||||
{
|
||||
#if disablePairDec
|
||||
@ -36,19 +86,19 @@ void IR_Encoder::setBlindDecoders(IR_DecoderRaw *decoders[], uint8_t count)
|
||||
|
||||
IR_Encoder::~IR_Encoder()
|
||||
{
|
||||
delete[] bitLow;
|
||||
delete[] bitHigh;
|
||||
get_enc_list().remove(this);
|
||||
};
|
||||
|
||||
void IR_Encoder::sendData(uint16_t addrTo, uint8_t dataByte, bool needAccept)
|
||||
{
|
||||
uint8_t *dataPtr = new uint8_t[1];
|
||||
dataPtr[0] = dataByte;
|
||||
sendData(addrTo, dataPtr, 1, needAccept);
|
||||
delete[] dataPtr;
|
||||
sendData(addrTo, &dataByte, 1, needAccept);
|
||||
}
|
||||
|
||||
void IR_Encoder::sendData(uint16_t addrTo, uint8_t *data, uint8_t len, bool needAccept)
|
||||
void IR_Encoder::sendData(uint16_t addrTo, uint8_t *data, uint8_t len, bool needAccept){
|
||||
sendDataFULL(id, addrTo, data, len, needAccept);
|
||||
}
|
||||
|
||||
void IR_Encoder::sendDataFULL(uint16_t addrFrom, uint16_t addrTo, uint8_t *data, uint8_t len, bool needAccept)
|
||||
{
|
||||
if (len > bytePerPack)
|
||||
{
|
||||
@ -65,8 +115,8 @@ void IR_Encoder::sendData(uint16_t addrTo, uint8_t *data, uint8_t len, bool need
|
||||
sendBuffer[0] = msgType;
|
||||
|
||||
// addr_self
|
||||
sendBuffer[1] = id >> 8 & 0xFF;
|
||||
sendBuffer[2] = id & 0xFF;
|
||||
sendBuffer[1] = addrFrom >> 8 & 0xFF;
|
||||
sendBuffer[2] = addrFrom & 0xFF;
|
||||
|
||||
// addr_to
|
||||
sendBuffer[3] = addrTo >> 8 & 0xFF;
|
||||
@ -141,7 +191,8 @@ void IR_Encoder::sendBack(uint8_t data)
|
||||
{
|
||||
_sendBack(false, 0, &data, 1);
|
||||
}
|
||||
void IR_Encoder::sendBack(uint8_t *data , uint8_t len)
|
||||
|
||||
void IR_Encoder::sendBack(uint8_t *data, uint8_t len)
|
||||
{
|
||||
_sendBack(false, 0, data, len);
|
||||
}
|
||||
@ -196,6 +247,10 @@ void IR_Encoder::setDecoder_isSending()
|
||||
for (uint8_t i = 0; i < decodersCount; i++)
|
||||
{
|
||||
blindDecoders[i]->isPairSending ^= id;
|
||||
// Serial.print("setDecoder_isSending() id = ");
|
||||
// Serial.print(id);
|
||||
// Serial.print(" isPairSending = ");
|
||||
// Serial.println(blindDecoders[i]->isPairSending);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -207,7 +262,7 @@ void IR_Encoder::rawSend(uint8_t *ptr, uint8_t len)
|
||||
// TODO: Обработка повторной отправки
|
||||
return;
|
||||
}
|
||||
|
||||
// Serial.println("START");
|
||||
setDecoder_isSending();
|
||||
|
||||
// noInterrupts();
|
||||
@ -231,12 +286,24 @@ void IR_Encoder::rawSend(uint8_t *ptr, uint8_t len)
|
||||
}
|
||||
|
||||
void IR_Encoder::isr()
|
||||
{
|
||||
// Serial.println(get_enc_list().size());
|
||||
for (const auto &element : get_enc_list())
|
||||
{
|
||||
element->_isr();
|
||||
}
|
||||
}
|
||||
|
||||
void IR_Encoder::_isr()
|
||||
{
|
||||
if (!isSending)
|
||||
return;
|
||||
|
||||
ir_out_virtual = !ir_out_virtual && state;
|
||||
|
||||
port->ODR &= ~(mask);
|
||||
port->ODR |= mask & (ir_out_virtual ? (uint16_t)0xFFFF : (uint16_t)0x0000);
|
||||
|
||||
if (toggleCounter)
|
||||
{
|
||||
toggleCounter--;
|
||||
@ -251,7 +318,9 @@ void IR_Encoder::isr()
|
||||
// сброс счетчиков
|
||||
// ...
|
||||
isSending = false;
|
||||
Serial.println("STOP");
|
||||
setDecoder_isSending();
|
||||
Serial.println();
|
||||
return;
|
||||
break;
|
||||
|
||||
@ -369,37 +438,16 @@ void IR_Encoder::addSync(bool *prev, bool *next)
|
||||
}
|
||||
}
|
||||
|
||||
void IR_Encoder::send_HIGH(bool prevBite)
|
||||
{
|
||||
uint8_t IR_Encoder::bitHigh[2] = {
|
||||
(bitPauseTakts) * 2 - 1,
|
||||
(bitActiveTakts) * 2 - 1};
|
||||
uint8_t IR_Encoder::bitLow[2] = {
|
||||
(bitPauseTakts / 2 + bitActiveTakts) * 2 - 1,
|
||||
(bitPauseTakts)-1};
|
||||
|
||||
// if (/* prevBite */1) {
|
||||
// meanderBlock(bitPauseTakts * 2, halfPeriod, LOW);
|
||||
// meanderBlock(bitActiveTakts, halfPeriod, HIGH);
|
||||
// } else { // более короткий HIGH после нуля
|
||||
// meanderBlock(bitTakts - (bitActiveTakts - bitPauseTakts), halfPeriod, LOW);
|
||||
// meanderBlock(bitActiveTakts - bitPauseTakts, halfPeriod, HIGH);
|
||||
// }
|
||||
}
|
||||
|
||||
void IR_Encoder::send_LOW()
|
||||
{
|
||||
// meanderBlock(bitPauseTakts, halfPeriod, LOW);
|
||||
// meanderBlock(bitActiveTakts, halfPeriod, LOW);
|
||||
// meanderBlock(bitPauseTakts, halfPeriod, HIGH);
|
||||
}
|
||||
|
||||
void IR_Encoder::send_EMPTY(uint8_t count)
|
||||
{
|
||||
// for (size_t i = 0; i < count * 2; i++) {
|
||||
// meanderBlock((bitPauseTakts * 2 + bitActiveTakts), halfPeriod, prevPreambBit);
|
||||
// prevPreambBit = !prevPreambBit;
|
||||
// }
|
||||
// meanderBlock(bitPauseTakts * 2 + bitActiveTakts, halfPeriod, 0); //TODO: Отодвинуть преамбулу
|
||||
}
|
||||
|
||||
uint8_t* IR_Encoder::bitHigh = new uint8_t[2]{
|
||||
(bitPauseTakts) * 2 - 1,
|
||||
(bitActiveTakts) * 2 - 1};
|
||||
uint8_t* IR_Encoder::bitLow = new uint8_t[2]{
|
||||
(bitPauseTakts/2 + bitActiveTakts) * 2 - 1,
|
||||
(bitPauseTakts) - 1};
|
||||
// uint8_t* IR_Encoder::bitHigh = new uint8_t[2]{
|
||||
// (bitPauseTakts) * 2 - 0,
|
||||
// (bitActiveTakts) * 2 - 0};
|
||||
// uint8_t* IR_Encoder::bitLow = new uint8_t[2]{
|
||||
// (bitPauseTakts/2 + bitActiveTakts) * 2 - 0,
|
||||
// (bitPauseTakts) - 0};
|
||||
|
||||
48
IR_Encoder.h
48
IR_Encoder.h
@ -4,53 +4,34 @@
|
||||
// TODO: Отложенная передача после завершения приема
|
||||
|
||||
class IR_DecoderRaw;
|
||||
class IR_Encoder : IR_FOX
|
||||
class IR_Encoder : public IR_FOX
|
||||
{
|
||||
friend IR_DecoderRaw;
|
||||
|
||||
public:
|
||||
static HardwareTimer IR_Timer;
|
||||
private:
|
||||
uint16_t id; /// @brief Адрес передатчика
|
||||
|
||||
// uint16_t id; /// @brief Адрес передатчика
|
||||
public:
|
||||
/// @brief Класс передатчика
|
||||
/// @param addr Адрес передатчика
|
||||
/// @param pin Вывод передатчика
|
||||
/// @param tune Подстройка несущей частоты
|
||||
/// @param decPair Приёмник, для которого отключается приём в момент передачи передатчиком
|
||||
IR_Encoder(uint16_t addr, IR_DecoderRaw *decPair = nullptr);
|
||||
IR_Encoder(uint8_t pin, uint16_t addr = 0, IR_DecoderRaw *decPair = nullptr, bool autoHandle = true);
|
||||
static void isr();
|
||||
static void begin(HardwareTimer IR_Timer, uint8_t channel, IRQn_Type IRQn);
|
||||
static HardwareTimer* get_IR_Timer();
|
||||
|
||||
// static void timerSetup()
|
||||
// {
|
||||
// // // TIMER2 Ini
|
||||
// // uint8_t oldSREG = SREG; // Save global interupts settings
|
||||
// // cli();
|
||||
// // // DDRB |= (1 << PORTB3); //OC2A (17)
|
||||
// // TCCR2A = 0;
|
||||
// // TCCR2B = 0;
|
||||
|
||||
// // // TCCR2A |= (1 << COM2A0); //Переключение состояния
|
||||
|
||||
// // TCCR2A |= (1 << WGM21); // Clear Timer On Compare (Сброс по совпадению)
|
||||
// // TCCR2B |= (1 << CS20); // Предделитель 1
|
||||
// // TIMSK2 |= (1 << OCIE2A); // Прерывание по совпадению
|
||||
|
||||
// // OCR2A = /* 465 */ ((F_CPU / (38000 * 2)) - 2); // 38кГц
|
||||
|
||||
// // SREG = oldSREG; // Return interrupt settings
|
||||
|
||||
|
||||
// }
|
||||
// static void timerOFFSetup()
|
||||
// {
|
||||
// TIMSK2 &= ~(1 << OCIE2A); // Прерывание по совпадению выкл
|
||||
// }
|
||||
void enable();
|
||||
void disable();
|
||||
|
||||
void setBlindDecoders(IR_DecoderRaw *decoders[], uint8_t count);
|
||||
void rawSend(uint8_t *ptr, uint8_t len);
|
||||
|
||||
void sendData(uint16_t addrTo, uint8_t dataByte, bool needAccept = false);
|
||||
void sendData(uint16_t addrTo, uint8_t *data = nullptr, uint8_t len = 0, bool needAccept = false);
|
||||
void sendDataFULL(uint16_t addrFrom, uint16_t addrTo, uint8_t *data = nullptr, uint8_t len = 0, bool needAccept = false);
|
||||
|
||||
|
||||
void sendAccept(uint16_t addrTo, uint8_t customByte = 0);
|
||||
void sendRequest(uint16_t addrTo);
|
||||
@ -59,13 +40,14 @@ public:
|
||||
void sendBack(uint8_t *data = nullptr, uint8_t len = 0);
|
||||
void sendBackTo(uint16_t addrTo, uint8_t *data = nullptr, uint8_t len = 0);
|
||||
|
||||
void isr();
|
||||
|
||||
~IR_Encoder();
|
||||
volatile bool ir_out_virtual;
|
||||
|
||||
private:
|
||||
static std::list<IR_Encoder*>& get_enc_list();
|
||||
void _sendBack(bool isAdressed, uint16_t addrTo, uint8_t *data, uint8_t len);
|
||||
void _isr();
|
||||
|
||||
void setDecoder_isSending();
|
||||
void sendByte(uint8_t byte, bool *prev, bool LOW_FIRST);
|
||||
@ -107,8 +89,8 @@ private:
|
||||
uint8_t low;
|
||||
uint8_t high;
|
||||
};
|
||||
static uint8_t *bitHigh;
|
||||
static uint8_t *bitLow;
|
||||
static uint8_t bitHigh[2];
|
||||
static uint8_t bitLow[2];
|
||||
uint8_t *currentBitSequence = bitLow;
|
||||
volatile SignalPart signal;
|
||||
};
|
||||
|
||||
33
IR_config.cpp
Normal file
33
IR_config.cpp
Normal file
@ -0,0 +1,33 @@
|
||||
#include "IR_config.h"
|
||||
|
||||
void IR_FOX::setPin(uint8_t pin){
|
||||
this->pin = pin;
|
||||
port = digitalPinToPort(pin);
|
||||
mask = digitalPinToBitMask(pin);
|
||||
}
|
||||
|
||||
void IR_FOX::checkAddressRuleApply(uint16_t address, uint16_t id, bool &flag)
|
||||
{
|
||||
flag = false;
|
||||
flag |= id == 0;
|
||||
flag |= address == id;
|
||||
flag |= address >= IR_Broadcast;
|
||||
}
|
||||
|
||||
uint8_t IR_FOX::crc8(uint8_t *data, uint8_t start, uint8_t end, uint8_t poly)
|
||||
{ // TODO: сделать возможность межбайтовой проверки
|
||||
uint8_t crc = 0xff;
|
||||
size_t i, j;
|
||||
for (i = start; i < end; i++)
|
||||
{
|
||||
crc ^= data[i];
|
||||
for (j = 0; j < 8; j++)
|
||||
{
|
||||
if ((crc & 0x80) != 0)
|
||||
crc = (uint8_t)((crc << 1) ^ poly);
|
||||
else
|
||||
crc <<= 1;
|
||||
}
|
||||
}
|
||||
return crc;
|
||||
};
|
||||
225
IR_config.h
225
IR_config.h
@ -1,25 +1,39 @@
|
||||
#pragma once
|
||||
#include <Arduino.h>
|
||||
|
||||
#define IRDEBUG_INFO
|
||||
#include <list>
|
||||
// #define IRDEBUG_INFO
|
||||
/*//////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
Для работы в паре положить декодер в энкодер
|
||||
|
||||
*/// Адресация с 1 до 65 499
|
||||
#define IR_Broadcast 65000 // 65 500 ~ 65 535 - широковещательные пакеты (всем), возможно разделить на 35 типов
|
||||
*/
|
||||
// Адресация с 1 до 65 499
|
||||
#define IR_Broadcast 65000 // 65 500 ~ 65 535 - широковещательные пакеты (всем)
|
||||
/*
|
||||
Адрес 0 запрещен и зарезервирован под NULL, либо тесты
|
||||
IR_MSG_ACCEPT с адреса 0 воспринимается всеми устройствами
|
||||
*Адресное пространство:
|
||||
Адрес 0 запрещен и зарезервирован под NULL, либо тесты
|
||||
IR_MSG_ACCEPT с адреса 0 воспринимается всеми устройствами
|
||||
*/
|
||||
//**** Контрольные точки ******
|
||||
#define IR_MAX_ADDR_CPU 64999
|
||||
#define IR_MIN_ADDR_CPU 32000
|
||||
|
||||
// //***** Группы машинок ********
|
||||
// #define IR_MAX_CAR_GROUP 31999
|
||||
// #define IR_MIN_CAR_GROUP 30000
|
||||
|
||||
Адресное пространство:
|
||||
|
||||
Излучатели контрольных точек: 1000 ~ 1999
|
||||
Излучатели без обратной связиЖ 2000 ~ 2999
|
||||
Излучатели светофоров: 3000 ~ 3999
|
||||
// //********** FREE *************
|
||||
// #define IR_MAX_FREE 31999
|
||||
// #define IR_MIN_FREE 2000
|
||||
|
||||
//********* Машинки ***********
|
||||
#define IR_MAX_CAR 31999
|
||||
#define IR_MIN_CAR 100
|
||||
|
||||
//***** Пульты управления *****
|
||||
#define IR_MAX_CONTROLLER 99
|
||||
#define IR_MIN_CONTROLLER 0
|
||||
/*
|
||||
|
||||
/```````````````````````````````````````````````` data pack `````````````````````````````````````````````\
|
||||
|
||||
@ -40,59 +54,59 @@ msg type:
|
||||
// | xxx..... | = тип сообщения
|
||||
// | ...xxxxx | = длина (максимум 31 бита)
|
||||
// ---------- */
|
||||
#define IR_MSG_BACK 0U // | 000...... | = Задний сигнал машинки
|
||||
#define IR_MSG_ACCEPT 1U // | 001..... | = подтверждение
|
||||
#define IR_MSG_REQUEST 2U // | 010..... | = запрос
|
||||
#define IR_MSG_ 3U // | 011..... | = ??
|
||||
#define IR_MSG_BACK_TO 4U // | 100..... | = Задний сигнал машинки c адресацией
|
||||
#define IR_MSG_ 5U // | 101..... | = ??
|
||||
#define IR_MSG_DATA_NOACCEPT 6U // | 110..... | = данные, не требующие подтверждения
|
||||
#define IR_MSG_DATA_ACCEPT 7U // | 111..... | = данные требующие подтверждения
|
||||
;/* // ----------
|
||||
|
||||
/``````````````````````````````` подтверждение `````````````````````````````\ /``````````````````````````````````````` запрос ``````````````````````````````````\
|
||||
|
||||
{``````````} [````````````````````````] [``````````````````] [``````````````] {``````````} [````````````````````````] [````````````````````````] [``````````````]
|
||||
{ msg type } [ addr_from uint16_t ] [=== customByte ===] [ CRC Bytes ] { msg type } [ addr_from uint16_t ] [ addr_to uint16_t ] [ CRC Bytes ]
|
||||
{..........} [........................] [..................] [..............] {..........} [........................] [........................] [..............]
|
||||
|
||||
{ 001..... } [addr_from_H][addr_from_L] [=== customByte ===] [ crc1 ][ crc2 ] { 010..... } [addr_from_H][addr_from_L] [addr_from_H][addr_from_L] [ crc1 ][ crc2 ]
|
||||
| 0 1 2 3 4 5 | 0 1 2 3 4 5 6
|
||||
\________________________________________________________________/ | \_____________________________________________________________________/ |
|
||||
| | | |
|
||||
\________________________________________________________________________/ \_____________________________________________________________________________/
|
||||
|
||||
customByte - контрольная сумма принятых данных по poly1
|
||||
|
||||
|
||||
|
||||
/`````````````````````` Задний сигнал машинки без адресации ``````````````````````\
|
||||
|
||||
{``````````} [````````````````````````] [````````````````````````] [``````````````]
|
||||
{ msg type } [ addr_from uint16_t ] [====== data bytes ======] [ CRC Bytes ]
|
||||
{..........} [........................] [........................] [..............]
|
||||
|
||||
{ 0000xxxx } [addr_from_H][addr_from_L] [data_H][data_n..][data_L] [ crc1 ][ crc2 ]
|
||||
| 0 1 2 3 | |
|
||||
\_____________________________________________________________________/ |
|
||||
| |
|
||||
\_____________________________________________________________________________/
|
||||
|
||||
|
||||
|
||||
/```````````````````````````````````` Задний сигнал машинки с адресацией ````````````````````````````````````\
|
||||
|
||||
{``````````} [````````````````````````] [````````````````````````] [````````````````````````] [``````````````]
|
||||
{ msg type } [ addr_from uint16_t ] [ addr_to uint16_t ] [====== data bytes ======] [ CRC Bytes ]
|
||||
{..........} [........................] [........................] [........................] [..............]
|
||||
|
||||
{ 0001xxxx } [addr_from_H][addr_from_L] [addr_from_H][addr_from_L] [data_H][data_n..][data_L] [ crc1 ][ crc2 ]
|
||||
| 0 1 2 3 4 5 | |
|
||||
\________________________________________________________________________________________________/ |
|
||||
| |
|
||||
\________________________________________________________________________________________________________/
|
||||
|
||||
*/
|
||||
#define IR_MSG_BACK 0U // | 000...... | = Задний сигнал машинки
|
||||
#define IR_MSG_ACCEPT 1U // | 001..... | = подтверждение
|
||||
#define IR_MSG_REQUEST 2U // | 010..... | = запрос
|
||||
// #define IR_MSG_ 3U // | 011..... | = ??
|
||||
#define IR_MSG_BACK_TO 4U // | 100..... | = Задний сигнал машинки c адресацией
|
||||
// #define IR_MSG_ 5U // | 101..... | = ??
|
||||
#define IR_MSG_DATA_NOACCEPT 6U // | 110..... | = данные, не требующие подтверждения
|
||||
#define IR_MSG_DATA_ACCEPT 7U // | 111..... | = данные требующие подтверждения
|
||||
; /* // ----------
|
||||
|
||||
/``````````````````````````````` подтверждение `````````````````````````````\ /``````````````````````````````````````` запрос ``````````````````````````````````\
|
||||
|
||||
{``````````} [````````````````````````] [``````````````````] [``````````````] {``````````} [````````````````````````] [````````````````````````] [``````````````]
|
||||
{ msg type } [ addr_from uint16_t ] [=== customByte ===] [ CRC Bytes ] { msg type } [ addr_from uint16_t ] [ addr_to uint16_t ] [ CRC Bytes ]
|
||||
{..........} [........................] [..................] [..............] {..........} [........................] [........................] [..............]
|
||||
|
||||
{ 001..... } [addr_from_H][addr_from_L] [=== customByte ===] [ crc1 ][ crc2 ] { 010..... } [addr_from_H][addr_from_L] [addr_from_H][addr_from_L] [ crc1 ][ crc2 ]
|
||||
| 0 1 2 3 4 5 | 0 1 2 3 4 5 6
|
||||
\________________________________________________________________/ | \_____________________________________________________________________/ |
|
||||
| | | |
|
||||
\________________________________________________________________________/ \_____________________________________________________________________________/
|
||||
|
||||
customByte - контрольная сумма принятых данных по poly1
|
||||
|
||||
|
||||
|
||||
/`````````````````````` Задний сигнал машинки без адресации ``````````````````````\
|
||||
|
||||
{``````````} [````````````````````````] [````````````````````````] [``````````````]
|
||||
{ msg type } [ addr_from uint16_t ] [====== data bytes ======] [ CRC Bytes ]
|
||||
{..........} [........................] [........................] [..............]
|
||||
|
||||
{ 0000xxxx } [addr_from_H][addr_from_L] [data_H][data_n..][data_L] [ crc1 ][ crc2 ]
|
||||
| 0 1 2 3 | |
|
||||
\_____________________________________________________________________/ |
|
||||
| |
|
||||
\_____________________________________________________________________________/
|
||||
|
||||
|
||||
|
||||
/```````````````````````````````````` Задний сигнал машинки с адресацией ````````````````````````````````````\
|
||||
|
||||
{``````````} [````````````````````````] [````````````````````````] [````````````````````````] [``````````````]
|
||||
{ msg type } [ addr_from uint16_t ] [ addr_to uint16_t ] [====== data bytes ======] [ CRC Bytes ]
|
||||
{..........} [........................] [........................] [........................] [..............]
|
||||
|
||||
{ 0001xxxx } [addr_from_H][addr_from_L] [addr_from_H][addr_from_L] [data_H][data_n..][data_L] [ crc1 ][ crc2 ]
|
||||
| 0 1 2 3 4 5 | |
|
||||
\________________________________________________________________________________________________/ |
|
||||
| |
|
||||
\________________________________________________________________________________________________________/
|
||||
|
||||
*/
|
||||
|
||||
#define IR_MASK_MSG_TYPE 0b00000111
|
||||
#define IR_MASK_MSG_INFO 0b00011111
|
||||
@ -101,14 +115,14 @@ customByte - контрольная сумма принятых данных п
|
||||
/////////////////////////////////////////////////////////////////////////////////////*/
|
||||
typedef uint16_t crc_t;
|
||||
|
||||
#define BRUTEFORCE_CHECK // Перепроверяет пакет на 1 битные ошибки //TODO: зависает
|
||||
#define bytePerPack 16 // колличество байтов в пакете
|
||||
// #define BRUTEFORCE_CHECK // Перепроверяет пакет на 1 битные ошибки //TODO: зависает
|
||||
#define bytePerPack 16 // колличество байтов в пакете
|
||||
#ifndef freeFrec
|
||||
#define freeFrec false
|
||||
#endif
|
||||
|
||||
#ifndef subBufferSize
|
||||
#define subBufferSize 5 //Буфер для складирования фронтов, пока их не обработают (передатчик)
|
||||
#define subBufferSize 50 // Буфер для складирования фронтов, пока их не обработают (передатчик)
|
||||
#endif
|
||||
|
||||
#define preambPulse 3
|
||||
@ -117,32 +131,40 @@ typedef uint16_t crc_t;
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#define bitPerByte 8U // Колличество бит в байте
|
||||
#define bitPerByte 8U // Колличество бит в байте
|
||||
#define addrBytes 2
|
||||
#define msgBytes 1
|
||||
#define crcBytes 2
|
||||
#define poly1 0x31
|
||||
#define poly2 0x8C
|
||||
#define syncBits 3U // количество битов синхронизации
|
||||
#define syncBits 3U // количество битов синхронизации
|
||||
|
||||
#define dataByteSizeMax (msgBytes + addrBytes + addrBytes + bytePerPack + crcBytes)
|
||||
|
||||
#define preambFronts (preambPulse*2) // количество фронтов преамбулы (Приём)
|
||||
#define preambFronts (preambPulse * 2) // количество фронтов преамбулы (Приём)
|
||||
#define preambToggle ((bitPauseTakts * 2 + bitActiveTakts) * 2 - 1) // колличество переключений преамбулы (Передача)
|
||||
|
||||
#define carrierFrec 38000U // частота несущей (Приём/Передача)
|
||||
#define carrierPeriod (1000000U/carrierFrec) // период несущей в us (Приём)
|
||||
#define carrierFrec 38000U // частота несущей (Приём/Передача)
|
||||
#define carrierPeriod (1000000U / carrierFrec) // период несущей в us (Приём)
|
||||
|
||||
// В процессе работы значения будут отклонятся в соответствии с предыдущим битом
|
||||
#define bitActiveTakts 25U // длительность высокого уровня в тактах
|
||||
#define bitPauseTakts 12U // длительность низкого уровня в тактах
|
||||
#define bitActiveTakts 25U // длительность высокого уровня в тактах
|
||||
#define bitPauseTakts 12U // длительность низкого уровня в тактах
|
||||
|
||||
#define bitTakts (bitActiveTakts+bitPauseTakts) // Общая длительность бита в тактах
|
||||
#define bitTime (bitTakts*carrierPeriod) // Общая длительность бита
|
||||
#define bitTakts (bitActiveTakts + bitPauseTakts) // Общая длительность бита в тактах
|
||||
#define bitTime (bitTakts * carrierPeriod) // Общая длительность бита
|
||||
#define tolerance 300U
|
||||
class IR_FOX {
|
||||
|
||||
constexpr uint16_t test_all_Time = bitTime;
|
||||
constexpr uint16_t test_all_Takts = bitTakts * 2;
|
||||
constexpr uint16_t test_hi = ((bitPauseTakts) * 2 - 0) + ((bitActiveTakts) * 2 - 0);
|
||||
constexpr uint16_t test_low = ((bitPauseTakts / 2 + bitActiveTakts) * 2 - 0) + ((bitPauseTakts)-0);
|
||||
|
||||
class IR_FOX
|
||||
{
|
||||
public:
|
||||
struct PackOffsets {
|
||||
struct PackOffsets
|
||||
{
|
||||
uint8_t msgOffset;
|
||||
uint8_t addrFromOffset;
|
||||
uint8_t addrToOffset;
|
||||
@ -150,54 +172,41 @@ public:
|
||||
uint8_t crcOffset;
|
||||
};
|
||||
|
||||
struct ErrorsStruct {
|
||||
struct ErrorsStruct
|
||||
{
|
||||
uint8_t lowSignal = 0;
|
||||
uint8_t highSignal = 0;
|
||||
uint8_t other = 0;
|
||||
|
||||
void reset() {
|
||||
void reset()
|
||||
{
|
||||
lowSignal = 0;
|
||||
highSignal = 0;
|
||||
other = 0;
|
||||
}
|
||||
uint16_t all() { return lowSignal + highSignal + other; }
|
||||
|
||||
};
|
||||
|
||||
struct PackInfo {
|
||||
uint8_t* buffer = nullptr;
|
||||
struct PackInfo
|
||||
{
|
||||
uint8_t *buffer = nullptr;
|
||||
uint8_t packSize = 0;
|
||||
uint16_t crc = 0;
|
||||
ErrorsStruct err;
|
||||
uint16_t rTime = 0;
|
||||
};
|
||||
|
||||
static void checkAddressRuleApply(uint16_t address, uint16_t id, bool& flag) {
|
||||
flag = false;
|
||||
flag |= id == 0;
|
||||
flag |= address == id;
|
||||
flag |= address >= IR_Broadcast;
|
||||
}
|
||||
|
||||
uint16_t getId() { return id; }
|
||||
void setId(uint16_t id) { this->id = id; }
|
||||
inline uint16_t getId() const { return id; }
|
||||
inline void setId(uint16_t id) { this->id = id; }
|
||||
static void checkAddressRuleApply(uint16_t address, uint16_t id, bool &flag);
|
||||
void setPin(uint8_t pin);
|
||||
inline uint8_t getPin() { return pin; };
|
||||
|
||||
protected:
|
||||
ErrorsStruct errors;
|
||||
uint16_t id;
|
||||
uint8_t crc8(uint8_t* data, uint8_t start, uint8_t end, uint8_t poly) { //TODO: сделать возможность межбайтовой проверки
|
||||
uint8_t crc = 0xff;
|
||||
size_t i, j;
|
||||
for (i = start; i < end; i++) {
|
||||
crc ^= data[i];
|
||||
for (j = 0; j < 8; j++) {
|
||||
if ((crc & 0x80) != 0)
|
||||
crc = (uint8_t)((crc << 1) ^ poly);
|
||||
else
|
||||
crc <<= 1;
|
||||
}
|
||||
}
|
||||
return crc;
|
||||
}
|
||||
|
||||
uint8_t pin;
|
||||
GPIO_TypeDef *port;
|
||||
uint16_t mask;
|
||||
ErrorsStruct errors;
|
||||
uint8_t crc8(uint8_t *data, uint8_t start, uint8_t end, uint8_t poly);
|
||||
};
|
||||
|
||||
107
PacketTypes.cpp
Normal file
107
PacketTypes.cpp
Normal file
@ -0,0 +1,107 @@
|
||||
#include "PacketTypes.h"
|
||||
|
||||
namespace PacketTypes
|
||||
{
|
||||
bool BasePack::checkAddress() { return true; };
|
||||
void BasePack::set(IR_FOX::PackInfo *packInfo, uint16_t id)
|
||||
{
|
||||
this->packInfo = packInfo;
|
||||
this->id = id;
|
||||
|
||||
if (checkAddress())
|
||||
{
|
||||
isAvailable = true;
|
||||
isRawAvailable = true;
|
||||
#ifdef IRDEBUG_INFO
|
||||
Serial.print(" OK ");
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
isRawAvailable = true;
|
||||
#ifdef IRDEBUG_INFO
|
||||
Serial.print(" NOT-OK ");
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
uint16_t BasePack::_getAddrFrom(BasePack *obj)
|
||||
{
|
||||
return (obj->packInfo->buffer[obj->addressFromOffset] << 8) | obj->packInfo->buffer[obj->addressFromOffset + 1];
|
||||
};
|
||||
uint16_t BasePack::_getAddrTo(BasePack *obj)
|
||||
{
|
||||
return (obj->packInfo->buffer[obj->addressToOffset] << 8) | obj->packInfo->buffer[obj->addressToOffset + 1];
|
||||
};
|
||||
|
||||
uint8_t BasePack::_getDataSize(BasePack *obj)
|
||||
{
|
||||
return obj->packInfo->packSize - crcBytes - obj->DataOffset;
|
||||
};
|
||||
uint8_t *BasePack::_getDataPrt(BasePack *obj)
|
||||
{
|
||||
return obj->packInfo->buffer + obj->DataOffset;
|
||||
};
|
||||
uint8_t BasePack::_getDataRawSize(BasePack *obj)
|
||||
{
|
||||
return obj->packInfo->packSize;
|
||||
};
|
||||
|
||||
bool BasePack::available()
|
||||
{
|
||||
if (isAvailable)
|
||||
{
|
||||
isAvailable = false;
|
||||
isRawAvailable = false;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
};
|
||||
bool BasePack::availableRaw()
|
||||
{
|
||||
if (isRawAvailable)
|
||||
{
|
||||
isRawAvailable = false;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
bool Data::checkAddress()
|
||||
{
|
||||
bool ret;
|
||||
IR_FOX::checkAddressRuleApply(getAddrTo(), this->id, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool DataBack::checkAddress()
|
||||
{
|
||||
bool ret;
|
||||
if (getMsgType() == IR_MSG_BACK_TO)
|
||||
{
|
||||
DataOffset = 5;
|
||||
IR_FOX::checkAddressRuleApply((packInfo->buffer[addressToOffset] << 8) | packInfo->buffer[addressToOffset + 1], this->id, ret);
|
||||
}
|
||||
else
|
||||
{
|
||||
DataOffset = 3;
|
||||
ret = true;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool Accept::checkAddress() { return true; }
|
||||
|
||||
bool Request::checkAddress()
|
||||
{
|
||||
bool ret;
|
||||
IR_FOX::checkAddressRuleApply(getAddrTo(), this->id, ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
308
PacketTypes.h
308
PacketTypes.h
@ -21,86 +21,28 @@ namespace PacketTypes
|
||||
IR_FOX::PackInfo *packInfo;
|
||||
uint16_t id;
|
||||
|
||||
virtual bool checkAddress() { return true; };
|
||||
void set(IR_FOX::PackInfo *packInfo, uint16_t id)
|
||||
{
|
||||
this->packInfo = packInfo;
|
||||
this->id = id;
|
||||
virtual bool checkAddress();
|
||||
void set(IR_FOX::PackInfo *packInfo, uint16_t id);
|
||||
|
||||
if (checkAddress())
|
||||
{
|
||||
isAvailable = true;
|
||||
isRawAvailable = true;
|
||||
#ifdef IRDEBUG_INFO
|
||||
Serial.print(" OK ");
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
isRawAvailable = true;
|
||||
#ifdef IRDEBUG_INFO
|
||||
Serial.print(" NOT-OK ");
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
static uint16_t _getAddrFrom(BasePack *obj)
|
||||
{
|
||||
return (obj->packInfo->buffer[obj->addressFromOffset] << 8) | obj->packInfo->buffer[obj->addressFromOffset + 1];
|
||||
};
|
||||
static uint16_t _getAddrTo(BasePack *obj)
|
||||
{
|
||||
return (obj->packInfo->buffer[obj->addressToOffset] << 8) | obj->packInfo->buffer[obj->addressToOffset + 1];
|
||||
};
|
||||
|
||||
static uint8_t _getDataSize(BasePack *obj)
|
||||
{
|
||||
return obj->packInfo->packSize - crcBytes - obj->DataOffset;
|
||||
};
|
||||
static uint8_t *_getDataPrt(BasePack *obj)
|
||||
{
|
||||
return obj->packInfo->buffer + obj->DataOffset;
|
||||
};
|
||||
static uint8_t _getDataRawSize(BasePack *obj)
|
||||
{
|
||||
return obj->packInfo->packSize;
|
||||
};
|
||||
static uint16_t _getAddrFrom(BasePack *obj);
|
||||
static uint16_t _getAddrTo(BasePack *obj);
|
||||
static uint8_t _getDataSize(BasePack *obj);
|
||||
static uint8_t *_getDataPrt(BasePack *obj);
|
||||
static uint8_t _getDataRawSize(BasePack *obj);
|
||||
|
||||
public:
|
||||
bool available()
|
||||
{
|
||||
if (isAvailable)
|
||||
{
|
||||
isAvailable = false;
|
||||
isRawAvailable = false;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
};
|
||||
bool availableRaw()
|
||||
{
|
||||
if (isRawAvailable)
|
||||
{
|
||||
isRawAvailable = false;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
return false;
|
||||
}
|
||||
};
|
||||
uint8_t getMsgInfo() { return packInfo->buffer[0] & IR_MASK_MSG_INFO; };
|
||||
uint8_t getMsgType() { return (packInfo->buffer[0] >> 5) & IR_MASK_MSG_TYPE; };
|
||||
uint8_t getMsgRAW() { return packInfo->buffer[0]; };
|
||||
uint16_t getErrorCount() { return packInfo->err.all(); };
|
||||
uint8_t getErrorLowSignal() { return packInfo->err.lowSignal; };
|
||||
uint8_t getErrorHighSignal() { return packInfo->err.highSignal; };
|
||||
uint8_t getErrorOther() { return packInfo->err.other; };
|
||||
uint16_t getTunerTime() { return packInfo->rTime; };
|
||||
uint8_t *getDataRawPtr() { return packInfo->buffer; };
|
||||
bool available();
|
||||
bool availableRaw();
|
||||
|
||||
inline uint8_t getMsgInfo() { return packInfo->buffer[0] & IR_MASK_MSG_INFO; };
|
||||
inline uint8_t getMsgType() { return (packInfo->buffer[0] >> 5) & IR_MASK_MSG_TYPE; };
|
||||
inline uint8_t getMsgRAW() { return packInfo->buffer[0]; };
|
||||
inline uint16_t getErrorCount() { return packInfo->err.all(); };
|
||||
inline uint8_t getErrorLowSignal() { return packInfo->err.lowSignal; };
|
||||
inline uint8_t getErrorHighSignal() { return packInfo->err.highSignal; };
|
||||
inline uint8_t getErrorOther() { return packInfo->err.other; };
|
||||
inline uint16_t getTunerTime() { return packInfo->rTime; };
|
||||
inline uint8_t *getDataRawPtr() { return packInfo->buffer; };
|
||||
};
|
||||
|
||||
class Data : public BasePack
|
||||
@ -114,20 +56,15 @@ namespace PacketTypes
|
||||
DataOffset = 5;
|
||||
}
|
||||
|
||||
uint16_t getAddrFrom() { return _getAddrFrom(this); };
|
||||
uint16_t getAddrTo() { return _getAddrTo(this); };
|
||||
inline uint16_t getAddrFrom() { return _getAddrFrom(this); };
|
||||
inline uint16_t getAddrTo() { return _getAddrTo(this); };
|
||||
|
||||
uint8_t getDataSize() { return _getDataSize(this); };
|
||||
uint8_t *getDataPrt() { return _getDataPrt(this); };
|
||||
uint8_t getDataRawSize() { return _getDataRawSize(this); };
|
||||
inline uint8_t getDataSize() { return _getDataSize(this); };
|
||||
inline uint8_t *getDataPrt() { return _getDataPrt(this); };
|
||||
inline uint8_t getDataRawSize() { return _getDataRawSize(this); };
|
||||
|
||||
private:
|
||||
bool checkAddress() override
|
||||
{
|
||||
bool ret;
|
||||
IR_FOX::checkAddressRuleApply(getAddrTo(), this->id, ret);
|
||||
return ret;
|
||||
}
|
||||
bool checkAddress() override;
|
||||
};
|
||||
|
||||
class DataBack : public BasePack
|
||||
@ -141,29 +78,15 @@ namespace PacketTypes
|
||||
DataOffset = 3;
|
||||
}
|
||||
|
||||
uint16_t getAddrFrom() { return _getAddrFrom(this); };
|
||||
uint16_t getAddrTo() { return _getAddrTo(this); };
|
||||
inline uint16_t getAddrFrom() { return _getAddrFrom(this); };
|
||||
inline uint16_t getAddrTo() { return _getAddrTo(this); };
|
||||
|
||||
uint8_t getDataSize() { return _getDataSize(this); };
|
||||
uint8_t *getDataPrt() { return _getDataPrt(this); };
|
||||
uint8_t getDataRawSize() { return _getDataRawSize(this); };
|
||||
inline uint8_t getDataSize() { return _getDataSize(this); };
|
||||
inline uint8_t *getDataPrt() { return _getDataPrt(this); };
|
||||
inline uint8_t getDataRawSize() { return _getDataRawSize(this); };
|
||||
|
||||
private:
|
||||
bool checkAddress() override
|
||||
{
|
||||
bool ret;
|
||||
if (getMsgType() == IR_MSG_BACK_TO)
|
||||
{
|
||||
DataOffset = 5;
|
||||
IR_FOX::checkAddressRuleApply((packInfo->buffer[addressToOffset] << 8) | packInfo->buffer[addressToOffset + 1], this->id, ret);
|
||||
}
|
||||
else
|
||||
{
|
||||
DataOffset = 3;
|
||||
ret = true;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
bool checkAddress() override;
|
||||
};
|
||||
|
||||
class Accept : public BasePack
|
||||
@ -176,11 +99,11 @@ namespace PacketTypes
|
||||
DataOffset = 3;
|
||||
}
|
||||
|
||||
uint16_t getAddrFrom() { return _getAddrFrom(this); };
|
||||
uint8_t getCustomByte() { return packInfo->buffer[DataOffset]; };
|
||||
inline uint16_t getAddrFrom() { return _getAddrFrom(this); };
|
||||
inline uint8_t getCustomByte() { return packInfo->buffer[DataOffset]; };
|
||||
|
||||
private:
|
||||
bool checkAddress() override { return true; }
|
||||
bool checkAddress() override;
|
||||
};
|
||||
|
||||
class Request : public BasePack
|
||||
@ -194,168 +117,11 @@ namespace PacketTypes
|
||||
DataOffset = 3;
|
||||
}
|
||||
|
||||
uint16_t getAddrFrom() { return _getAddrFrom(this); };
|
||||
uint16_t getAddrTo() { return _getAddrTo(this); };
|
||||
inline uint16_t getAddrFrom() { return _getAddrFrom(this); };
|
||||
inline uint16_t getAddrTo() { return _getAddrTo(this); };
|
||||
|
||||
private:
|
||||
bool checkAddress() override
|
||||
{
|
||||
bool ret;
|
||||
IR_FOX::checkAddressRuleApply(getAddrTo(), this->id, ret);
|
||||
return ret;
|
||||
}
|
||||
bool checkAddress() override;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
// class IOffsets {
|
||||
// protected:
|
||||
// uint8_t msgOffset;
|
||||
// uint8_t addressFromOffset;
|
||||
// uint8_t addressToOffset;
|
||||
// uint8_t DataOffset;
|
||||
// };
|
||||
|
||||
// class IPackInfo {
|
||||
// public:
|
||||
// IR_FOX::PackInfo* packInfo;
|
||||
// };
|
||||
|
||||
// class IBaseEmptyPack : virtual public IOffsets, virtual public IPackInfo {
|
||||
// };
|
||||
|
||||
// class IR_Decoder;
|
||||
// class IEmptyPack : virtual protected IBaseEmptyPack, virtual public IR_FOX {
|
||||
// friend IR_Decoder;
|
||||
// bool isAvailable;
|
||||
// bool isRawAvailable;
|
||||
// bool isNeedAccept;
|
||||
|
||||
// protected:
|
||||
// uint16_t id;
|
||||
|
||||
// virtual bool checkAddress() {};
|
||||
|
||||
// virtual void set(IR_FOX::PackInfo* packInfo, uint16_t id, bool isNeedAccept = false) {
|
||||
// IBaseEmptyPack::IPackInfo::packInfo = packInfo;
|
||||
// this->id = id;
|
||||
// this->isNeedAccept = isNeedAccept;
|
||||
|
||||
// if (isAvailable = checkAddress()) {
|
||||
// isAvailable = true;
|
||||
// isRawAvailable = true;
|
||||
// Serial.print(" OK ");
|
||||
// } else {
|
||||
// isRawAvailable = true;
|
||||
// Serial.print(" NOT-OK ");
|
||||
// }
|
||||
// }
|
||||
|
||||
// public:
|
||||
// virtual bool available() { if (isAvailable) { isAvailable = false; isRawAvailable = false; return true; } else { return false; } };
|
||||
// virtual bool availableRaw() { if (isRawAvailable) { isRawAvailable = false; return true; } else { return false; } };
|
||||
// virtual uint8_t getMsgInfo() { return packInfo->buffer[0] & IR_MASK_MSG_INFO; };
|
||||
// virtual uint8_t getMsgType() { return (packInfo->buffer[0] >> 5) & IR_MASK_MSG_TYPE; };
|
||||
// virtual uint8_t getMsgRAW() { return packInfo->buffer[0]; };
|
||||
// virtual uint16_t getErrorCount() { return packInfo->err.all(); };
|
||||
// virtual uint8_t getErrorLowSignal() { return packInfo->err.lowSignal; };
|
||||
// virtual uint8_t getErrorHighSignal() { return packInfo->err.highSignal; };
|
||||
// virtual uint8_t getErrorOther() { return packInfo->err.other; };
|
||||
// virtual uint16_t getTunerTime() { return packInfo->rTime; };
|
||||
// };
|
||||
|
||||
// class IHasAddresFrom : virtual protected IBaseEmptyPack {
|
||||
// public:
|
||||
// virtual uint16_t getAddrFrom() { return (packInfo->buffer[addressFromOffset] << 8) | packInfo->buffer[addressFromOffset + 1]; };
|
||||
// };
|
||||
|
||||
// class IHasAddresTo : virtual protected IBaseEmptyPack {
|
||||
// public:
|
||||
// virtual uint16_t getAddrTo() { return (packInfo->buffer[addressToOffset] << 8) | packInfo->buffer[addressToOffset + 1]; };
|
||||
// };
|
||||
|
||||
// class IHasAddresData : virtual protected IBaseEmptyPack {
|
||||
// public:
|
||||
// virtual uint8_t getDataSize() { return packInfo->packSize - crcBytes - DataOffset; };
|
||||
// virtual uint8_t* getDataPrt() { return packInfo->buffer + DataOffset; };
|
||||
// virtual uint8_t getDataRawSize() { return packInfo->packSize; };
|
||||
// virtual uint8_t* getDataRawPtr() { return packInfo->buffer; };
|
||||
// };
|
||||
|
||||
// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// class Data :
|
||||
// virtual public IEmptyPack,
|
||||
// virtual public IHasAddresFrom,
|
||||
// virtual public IHasAddresTo,
|
||||
// virtual public IHasAddresData {
|
||||
// public:
|
||||
// Data() {
|
||||
// msgOffset = 0;
|
||||
// addressFromOffset = 1;
|
||||
// addressToOffset = 3;
|
||||
// DataOffset = 5;
|
||||
// }
|
||||
// protected:
|
||||
// bool checkAddress() override {
|
||||
// bool ret;
|
||||
// checkAddressRuleApply(getAddrTo(), this->id, ret);
|
||||
// return ret;
|
||||
// }
|
||||
// };
|
||||
|
||||
// class DataBack :
|
||||
// virtual public IEmptyPack,
|
||||
// virtual public IHasAddresFrom,
|
||||
// virtual public IHasAddresData {
|
||||
// public:
|
||||
// DataBack() {
|
||||
// msgOffset = 0;
|
||||
// addressFromOffset = 1;
|
||||
// addressToOffset = 3;
|
||||
// DataOffset = 3;
|
||||
// }
|
||||
// protected:
|
||||
// bool checkAddress() override {
|
||||
// bool ret;
|
||||
// if (getMsgType() == IR_MSG_BACK_TO) {
|
||||
// DataOffset = 5;
|
||||
// checkAddressRuleApply((packInfo->buffer[addressToOffset] << 8) | packInfo->buffer[addressToOffset + 1], this->id, ret);
|
||||
// } else {
|
||||
// DataOffset = 3;
|
||||
// ret = true;
|
||||
// }
|
||||
// return ret;
|
||||
// }
|
||||
// };
|
||||
|
||||
// class Request :
|
||||
// virtual public IEmptyPack,
|
||||
// virtual public IHasAddresFrom,
|
||||
// virtual public IHasAddresTo {
|
||||
// public:
|
||||
// Request() {
|
||||
// msgOffset = 0;
|
||||
// addressFromOffset = 1;
|
||||
// addressToOffset = 3;
|
||||
// DataOffset = 3;
|
||||
// }
|
||||
// protected:
|
||||
// bool checkAddress() override {
|
||||
// bool ret;
|
||||
// checkAddressRuleApply(getAddrTo(), this->id, ret);
|
||||
// return ret;
|
||||
// }
|
||||
// };
|
||||
|
||||
// class Accept :
|
||||
// virtual public IEmptyPack,
|
||||
// virtual public IHasAddresFrom {
|
||||
// public:
|
||||
// Accept() {
|
||||
// msgOffset = 0;
|
||||
// addressFromOffset = 1;
|
||||
// DataOffset = 1;
|
||||
// }
|
||||
// protected:
|
||||
// };
|
||||
|
||||
Reference in New Issue
Block a user