adebaumann/arduino_gauge_controller
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gauges take precedence over LEDs.

Browse Source
This commit is contained in:
Adrian A. Baumann
2026-05-03 14:18:54 +02:00
parent aa029587a4
commit 5656986768
1 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Gaugecontroller_no_VFD/Gaugecontroller_no_VFD.ino
View File

@@ -13,10 +13,13 @@ static const uint8_t LED_DATA_PIN = 22;
static const uint8_t INDICATOR_LED_DATA_PIN = 36; static const uint8_t INDICATOR_LED_DATA_PIN = 36;
static const uint8_t BREATHE_FRAME_MS = 16; static const uint8_t BREATHE_FRAME_MS = 16;
static const uint8_t LED_SHOW_MIN_INTERVAL_MS = 16; static const uint8_t LED_SHOW_MIN_INTERVAL_MS = 16;
static const uint8_t LED_SHOW_MOTION_INTERVAL_MS = 50;
static const uint8_t RX_LINE_MAX = 120; static const uint8_t RX_LINE_MAX = 120;
static const uint16_t STEPPER_TIMER_HZ = 20000; static const uint16_t STEPPER_TIMER_HZ = 20000;
static const uint8_t STEPPER_TIMER_PRESCALER = 8; static const uint8_t STEPPER_TIMER_PRESCALER = 8;
static const uint32_t STEPPER_RATE_SCALE = 65536UL; static const uint32_t STEPPER_RATE_SCALE = 65536UL;
static const uint32_t LED_SHOW_FULL_RATE_LIMIT_Q16 = (500UL * STEPPER_RATE_SCALE) / STEPPER_TIMER_HZ;
static const uint32_t LED_SHOW_PAUSE_RATE_Q16 = (1500UL * STEPPER_RATE_SCALE) / STEPPER_TIMER_HZ;
// For now, command and debug traffic share the same serial port. // For now, command and debug traffic share the same serial port.
#define CMD_PORT Serial1 #define CMD_PORT Serial1
@@ -160,6 +163,7 @@ BlinkState blinkState[TOTAL_LEDS];
bool mainLedsDirty = false; bool mainLedsDirty = false;
bool indicatorLedsDirty = false; bool indicatorLedsDirty = false;
unsigned long lastLedShowMs = 0; unsigned long lastLedShowMs = 0;
bool showIndicatorStripNext = false;
// FastLED drives the shared strip as RGB. Each gauge's ledOrder string marks per-LED // FastLED drives the shared strip as RGB. Each gauge's ledOrder string marks per-LED
// type ('R' = RGB, 'G' = GRB); writes to GRB-ordered LEDs pre-swap R and G to compensate. // type ('R' = RGB, 'G' = GRB); writes to GRB-ordered LEDs pre-swap R and G to compensate.
@@ -192,20 +196,48 @@ inline CRGB readLed(uint8_t globalIdx) {
return logicalLeds[globalIdx]; return logicalLeds[globalIdx];
} }
uint32_t maxStepperRateQ16() {
uint32_t maxRate = 0;
uint8_t oldSreg = SREG;
cli();
for (uint8_t i = 0; i < GAUGE_COUNT; i++) {
uint32_t rate = steppers[i].rateQ16;
if (steppers[i].enabled && steppers[i].dir != 0 && rate > maxRate) {
maxRate = rate;
}
}
SREG = oldSreg;
return maxRate;
}
void showDirtyLeds() { void showDirtyLeds() {
if (!mainLedsDirty && !indicatorLedsDirty) return; if (!mainLedsDirty && !indicatorLedsDirty) return;
unsigned long nowMs = millis(); uint32_t maxStepRate = maxStepperRateQ16();
if (nowMs - lastLedShowMs < LED_SHOW_MIN_INTERVAL_MS) return; if (maxStepRate >= LED_SHOW_PAUSE_RATE_Q16) return;
if (mainLedsDirty && mainLedController != nullptr) { unsigned long nowMs = millis();
mainLedController->showLeds(255); uint8_t intervalMs = (maxStepRate > LED_SHOW_FULL_RATE_LIMIT_Q16)
mainLedsDirty = false; ? LED_SHOW_MOTION_INTERVAL_MS
} : LED_SHOW_MIN_INTERVAL_MS;
if (indicatorLedsDirty && indicatorLedController != nullptr) { if (nowMs - lastLedShowMs < intervalMs) return;
if (showIndicatorStripNext && indicatorLedsDirty && indicatorLedController != nullptr) {
indicatorLedController->showLeds(255); indicatorLedController->showLeds(255);
indicatorLedsDirty = false; indicatorLedsDirty = false;
showIndicatorStripNext = false;
} else if (mainLedsDirty && mainLedController != nullptr) {
mainLedController->showLeds(255);
mainLedsDirty = false;
showIndicatorStripNext = true;
} else if (indicatorLedsDirty && indicatorLedController != nullptr) {
indicatorLedController->showLeds(255);
indicatorLedsDirty = false;
showIndicatorStripNext = false;
} else {
return;
} }
lastLedShowMs = nowMs; lastLedShowMs = nowMs;
} }