Checkpointing speedup attempt as pre #26.

bengtmartensson · Jul 2, 2019 · 060886f · 060886f
1 parent b7f717f
commit 060886f
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 20 deletions.
diff --git a/src/Arduino.h b/src/Arduino.h
@@ -48,6 +48,9 @@ inline void pinMode(uint8_t pin, int mode) {
             << ")" << std::endl;
 };
 
+inline uint8_t digitalPinToBitMask(uint8_t pin) { return pin; }
+inline uint8_t* digitalPinToPort(uint8_t pin UNUSED) { return NULL; }
+
 inline void delayMicroseconds(unsigned int t) { usleep(t); };
 
 inline void delay(unsigned long t) {

diff --git a/src/IrSender.cpp b/src/IrSender.cpp
@@ -32,22 +32,22 @@ void IrSender::delayUSecs(microseconds_t T) {
     };
 }
 
-IrSender::IrSender() {
-    outputPin = invalidPin;
+IrSender::IrSender() : outputPin(invalidPin) {
 }
 
-IrSender::IrSender(pin_t pin) {
-    outputPin = pin;
+IrSender::IrSender(pin_t pin) : outputPin(pin), bitMask(digitalPinToBitMask(pin)), outputRegister(digitalPinToPort(pin)) {
     pinMode(pin, OUTPUT);
-    digitalWrite(pin, LOW);
+    mute();
 }
 
 IrSender::~IrSender() {
     mute();
 }
 
 void IrSender::mute() {
-    digitalWrite(outputPin, LOW);
+    noInterrupts();
+    digitalWriteLow();
+    interrupts();
 }
 
 void IrSender::sendIrSignal(const IrSignal& irSignal, unsigned int noSends) {

diff --git a/src/IrSender.h b/src/IrSender.h
@@ -26,11 +26,30 @@ this program. If not, see http://www.gnu.org/licenses/.
 class IrSender {
 private:
     pin_t outputPin;
+    uint8_t bitMask;
+    volatile uint8_t* outputRegister;
 
 protected:
-    pin_t getOutputPin() const {
-        return outputPin;
+//    pin_t getOutputPin() const {
+//        return outputPin;
+//    }
+
+    void digitalWriteLow() const {
+#ifdef ARDUINO
+        *outputRegister &= ~bitMask;
+#else
+        digitalWrite(outputPin, LOW);
+#endif
+    }
+
+    void digitalWriteHigh() const {
+#ifdef ARDUINO
+        *outputRegister |= bitMask;
+#else
+        digitalWrite(outputPin, HIGH);
+#endif
     }
+
     void delayUSecs(microseconds_t T);
     IrSender();
     IrSender(pin_t pin);

diff --git a/src/IrSenderNonMod.cpp b/src/IrSenderNonMod.cpp
@@ -21,9 +21,14 @@ IrSenderNonMod::IrSenderNonMod(pin_t pin) : IrSender(pin) {
 }
 
 void IrSenderNonMod::sendNonModulated(const IrSequence &irSequence) {
-    for (unsigned int i = 0; i < irSequence.getLength(); i++) {
-        digitalWrite(getOutputPin(), (i & 1) ? LOW : HIGH);
+    for (unsigned int i = 0; i < irSequence.getLength(); i += 2) {
+        noInterrupts();
+        digitalWriteHigh();
+        interrupts();
         delayUSecs(irSequence.getDurations()[i]);
+        noInterrupts();
+        digitalWriteLow();
+        interrupts();
+        delayUSecs(irSequence.getDurations()[i+1]);
     }
-    digitalWrite(getOutputPin(), LOW);
 }
diff --git a/src/IrSenderPwm.cpp b/src/IrSenderPwm.cpp
@@ -26,16 +26,20 @@ IrSenderPwm::IrSenderPwm() : IrSender(SEND_PIN) {
 
 void IrSenderPwm::send(const IrSequence& irSequence, frequency_t frequency) {
     enable(frequency/1000);
-    for (unsigned int i = 0; i < irSequence.getLength(); i++) {
-        digitalWrite(getOutputPin(), (i & 1) ? LOW : HIGH);
-        if (i & 1) {
-            TIMER_DISABLE_PWM;
-        } else {
-            TIMER_ENABLE_PWM;
-        }
+    unsigned long targetTime = micros();
+    for (unsigned int i = 0; i < irSequence.getLength(); i += 2) {
+        noInterrupts();
+        digitalWriteHigh();
+        TIMER_ENABLE_PWM;
+        interrupts();
         delayUSecs(irSequence.getDurations()[i]);
+        noInterrupts();
+        TIMER_DISABLE_PWM;
+        digitalWriteLow();
+        interrupts();
+        targetTime += irSequence.getDurations()[i] + irSequence.getDurations()[i+1];
+        delayUSecs((microseconds_t) (targetTime - micros()));
     }
-    digitalWrite(getOutputPin(), LOW);
 }
 
 IrSenderPwm *IrSenderPwm::newInstance() {
@@ -59,6 +63,6 @@ IrSenderPwm *IrSenderPwm::getInstance(bool create) {
 void IrSenderPwm::enable(unsigned char khz UNUSED) {
     TIMER_DISABLE_INTR;
     pinMode(SEND_PIN, OUTPUT);
-    digitalWrite(SEND_PIN, LOW);
+    digitalWriteLow();
     TIMER_CONFIG_KHZ(khz);
 }