Display also humidity and pressure

Display update triggered by value change, not interval
This commit is contained in:
cryptogopher
2026-02-12 00:10:45 +01:00
parent 0c9a7a51d9
commit c2af98d588
5 changed files with 116 additions and 33 deletions

View File

@@ -4,24 +4,52 @@
SAMDTimer TaskTimer(TIMER_TC3);
SAMD_ISR_Timer TasksISRs;
void TasksHandler(void) { TasksISRs.run(); }
enum {
TEMPERATURE = 0,
HUMIDITY,
PRESSURE,
SENSORS
};
// COUNTDOWN is effectively multiplied by METRONOME_INTERVAL
const int COUNTDOWN = 600;
const int PERIOD_MS = 1000;
const int BUZZER_FREQ = 300;
// INTERVALS and TIMESHARES given in [ms]
const uint TASK_HANDLER_INTERVAL = 20;
const uint METRONOME_INTERVAL = 1000;
const uint SENSOR_INTERVAL = 1000;
const uint SENSOR_TIMESHARE[SENSORS] = {90000, 20000, 10000};
// FREQUENCY in [Hz]
const uint BUZZER_FREQ = 300;
const uint BUTTON_PIN = 6;
const uint BUTTON_LED_PIN = 5;
const uint BUZZER_PIN = 0;
/* Metronome state is expressed by countdown:
* -1 - IDLE
* 0 - BEATING
* >0 - COUNTDOWN
*/
-1 - IDLE
0 - BEATING
>0 - COUNTDOWN
Unless metronome is in COUNTDOWN mode, display rotates through sensor readings.
*/
volatile int countdown = -1;
volatile float temperature = 0.0;
// Units: temperature [C], humidity [%], pressure [P]
volatile float sensorValue[SENSORS] = {};
volatile uint displaySensor = TEMPERATURE;
volatile bool displayNeedsUpdate = false;
volatile bool tubeRotated = false;
int tubeTimerID;
void TasksHandler(void) {
TasksISRs.run();
if (displayNeedsUpdate || tubeRotated)
updateTube();
if (tubeRotated) {
TasksISRs.changeInterval(tubeTimerID, SENSOR_TIMESHARE[displaySensor]);
tubeRotated = false;
}
}
void setup() {
initButton();
@@ -29,11 +57,13 @@ void setup() {
initBuzzer();
initTube();
TaskTimer.attachInterruptInterval_MS(20, TasksHandler);
TasksISRs.setInterval(PERIOD_MS, runMetronome);
TasksISRs.setInterval(PERIOD_MS, readTemperature);
// TODO: move display from ISR to loop()
TasksISRs.setInterval(200, updateTube);
readSensors();
updateTube();
TaskTimer.attachInterruptInterval_MS(TASK_HANDLER_INTERVAL, TasksHandler);
TasksISRs.setInterval(METRONOME_INTERVAL, runMetronome);
TasksISRs.setInterval(SENSOR_INTERVAL, readSensors);
tubeTimerID = TasksISRs.setInterval(SENSOR_TIMESHARE[displaySensor], rotateTube);
}
void runMetronome() {
@@ -41,6 +71,8 @@ void runMetronome() {
countdown -= 1;
digitalWrite(BUTTON_LED_PIN, countdown % 2 ? HIGH : LOW);
displayNeedsUpdate = true;
} else if (countdown == 0) {
TasksISRs.setTimeout(100, noBuzz);
buzz();