Merge pull request #13 from anarkiwi/freq

optimize even divis.
anarkiwi · Aug 8, 2022 · 744f2a2 · 744f2a2
2 parents 85eac7b + 3b378a1
commit 744f2a2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/CRIO.cpp b/CRIO.cpp
@@ -44,6 +44,11 @@ bool CRIO::handlePulse() {
  return (this->*handlePulsePtr)();
 }
 
+bool CRIO::handlePulseOff() {
+ pulseOff();
+ return handleNoPulse();
+}
+
 bool CRIO::handleNoPulse() {
  ++_ticksSinceLastPulse;
  return false;
@@ -53,26 +58,24 @@ bool CRIO::handleLongPulse() {
  pulseOn();
  ++_ticksSinceLastPulse;
  _remainingPulseUs -= masterClockPeriodUs;
- if (_remainingPulseUs <= masterClockPeriodUs) {
- handlePulsePtr = &CRIO::handleShortPulse;
+ if (_remainingPulseUs) {
+ if (_remainingPulseUs < masterClockPeriodUs) {
+ handlePulsePtr = &CRIO::handleShortPulse;
+ }
+ } else {
+ handlePulsePtr = &CRIO::handlePulseOff;
  }
  return false;
 }
 
 bool CRIO::handleShortPulse() {
- if (_remainingPulseUs) {
- pulseOn();
- delayMicroseconds(_remainingPulseUs);
- pulseOff();
- _remainingPulseUs = 0;
- ++_ticksSinceLastPulse;
- handlePulsePtr = &CRIO::handleNoPulse;
- return true;
- }
+ pulseOn();
+ delayMicroseconds(_remainingPulseUs);
  pulseOff();
+ _remainingPulseUs = 0;
  ++_ticksSinceLastPulse;
  handlePulsePtr = &CRIO::handleNoPulse;
- return false;
+ return true;
 }
 
 void CRIO::schedulePulse(cr_fp_t pulseUs) {

diff --git a/CRIO.h b/CRIO.h
@@ -47,6 +47,7 @@ class CRIO {
 private:
  bool handleShortPulse();
  bool handleLongPulse();
+ bool handlePulseOff();
  bool handleNoPulse();
  void pulseOff();
  void pulseOn();