|
@@ -10,6 +10,8 @@ const int MAXBRIGHTNESS = 80;
|
|
|
const int leftFSRSimPin = A7;
|
|
|
const int rightFSRSimPin = A0;
|
|
|
|
|
|
+const int buzzerPin = 9;
|
|
|
+
|
|
|
/* Start Button */
|
|
|
const int leftReadyButtonPin = 13;
|
|
|
const int rightReadyButtonPin = 8;
|
|
@@ -45,6 +47,7 @@ void setup() {
|
|
|
pinMode(rightReadyButtonPin, INPUT_PULLUP);
|
|
|
pinMode(leftFSRSimPin, INPUT_PULLUP);
|
|
|
pinMode(rightFSRSimPin, INPUT_PULLUP);
|
|
|
+ pinMode(buzzerPin, OUTPUT);
|
|
|
|
|
|
Serial.println("Testing Solids");
|
|
|
rightRing.init_solid(DARKRED, MAXBRIGHTNESS);
|
|
@@ -59,17 +62,27 @@ void setup() {
|
|
|
|
|
|
void loop() {
|
|
|
static unsigned long last_random_check = millis();
|
|
|
+ static unsigned long start = millis();
|
|
|
+ static unsigned long wasaction = false;
|
|
|
|
|
|
rightRing.tick();
|
|
|
leftRing.tick();
|
|
|
+ if(wasaction == true && rightRing.action == Idle) {
|
|
|
+ // we just came off an action
|
|
|
+ Serial.print("Action finished. Duration = "); Serial.println(millis() - start);
|
|
|
+ wasaction = false;
|
|
|
+ }
|
|
|
+ if(rightRing.action != Idle) { wasaction = true; }
|
|
|
|
|
|
if(button_pressed(rightFSRButton)) {
|
|
|
Serial.println("Right button pressed. Switching.");
|
|
|
+ //start = millis();
|
|
|
//rightRing.init_pulse(random(0, 0xFFFFFF), 255, 2000);
|
|
|
//rightRing.init_pulse(DARKRED, MAXBRIGHTNESS, 2000);
|
|
|
//rightRing.init_spin(DARKRED, DARKGREEN);
|
|
|
//rightRing.init_flip(DARKRED, DARKGREEN);
|
|
|
//rightRing.init_slowroll(DARKRED, DARKGREEN);
|
|
|
+ //rightRing.init_pulse_and_beep(random(0, 0xFFFFFF + 1), 80, 400, buzzerPin, 3700, 100);
|
|
|
rightRing.random_event();
|
|
|
}
|
|
|
|
|
@@ -80,6 +93,7 @@ void loop() {
|
|
|
//leftRing.init_spin(DARKGREEN, DARKRED);
|
|
|
//leftRing.init_flip(DARKGREEN, DARKRED);
|
|
|
//leftRing.init_slowroll(DARKGREEN, DARKRED);
|
|
|
+ //rightRing.init_pulse_and_beep(random(0, 0xFFFFFF + 1), 80, 400, buzzerPin, 0, 100);
|
|
|
leftRing.random_event();
|
|
|
}
|
|
|
|