fixes compatibility problem with latest j5

Author: achingbrain

exercises/fire_alarm/exercise.js

@@ -1,6 +1,7 @@
 var proxyquire = require('proxyquire')
 var five = require('../../stubs/five')
 var expect = require('chai').expect
+var async = require('async')
 
 var exercise = require('workshopper-exercise')()
 var filecheck = require('workshopper-exercise/filecheck')
@@ -134,129 +135,131 @@ function testAlarmResets (analogReadListener, io, cb) {
 
   analogReadListener(random(tempToVoltage(50.1), tempToVoltage(100)))
 
-  // Within 2 seconds, the piezo should have sounded and the LED turned on
-  setTimeout(function () {
-    try {
-      expect(io.digitalWrite.calledWith(pins.piezo, io.HIGH), 'Piezo was not turned on when fire started').to.be.true
-      expect(io.digitalWrite.calledWith(pins.led, io.HIGH), 'LED was not turned on when fire started').to.be.true
-    } catch (er) {
-      return cb(er)
-    }
+  var lastLedLowCall, lastLedHighCall, digitalReadListener
 
-    // Get the digital read listener for the button
-    var digitalReadListener = null
+  var tests = [
+    function(callback) {
+      try {
+        expect(io.digitalWrite.calledWith(pins.piezo, io.HIGH), 'Piezo was not turned on when fire started').to.be.true
+        expect(io.digitalWrite.calledWith(pins.led, io.HIGH), 'LED was not turned on when fire started').to.be.true
+      } catch (er) {
+        return callback(er)
+      }
 
-    for (var i = 0; i < io.digitalRead.callCount; i++) {
-      var call = io.digitalRead.getCall(i)
-      if (call.args[0] === pins.btn) {
-        digitalReadListener = call.args[1]
-        break
+      // Get the digital read listener for the button
+      for (var i = 0; i < io.digitalRead.callCount; i++) {
+        var call = io.digitalRead.getCall(i)
+        if (call.args[0] === pins.btn) {
+          digitalReadListener = call.args[1]
+          break
+        }
       }
-    }
 
-    // Push the button
-    digitalReadListener(1)
+      // Push the button
+      digitalReadListener(1)
 
-    // Buttons have a 7ms debounce
-    setTimeout(function () {
+      // Buttons have a 7ms debounce
+      setTimeout(callback, 100)
+    },
+    function(callback) {
+      // release the button
       digitalReadListener(0)
 
-      // Within 2 seconds the last call to digitalWrite should have been with io.LOW
-      setTimeout(function () {
-        try {
-          expect(
-            io.digitalWrite.calledWith(pins.piezo, io.LOW),
-            'Piezo was not turned off when reset button pressed'
-          ).to.be.true
+      setTimeout(callback, 100)
+    },
+    function(callback) {
+      try {
+        expect(
+          io.digitalWrite.calledWith(pins.piezo, io.LOW),
+          'Piezo was not turned off when reset button pressed'
+        ).to.be.true
+
+        expect(
+          io.digitalWrite.calledWith(pins.led, io.LOW),
+          'LED was not turned off when reset button pressed'
+        ).to.be.true
+      } catch (er) {
+        return callback(er)
+      }
 
-          expect(
-            io.digitalWrite.calledWith(pins.led, io.LOW),
-            'LED was not turned off when reset button pressed'
-          ).to.be.true
-        } catch (er) {
-          return cb(er)
-        }
+      //var lastPiezoLowCall = lastCallWith(io.digitalWrite, pins.piezo, io.LOW)
+      lastLedLowCall = lastCallWith(io.digitalWrite, pins.led, io.LOW)
+
+      // After 2 more seconds the last piezo/led low call should still have been before the last piezo/led high call
+      setTimeout(callback, 2000)
+    },
+    function(callback) {
+      //var lastPiezoHighCall = lastCallWith(io.digitalWrite, pins.piezo, io.HIGH)
+      lastLedHighCall = lastCallWith(io.digitalWrite, pins.led, io.HIGH)
 
-        //var lastPiezoLowCall = lastCallWith(io.digitalWrite, pins.piezo, io.LOW)
-        var lastLedLowCall = lastCallWith(io.digitalWrite, pins.led, io.LOW)
-
-        // After 2 more seconds the last piezo/led low call should still have been before the last piezo/led high call
-        setTimeout(function () {
-          //var lastPiezoHighCall = lastCallWith(io.digitalWrite, pins.piezo, io.HIGH)
-          var lastLedHighCall = lastCallWith(io.digitalWrite, pins.led, io.HIGH)
-
-          try {
-            // TODO: We can't currently test this as there is no way to stop a piezo from playing a tune
-            /*expect(
-              lastPiezoLowCall.calledAfter(lastPiezoHighCall),
-              'Piezo was not turned off after it was turned on and reset button pressed'
-            ).to.be.true*/
-
-            expect(
-              lastLedLowCall.calledAfter(lastLedHighCall),
-              'LED was not turned off after it was turned on and reset button pressed'
-            ).to.be.true
-          } catch (er) {
-            return cb(er)
-          }
-
-          io.digitalWrite.reset()
-
-          // When a new fire temperature is received, the alarm shouldn't turn on
-          analogReadListener(random(tempToVoltage(50.1), tempToVoltage(100)))
-
-          setTimeout(function () {
-            try {
-              expect(
-                io.digitalWrite.calledWith(pins.piezo, io.HIGH),
-                'Piezo turned back on after reset button pressed before temperature dropped below 50'
-              ).to.be.false
-
-              expect(io.digitalWrite.calledWith(pins.led, io.HIGH),
-                'LED turned back on after reset button pressed before temperature dropped below 50'
-              ).to.be.false
-            } catch (er) {
-              return cb(er)
-            }
-
-            // When the temp drops below 50 and then above 50, the alarm should turn on
-            analogReadListener(random(tempToVoltage(0), tempToVoltage(50)))
-
-            setTimeout(function () {
-              analogReadListener(random(tempToVoltage(50.1), tempToVoltage(100)))
-
-              setTimeout(function () {
-                try {
-                  expect(
-                    io.digitalWrite.calledWith(pins.piezo, io.HIGH),
-                    'Piezo was not turned on when fire started after reset button was pressed'
-                  ).to.be.true
-
-                  expect(
-                    io.digitalWrite.calledWith(pins.led, io.HIGH),
-                    'LED was not turned on when fire started after reset button was pressed'
-                  ).to.be.true
-
-                  // Reset
-                  analogReadListener(random(tempToVoltage(0), tempToVoltage(50)))
-                  setTimeout(cb, 2000)
-
-                } catch (er) {
-                  return cb(er)
-                }
-              }, 2000)
-
-            }, 2000)
-
-          }, 2000)
-
-        }, 2000)
+      try {
+        // TODO: We can't currently test this as there is no way to stop a piezo from playing a tune
+        /*expect(
+          lastPiezoLowCall.calledAfter(lastPiezoHighCall),
+          'Piezo was not turned off after it was turned on and reset button pressed'
+        ).to.be.true*/
+
+        expect(
+          lastLedLowCall.calledAfter(lastLedHighCall),
+          'LED was not turned off after it was turned on and reset button pressed'
+        ).to.be.true
+      } catch (er) {
+        return callback(er)
+      }
 
-      }, 2000)
+      io.digitalWrite.reset()
 
-    }, 10)
+      // When a new fire temperature is received, the alarm shouldn't turn on
+      analogReadListener(random(tempToVoltage(50.1), tempToVoltage(100)))
 
-  }, 2000)
+      setTimeout(callback, 2000)
+    },
+    function(callback) {
+      try {
+        expect(
+          io.digitalWrite.calledWith(pins.piezo, io.HIGH),
+          'Piezo turned back on after reset button pressed before temperature dropped below 50'
+        ).to.be.false
+
+        expect(io.digitalWrite.calledWith(pins.led, io.HIGH),
+          'LED turned back on after reset button pressed before temperature dropped below 50'
+        ).to.be.false
+      } catch (er) {
+        return callback(er)
+      }
+
+      // When the temp drops below 50 and then above 50, the alarm should turn on
+      analogReadListener(random(tempToVoltage(0), tempToVoltage(50)))
+
+      setTimeout(callback, 2000)
+    },
+    function(callback) {
+      analogReadListener(random(tempToVoltage(50.1), tempToVoltage(100)))
+
+      setTimeout(callback, 2000)
+    },
+    function(callback) {
+      try {
+        expect(
+          io.digitalWrite.calledWith(pins.piezo, io.HIGH),
+          'Piezo was not turned on when fire started after reset button was pressed'
+        ).to.be.true
+
+        expect(
+          io.digitalWrite.calledWith(pins.led, io.HIGH),
+          'LED was not turned on when fire started after reset button was pressed'
+        ).to.be.true
+
+        // Reset
+        analogReadListener(random(tempToVoltage(0), tempToVoltage(50)))
+      } catch (er) {
+        return callback(er)
+      }
+
+      setTimeout(callback, 2000)
+    }]
+
+    setTimeout(async.series.bind(null, tests, cb), 2000)
 }
 
 function lastCallWith (spy/*, arg0, arg1...*/) {

exercises/fire_alarm/solution/solution.js

@@ -19,9 +19,9 @@ board.on('ready', function () {
     isOnFire = true
 
     led.strobe(1000)
-    piezo.tone(five.Piezo.Notes.c, 750)
+    piezo.tone(five.Piezo.Notes.c4, 750)
     sirenInterval = setInterval(function () {
-      piezo.tone(five.Piezo.Notes.c, 750)
+      piezo.tone(five.Piezo.Notes.c4, 750)
     }, 1000)
   }