Merge branch 'main' into STM32

upd

.gitignore

@@ -1,5 +1,3 @@
 .vscode/*
 bin/*
-!.vscode/launch.json
 log/*
-/.vscode

IR-protocol.ino

@@ -2,26 +2,16 @@
 #include "IR_Encoder.h"
 #include "TimerStatic.h"
 #include "MemoryCheck.h"
+#include "CarCmdList.h"
 /////////////// Pinout ///////////////
 
-#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 encForward_PIN    0
+#define encBackward_PIN   5
 
-#define LoopOut PC13
+#define LoopOut 12
+#define ISR_Out 10
+
+#define TestOut 13
 
 //////////////// Ini /////////////////
 
@@ -49,13 +39,35 @@ void EncoderISR()
     IR_Encoder::isr();
 }
 
-//-------------------------------------------------------------------
+void decBackwardISR() {
+    decBackward.isr();
+}
 
-IR_Decoder dec0(dec0_PIN, 0);
-void dec_0_ISR() { dec0.isr(); }
+static uint8_t* portOut;
+ISR(TIMER2_COMPA_vect) {
+    encForward.isr();
+    // encBackward.isr();
+    // encTree.isr();
+    //TODO: Сделать выбор порта 
+    *portOut = (*portOut & 0b11111110) |
+        (
+            encForward.ir_out_virtual << 0U
+            // | encBackward.ir_out_virtual << 6U
+            // | encTree.ir_out_virtual << 2U
+            );
+}
+/////////////////////////////////////////////////////////////////////
+uint8_t data0 [] = { };
+uint8_t data1 [] = { 42 };
+uint8_t data2 [] = { 42 , 127 };
+uint8_t data3 [] = { 42 , 127, 137 };
+uint8_t data4 [] = { 42 , 127, 137, 255 };
 
-IR_Decoder dec1(dec1_PIN, 1);
-void dec_1_ISR() { dec1.isr(); }
+uint32_t loopTimer;
+uint8_t sig = 255;
+
+uint16_t targetAddr = IR_Broadcast;
+Timer t1(750, millis, []() {
 
 IR_Decoder dec2(dec2_PIN, 2);
 void dec_2_ISR() { dec2.isr(); }
@@ -81,8 +93,19 @@ void dec_7_ISR() { dec7.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(); }
+        default:
+            break;
+    }
+    // encBackward.sendData(IR_Broadcast, data2);
+    // encTree.sendData(IR_Broadcast, rawData3);
+});
+Timer t2(500, millis, []() {
+    digitalToggle(13);
+});
+/////////////////////////////////////////////////////////////////////
+void setup() {
+    IR_Encoder::timerSetup();
+    portOut = &PORTB;
 
 // IR_Decoder dec11(dec11_PIN, 11);
 // void dec_11_ISR() { dec11.isr(); }
@@ -100,9 +123,14 @@ uint8_t data2[] = {42, 127};
 uint8_t data3[] = {42, 127, 137};
 uint8_t data4[] = {42, 127, 137, 255};
 
-uint32_t loopTimer;
-uint8_t sig = 0;
-uint16_t targetAddr = IR_Broadcast;
+    pinMode(8, OUTPUT);
+    pinMode(9, OUTPUT);
+    pinMode(11, OUTPUT);
+    pinMode(13, OUTPUT);
+    pinMode(encForward_PIN, OUTPUT);
+    pinMode(encBackward_PIN, OUTPUT);
+    pinMode(13, OUTPUT);
+    pinMode(12, OUTPUT);
 
 Timer t1(500, millis, []()
          {
@@ -217,61 +245,30 @@ void setup()
 
     pinMode(LoopOut, OUTPUT);
 
-    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);
-
-    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);
+    attachInterrupt(0, decForwardISR, CHANGE);  // D2 
+    attachInterrupt(1, decBackwardISR, CHANGE); // D3
 }
 
-void loop()
-{
-    digitalToggle(LoopOut);
+
+bool testLed = false;
+uint32_t testLed_timer;
+
+void loop() {
+    // digitalToggle(LoopOut);
     Timer::tick();
-    IR_Decoder::tick();
 
-    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);
+    decForward.tick();
+    decBackward.tick();
 
-    if (Serial.available())
-    {
+    status(decForward);
+    status(decBackward);
+
+
+    // Serial.println(micros() - loopTimer);
+    // loopTimer = micros();
+    // delayMicroseconds(120*5);
+
+    if (Serial.available()) {
         uint8_t in = Serial.parseInt();
         switch (in)
         {
@@ -289,6 +286,13 @@ void loop()
             break;
         }
     }
+
+    if(testLed && millis() - testLed_timer > 100){
+        testLed=false;
+        digitalWrite(12, LOW);
+
+    }
+
 }
 
 
@@ -316,13 +320,19 @@ void detectSignal()
     //                         { digitalWrite(SignalDetectLed, LOW); });
 }
 
+
+
 //test
-bool status(IR_Decoder &dec)
-{
-    if (dec.gotData.available())
-    {
-        detectSignal();
-        // Serial.println(micros());
+void status(IR_Decoder& dec) {
+    if (dec.gotData.available() && dec.gotData.getAddrFrom() != 42) {
+
+        digitalWrite(12, HIGH);
+        testLed = true;
+        testLed_timer = millis();
+
+        encForward.sendData(IR_Broadcast, CarCmd::stop); //<<<<<<<<<<<<<<<<<<<<<<<<<<< CMD IS HERE
+
+
         String str;
         if (/* dec.gotData.getDataPrt()[1] */ 1)
         {

IR_Encoder.cpp

@@ -1,5 +1,6 @@
 #include "IR_Encoder.h"
 #include "IR_DecoderRaw.h"
+#include <string.h>
 
 #define LoopOut 12
 #define ISR_Out 10
@@ -45,6 +46,9 @@ IR_Encoder::IR_Encoder(uint8_t pin, uint16_t addr, IR_DecoderRaw *decPair, bool
 };
  
 HardwareTimer* IR_Encoder::IR_Timer = nullptr;
+IR_Encoder::ExternalTxStartFn IR_Encoder::externalTxStartFn = nullptr;
+IR_Encoder::ExternalTxBusyFn IR_Encoder::externalTxBusyFn = nullptr;
+void *IR_Encoder::externalTxCtx = nullptr;
 
 inline HardwareTimer* IR_Encoder::get_IR_Timer(){return IR_Encoder::IR_Timer;}
 
@@ -78,6 +82,164 @@ void IR_Encoder::begin(HardwareTimer* timer, uint8_t channel, IRQn_Type IRQn, ui
     IR_Timer->pause();
 }
 
+void IR_Encoder::beginClockOnly(HardwareTimer *timer)
+{
+    IR_Timer = timer;
+    if (IR_Timer == nullptr)
+        return;
+    IR_Timer->pause();
+    IR_Timer->setOverflow(carrierFrec * 2, HERTZ_FORMAT);
+    IR_Timer->pause();
+}
+
+void IR_Encoder::setExternalTxBackend(ExternalTxStartFn startFn, ExternalTxBusyFn busyFn, void *ctx)
+{
+    externalTxStartFn = startFn;
+    externalTxBusyFn = busyFn;
+    externalTxCtx = ctx;
+}
+
+void IR_Encoder::externalFinishSend()
+{
+    if (!isSending)
+        return;
+
+    // Force output low.
+    if (port != nullptr) {
+        port->BSRR = ((uint32_t)mask) << 16;
+    }
+
+    isSending = false;
+    setDecoder_isSending();
+}
+
+size_t IR_Encoder::buildGateRuns(const uint8_t *packet, uint8_t len, IR_TxGateRun *outRuns, size_t maxRuns)
+{
+    if (packet == nullptr || outRuns == nullptr || maxRuns == 0)
+    {
+        return 0;
+    }
+    if (len == 0 || len > dataByteSizeMax)
+    {
+        return 0;
+    }
+
+    // Copy into fixed-size buffer to match original encoder behavior (safe reads past sendLen).
+    uint8_t sendBufferLocal[dataByteSizeMax] = {0};
+    memcpy(sendBufferLocal, packet, len);
+
+    uint8_t sendLenLocal = len;
+    uint8_t toggleCounterLocal = preambToggle;
+    uint8_t dataBitCounterLocal = bitPerByte - 1;
+    uint8_t dataByteCounterLocal = 0;
+    uint8_t preambFrontCounterLocal = preambPulse * 2 - 1;
+    uint8_t dataSequenceCounterLocal = bitPerByte * 2;
+    uint8_t syncSequenceCounterLocal = syncBits * 2;
+    bool syncLastBitLocal = false;
+    SignalPart signalLocal = preamb;
+    bool stateLocal = HIGH;
+    uint8_t *currentBitSequenceLocal = bitHigh;
+
+    size_t runCount = 0;
+
+    while (true)
+    {
+        const bool gate = stateLocal;
+        const uint16_t runLenTicks = (uint16_t)toggleCounterLocal + 1U;
+
+        if (runCount > 0 && outRuns[runCount - 1].gate == gate)
+        {
+            outRuns[runCount - 1].lenTicks = (uint16_t)(outRuns[runCount - 1].lenTicks + runLenTicks);
+        }
+        else
+        {
+            if (runCount >= maxRuns)
+            {
+                return 0;
+            }
+            outRuns[runCount].gate = gate;
+            outRuns[runCount].lenTicks = runLenTicks;
+            runCount++;
+        }
+
+        // Advance state to the next run boundary (equivalent to ISR iteration when toggleCounter == 0).
+        while (true)
+        {
+            switch (signalLocal)
+            {
+            case noSignal:
+                return runCount;
+
+            case preamb:
+                if (preambFrontCounterLocal)
+                {
+                    preambFrontCounterLocal--;
+                    toggleCounterLocal = preambToggle;
+                    break;
+                }
+                // End of preamble.
+                signalLocal = data;
+                stateLocal = !LOW;
+                continue;
+
+            case data:
+                if (dataSequenceCounterLocal)
+                {
+                    if (!(dataSequenceCounterLocal & 1U))
+                    {
+                        currentBitSequenceLocal = ((sendBufferLocal[dataByteCounterLocal] >> dataBitCounterLocal) & 1U) ? bitHigh : bitLow;
+                        dataBitCounterLocal--;
+                    }
+                    toggleCounterLocal = currentBitSequenceLocal[!stateLocal];
+                    dataSequenceCounterLocal--;
+                    break;
+                }
+                // End of data byte.
+                syncLastBitLocal = ((sendBufferLocal[dataByteCounterLocal]) & 1U);
+                dataByteCounterLocal++;
+                dataBitCounterLocal = bitPerByte - 1;
+                dataSequenceCounterLocal = bitPerByte * 2;
+                signalLocal = sync;
+                continue;
+
+            case sync:
+                if (syncSequenceCounterLocal)
+                {
+                    if (!(syncSequenceCounterLocal & 1U))
+                    {
+                        if (syncSequenceCounterLocal == 2)
+                        {
+                            currentBitSequenceLocal = ((sendBufferLocal[dataByteCounterLocal]) & 0b10000000) ? bitLow : bitHigh;
+                        }
+                        else
+                        {
+                            currentBitSequenceLocal = syncLastBitLocal ? bitLow : bitHigh;
+                            syncLastBitLocal = !syncLastBitLocal;
+                        }
+                    }
+                    toggleCounterLocal = currentBitSequenceLocal[!stateLocal];
+                    syncSequenceCounterLocal--;
+                    break;
+                }
+                // End of sync.
+                signalLocal = data;
+                syncSequenceCounterLocal = syncBits * 2;
+                if (dataByteCounterLocal >= sendLenLocal)
+                {
+                    signalLocal = noSignal;
+                }
+                continue;
+
+            default:
+                return 0;
+            }
+
+            stateLocal = !stateLocal;
+            break;
+        }
+    }
+}
+
 
 void IR_Encoder::enable()
 {
@@ -159,7 +321,10 @@ IR_SendResult IR_Encoder::sendData(uint16_t addrTo, uint8_t *data, uint8_t len,
     return sendDataFULL(id, addrTo, data, len, needAccept);
 }
 
-IR_SendResult IR_Encoder::sendDataFULL(uint16_t addrFrom, uint16_t addrTo, uint8_t *data, uint8_t len, bool needAccept)
+void IR_Encoder::sendData(uint16_t addrTo, uint8_t *data = nullptr, uint8_t len = 0, bool needAccept = false){
+    sendData(id, addrTo, data, len, needAccept);
+}
+void IR_Encoder::sendData(uint16_t addrFrom, uint16_t addrTo, uint8_t *data = nullptr, uint8_t len = 0, bool needAccept = false)
 {
     if (len > bytePerPack)
     {
@@ -360,6 +525,27 @@ void IR_Encoder::rawSend(uint8_t *ptr, uint8_t len)
     {
         return;
     }
+
+    if (externalTxStartFn != nullptr)
+    {
+        if (externalTxBusyFn != nullptr && externalTxBusyFn(externalTxCtx))
+        {
+            return;
+        }
+
+        // Mark as sending and delegate actual signal output to external backend.
+        setDecoder_isSending();
+        sendLen = len;
+        isSending = true;
+
+        const bool ok = externalTxStartFn(externalTxCtx, this, ptr, len);
+        if (!ok)
+        {
+            isSending = false;
+            setDecoder_isSending();
+        }
+        return;
+    }
     IR_Encoder::carrierResume();
     // Serial.println("START");
     setDecoder_isSending();
@@ -380,7 +566,6 @@ void IR_Encoder::rawSend(uint8_t *ptr, uint8_t len)
     state = HIGH;
 
     currentBitSequence = bitHigh;
-    isSending = true;
     // interrupts();
 }
 

IR_Encoder.h

@@ -20,7 +20,16 @@ class IR_Encoder : public IR_FOX
     static IR_Encoder *last;
     IR_Encoder *next;
 public:
-    static HardwareTimer* IR_Timer;
+private:
+    // uint16_t id; /// @brief Адрес передатчика
+
+    struct IR_TxGateRun {
+        uint16_t lenTicks; // number of timer ticks at carrierFrec*2
+        bool gate;         // true: carrier enabled (output toggles), false: silent (output forced low)
+    };
+
+    using ExternalTxBusyFn = bool (*)(void *ctx);
+    using ExternalTxStartFn = bool (*)(void *ctx, IR_Encoder *enc, const uint8_t *packet, uint8_t len);
 private:
     // uint16_t id; /// @brief Адрес передатчика
 public:
@@ -31,20 +40,30 @@ public:
     IR_Encoder(uint8_t pin, uint16_t addr = 0, IR_DecoderRaw *decPair = nullptr, bool autoHandle = true);
     static void isr();
     static void begin(HardwareTimer* timer, uint8_t channel, IRQn_Type IRQn, uint8_t priority, void(*isrCallback)() = nullptr);
+    /** Configure timer frequency for TX clock (carrierFrec*2) without attaching ISR. */
+    static void beginClockOnly(HardwareTimer *timer);
     static HardwareTimer* get_IR_Timer();
     /** Call from main loop/tick: if ISR requested carrier stop, pause timer here (not in ISR). */
     static void tick();
 
+    /** Optional: register external TX backend (e.g. DMA driver). */
+    static void setExternalTxBackend(ExternalTxStartFn startFn, ExternalTxBusyFn busyFn, void *ctx);
+
+    /** Called by external TX backend on actual end of transmission. */
+    void externalFinishSend();
+
+    /** Build RLE runs of carrier gate for a packet (no HW access). */
+    static size_t buildGateRuns(const uint8_t *packet, uint8_t len, IR_TxGateRun *outRuns, size_t maxRuns);
+
     void enable();
     void disable();
 
     void setBlindDecoders(IR_DecoderRaw *decoders[], uint8_t count);
     void rawSend(uint8_t *ptr, uint8_t len);
 
-    IR_SendResult sendData(uint16_t addrTo, uint8_t dataByte, bool needAccept = false);
-    IR_SendResult sendData(uint16_t addrTo, uint8_t *data = nullptr, uint8_t len = 0, bool needAccept = false);
-    IR_SendResult sendDataFULL(uint16_t addrFrom, uint16_t addrTo, uint8_t *data = nullptr, uint8_t len = 0, bool needAccept = false);
-
+    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 sendData(uint16_t addrFrom, uint16_t addrTo, uint8_t *data = nullptr, uint8_t len = 0, bool needAccept = false);
 
     IR_SendResult sendAccept(uint16_t addrTo, uint8_t customByte = 0);
     IR_SendResult sendRequest(uint16_t addrTo);
@@ -74,6 +93,10 @@ private:
     static volatile bool carrierStopPending;
     static void carrierResume();
     static void carrierPauseIfIdle();
+
+    static ExternalTxStartFn externalTxStartFn;
+    static ExternalTxBusyFn externalTxBusyFn;
+    static void *externalTxCtx;
     IR_SendResult _sendBack(bool isAdressed, uint16_t addrTo, uint8_t *data, uint8_t len);
 
     void setDecoder_isSending();
@@ -123,4 +146,3 @@ private:
     uint8_t *currentBitSequence = bitLow;
     volatile SignalPart signal;
 };
-

IR_config.h

@@ -201,6 +201,8 @@ public:
     static void checkAddressRuleApply(uint16_t address, uint16_t id, bool &flag);
     void setPin(uint8_t pin);
     inline uint8_t getPin() { return pin; };
+    inline GPIO_TypeDef *getPort() const { return port; }
+    inline uint16_t getPinMask() const { return mask; }
 
 protected:
     uint16_t id;