seb/saltylab-firmware
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix: Status LEDs solid=OK blink=error (#22)' (#26) from sl-firmware/status-leds into main

Browse Source
This commit is contained in:
seb 2026-02-28 18:45:24 -05:00
commit e1b82941ea
3 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/status.h
View File

@ -3,5 +3,17 @@
#include <stdint.h> #include <stdint.h>
void status_init(void); void status_init(void);
void status_boot_beep(void); void status_boot_beep(void);
void status_update(uint32_t tick, int imu_ok, int baro_ok); /*
* status_update() — call every main loop iteration.
* Controls LED1 (PC15) and LED2 (PC14), both active-low.
*
* Solid ON = good (normal operation)
* Slow blink (~1 Hz) = needs attention (error or fault)
*
* LED1 solid + LED2 off → disarmed, IMU OK
* LED1 solid + LED2 solid → armed
* Both slow blink → tilt fault
* LED1 slow blink + LED2 solid → IMU error (solid LED2 = always-on indicator)
*/
void status_update(uint32_t tick, int imu_ok, int armed, int tilt_fault);
#endif #endif

4
src/main.c
View File

@ -232,7 +232,9 @@ int main(void) {
CDC_Transmit((uint8_t *)buf, len); CDC_Transmit((uint8_t *)buf, len);
} }
status_update(now, (imu_ret == 0), (bal.state == BALANCE_ARMED)); status_update(now, (imu_ret == 0),
(bal.state == BALANCE_ARMED),
(bal.state == BALANCE_TILT_FAULT));
HAL_Delay(1); HAL_Delay(1);
} }
} }

35
src/status.c
View File

@ -42,26 +42,25 @@ void status_boot_beep(void) {
HAL_GPIO_WritePin(BEEPER_PORT, BEEPER_PIN, GPIO_PIN_RESET); HAL_GPIO_WritePin(BEEPER_PORT, BEEPER_PIN, GPIO_PIN_RESET);
} }
void status_update(uint32_t tick, int imu_ok, int baro_ok) { void status_update(uint32_t tick, int imu_ok, int armed, int tilt_fault) {
if (imu_ok) { /* Solid = good, blink = needs attention (1 Hz, 500ms half-period) */
/* Slow blink LED1 at 1Hz */ GPIO_PinState blink = ((tick / 500) % 2) ? GPIO_PIN_RESET /* ON half */
if ((tick / 500) % 2) : GPIO_PIN_SET; /* OFF half */
HAL_GPIO_WritePin(LED1_PORT, LED1_PIN, GPIO_PIN_RESET); /* ON */ if (!imu_ok) {
else /* IMU error: LED1 blinking (attention), LED2 solid ON */
HAL_GPIO_WritePin(LED1_PORT, LED1_PIN, GPIO_PIN_SET); /* OFF */ HAL_GPIO_WritePin(LED1_PORT, LED1_PIN, blink);
/* LED2: quick flash every 5s if baro OK */
if (baro_ok && (tick % 5000) < 100)
HAL_GPIO_WritePin(LED2_PORT, LED2_PIN, GPIO_PIN_RESET); HAL_GPIO_WritePin(LED2_PORT, LED2_PIN, GPIO_PIN_RESET);
else } else if (tilt_fault) {
HAL_GPIO_WritePin(LED2_PORT, LED2_PIN, GPIO_PIN_SET); /* Tilt fault: both LEDs slow blink */
} else { HAL_GPIO_WritePin(LED1_PORT, LED1_PIN, blink);
/* Fast blink LED1 at 5Hz = error */ HAL_GPIO_WritePin(LED2_PORT, LED2_PIN, blink);
if ((tick / 100) % 2) } else if (armed) {
/* Armed: both LEDs solid ON */
HAL_GPIO_WritePin(LED1_PORT, LED1_PIN, GPIO_PIN_RESET); HAL_GPIO_WritePin(LED1_PORT, LED1_PIN, GPIO_PIN_RESET);
else
HAL_GPIO_WritePin(LED1_PORT, LED1_PIN, GPIO_PIN_SET);
/* LED2 solid ON */
HAL_GPIO_WritePin(LED2_PORT, LED2_PIN, GPIO_PIN_RESET); HAL_GPIO_WritePin(LED2_PORT, LED2_PIN, GPIO_PIN_RESET);
} else {
/* Normal disarmed: LED1 solid ON, LED2 off */
HAL_GPIO_WritePin(LED1_PORT, LED1_PIN, GPIO_PIN_RESET);
HAL_GPIO_WritePin(LED2_PORT, LED2_PIN, GPIO_PIN_SET);
} }
} }