Skip to content

Support 8MHz boards via is16MHz flag in begin() #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lolig4 wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −5
Open

Support 8MHz boards via is16MHz flag in begin() #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/PPMEncoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@
PPMEncoder ppmEncoder;

void PPMEncoder::begin(uint8_t pin) {
begin(pin, PPM_DEFAULT_CHANNELS, false);
begin(pin, PPM_DEFAULT_CHANNELS, false, true);
}

void PPMEncoder::begin(uint8_t pin, uint8_t ch) {
begin(pin, ch, false);
begin(pin, ch, false, true);
}

void PPMEncoder::begin(uint8_t pin, uint8_t ch, boolean inverted) {
begin(pin, ch, inverted, true);
}

void PPMEncoder::begin(uint8_t pin, uint8_t ch, boolean inverted, boolean is16MHz) {
cli();

// Store on/off-State in variable to avoid another if in timing-critical interrupt
Expand All @@ -27,6 +31,7 @@ void PPMEncoder::begin(uint8_t pin, uint8_t ch, boolean inverted) {

numChannels = ch;
outputPin = pin;
clockMultiplier = is16MHz ? 2 : 1;

for (uint8_t ch = 0; ch < numChannels; ch++) {
setChannelPercent(ch, 0);
Expand Down Expand Up @@ -72,18 +77,18 @@ void PPMEncoder::interrupt() {

if (state) {
digitalWrite(outputPin, onState);
OCR1A = PPM_PULSE_LENGTH_uS * 2;
OCR1A = PPM_PULSE_LENGTH_uS * clockMultiplier;

} else {
digitalWrite(outputPin, offState);

if (currentChannel >= numChannels) {
currentChannel = 0;
elapsedUs = elapsedUs + PPM_PULSE_LENGTH_uS;
OCR1A = (PPM_FRAME_LENGTH_uS - elapsedUs) * 2;
OCR1A = (PPM_FRAME_LENGTH_uS - elapsedUs) * clockMultiplier;
elapsedUs = 0;
} else {
OCR1A = (channels[currentChannel] - PPM_PULSE_LENGTH_uS) * 2;
OCR1A = (channels[currentChannel] - PPM_PULSE_LENGTH_uS) * clockMultiplier;
elapsedUs = elapsedUs + channels[currentChannel];

currentChannel++;
Expand Down
2 changes: 2 additions & 0 deletions src/PPMEncoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class PPMEncoder {
byte outputPin;
boolean state;
boolean enabled;
uint8_t clockMultiplier;

uint8_t onState;
uint8_t offState;
Expand All @@ -38,6 +39,7 @@ class PPMEncoder {
void begin(uint8_t pin);
void begin(uint8_t pin, uint8_t ch);
void begin(uint8_t pin, uint8_t ch, boolean inverted);
void begin(uint8_t pin, uint8_t ch, boolean inverted, boolean is16MHz);

void disable();
void enable();
Expand Down