Skip to content

Auto detect PWM_MAX_INPUT_US so it's not hardcoded to a single frequency #1

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
jacobalberty wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Auto detect PWM_MAX_INPUT_US so it's not hardcoded to a single frequency #1

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb1b7f9
Auto detect PWM_MAX_INPUT_US so it's not hardcoded to a single frequency
Jun 8, 2020
cc91c95
Apply a fudge factor to the MAX_INPUT_PWM_US so we can go for "full" …
Jun 8, 2020
68f1c05
Store micros() in a local variable in rising()
Jun 8, 2020
03f22a4
Storing micros() locally broke things for some reason.
Jun 8, 2020
6e9d21a
Use volatile for MAX_PWM_INPUT_US
Jun 8, 2020
fe567d9
store micros() in an unsigned long local variable instead of calling …
Jun 8, 2020
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
10 changes: 8 additions & 2 deletions Router_PID/Router_PID.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ double Kd=0.025;
PID myPID(&Input, &Output, &Setpoint, Kp, Ki, Kd, DIRECT); // PID library

const int MAX_TOOL_RPM = 30000; // SETTINGS per "spindle" ?1k headroom needed?
const int MAX_PWM_INPUT_US = 2024; // Settings the microseconds of the max PWM from Marlin.
volatile int MAX_PWM_INPUT_US = -1; // Settings the microseconds of the max PWM from Marlin.

void setup()
{
Expand Down Expand Up @@ -84,6 +84,8 @@ void loop() {
pwm_value = 0; // Reset PID
analogWrite(ROUTER_PWM_OUTPIN, 0); // Turn off Spindle AC
rpm_value = US_PERIOD_TO_RPM; // Disregards the spindown but clears the PID
MAX_PWM_INPUT_US = -1; // Reset detected maximum input pulse to autodetect again.
prev_time = 0;
}
else { // If spindle is enabled write PID value to triac
triac_scaled = map(Output, 0, 255, 0, 255); // Traic scaling 20-240 not needed? test/tune
Expand Down Expand Up @@ -130,8 +132,12 @@ void spindleRPM() {
// rising() is called on the rising edge of the PHOTO_PIN. Basically starts the timer for measuring the
// PWM duty cycle. ISR.
void rising() {
unsigned long new_pulse = micros();
// Capture when this is rising.
prev_time = micros();
if (MAX_PWM_INPUT_US == -1 && prev_time != 0) {
MAX_PWM_INPUT_US = (new_pulse-prev_time)*.99;
}
prev_time = new_pulse;

// Set the next interrupt.
attachInterrupt(digitalPinToInterrupt(PWM_PIN), falling, FALLING);
Expand Down