Merge branch 'timerisr'

bme280.ino

@@ -0,0 +1,23 @@
+#include "Seeed_BME280.h"
+
+BME280 sensor;
+float highTemp = 0.0, lowTemp = 0.0;
+const float blindZone = 0.03;
+
+void initBME280() {
+  sensor.init();
+}
+
+void readTemperature() {
+  float newTemperature = sensor.getTemperature();
+
+  if (newTemperature > highTemp) {
+    temperature = newTemperature;
+    highTemp = newTemperature;
+    lowTemp = highTemp - blindZone;
+  } else if (newTemperature < lowTemp) {
+    temperature = newTemperature;
+    lowTemp = newTemperature;
+    highTemp = lowTemp + blindZone;
+  };
+}

button.ino

@@ -1,11 +1,24 @@
 volatile unsigned long lastButtonPress = millis();
 
+// Debouncing na timerze:
+// https://github.com/khoih-prog/TimerInterrupt/blob/master/examples/SwitchDebounce/SwitchDebounce.ino
+void initButton() {
+  pinMode(BUTTON_PIN, INPUT_PULLUP);
+  // Order of ISRs matter: RISING should be invoked first
+  attachInterrupt(digitalPinToInterrupt(BUTTON_PIN), buttonISRtime, CHANGE);
+  attachInterrupt(digitalPinToInterrupt(BUTTON_PIN), buttonISRstate, RISING);  
+}
+
 void buttonISRstate() {
   if ((millis() - lastButtonPress) > 100) {
-    if (countdown > 0)
+    if (countdown < 0)
       countdown = 0;
-    else
+    else if (countdown == 0)
-      countdown = BREAK_LENGTH;
+      countdown = COUNTDOWN;
+    else {
+      countdown = -1;
+      digitalWrite(BUTTON_LED_PIN, LOW);
+    }
   }
 }
 

buzzer.ino

@@ -0,0 +1,22 @@
+SAMDTimer BuzzerTimer(TIMER_TC5);
+
+bool attached = false;
+
+void initBuzzer() {
+  pinMode(BUZZER_PIN, OUTPUT);
+}
+
+void buzzerISR() {
+  digitalWrite(BUZZER_PIN, !digitalRead(BUZZER_PIN));
+}
+
+void buzz() {
+  if (attached)
+    BuzzerTimer.enableTimer();
+  else
+    BuzzerTimer.attachInterrupt(BUZZER_FREQ *2, buzzerISR);
+}
+
+void noBuzz() {
+  BuzzerTimer.disableTimer();
+}

metronom.ino

@@ -1,32 +1,50 @@
+#include "SAMDTimerInterrupt.h"
+#include "SAMD_ISR_Timer.h"
+
+SAMDTimer TaskTimer(TIMER_TC3);
+SAMD_ISR_Timer TasksISRs;
+
+void TasksHandler(void) { TasksISRs.run(); }
+
+
+const int COUNTDOWN = 240;
+const int PERIOD_MS = 1000;
+const int BUZZER_FREQ = 300;
+
+const uint BUTTON_PIN = 6;
+const uint BUTTON_LED_PIN = 5;
 const uint BUZZER_PIN = 0;
 
-const uint BUTTON_LED_PIN = 5;
+/* Metronome state is expressed by countdown:
-const uint BUTTON_PIN = 6;
+ *  -1 - IDLE
-
+ *   0 - BEATING
-const int BREAK_LENGTH = 240000;
+ *  >0 - COUNTDOWN
-const int BREAK_STEP = 2000;
+ */
-
+volatile int countdown = -1;
-volatile int countdown = 0;
+volatile float temperature = 0.0;
-int step;
 
 void setup() {
-  pinMode(BUTTON_PIN, INPUT_PULLUP);
+  initButton();
-  // Order of ISRs matter: RISING should be invoked first
+  initBME280();
-  attachInterrupt(digitalPinToInterrupt(BUTTON_PIN), buttonISRtime, CHANGE);
+  initBuzzer();
-  attachInterrupt(digitalPinToInterrupt(BUTTON_PIN), buttonISRstate, RISING);
+  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);
 }
 
-void loop() {
+void runMetronome() {
   if (countdown > 0) {
-    step = min(BREAK_STEP, countdown);
+    countdown -= 1;
-    countdown -= step;
+
-    
+    digitalWrite(BUTTON_LED_PIN, countdown % 2 ? HIGH : LOW);
-    digitalWrite(BUTTON_LED_PIN, HIGH);
+  } else if (countdown == 0) {
-    delay(min(BREAK_STEP/2, step));
+    TasksISRs.setTimeout(100, noBuzz);
-    digitalWrite(BUTTON_LED_PIN, LOW);
+    buzz();
-    delay(max(step-BREAK_STEP/2, 0));
-  } else {
-    tone(BUZZER_PIN, 300, 100);
-    delay(1000);
   }
 }
+
+void loop() {}

tube.ino

@@ -0,0 +1,30 @@
+#include "grove_alphanumeric_display.h"
+
+Seeed_Digital_Tube tube;
+char tubeText[5] = "";
+
+void initTube() {
+  // Wire initialized by BME280 sensor
+  tube.setTubeType(TYPE_4, TYPE_4_DEFAULT_I2C_ADDR);
+  tube.setBrightness(15);
+  tube.setBlinkRate(BLINK_OFF);
+}
+
+void updateTube() {
+  char newText[5];
+  bool highPoint = false, lowPoint = false;
+
+  if (countdown <= 0) {
+    sprintf(newText, "%4u", (unsigned int) (temperature * 100.0));
+    lowPoint = true;
+  } else {
+    sprintf(newText, "%4u", countdown);
+  }
+
+  if (strcmp(tubeText, newText)) {
+    strcpy(tubeText, newText);
+    tube.displayString(tubeText);
+    tube.setPoint(highPoint, lowPoint);
+    tube.display();
+  }
+}