denko 0.13.1 → 0.13.3

data/src/denko_wifi.ino

@@ -1,3 +1,25 @@
+// NOTE!!!
+// For some boards the standard <WiFi.h> header file does not work.
+//
+// Make sure to define:
+// WIFI_101 if using the WiFi Shield 101, or any board that uses the ATWINC1500 for Wi-Fi.
+// WIFI_NINA if using any board with the NINA-W102 WiFi chip.
+//
+// Some known boards are handled automatically.
+//
+// #define WIFI_101
+// #define WIFI_NINA
+
+// WiFi101 Boards
+#ifdef ARDUINO_SAMD_MKR1000
+  #define WIFI_101
+#endif
+
+// Nina WiFi Boards
+#if defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_AVR_UNO_WIFI_REV2) || defined(ARDUINO_SAMD_NANO_33_IOT)
+  #define WIFI_NINA
+#endif
+
 #include "Denko.h"
 #if defined(ESP8266)
   #include <ESP8266WiFi.h>
@@ -12,21 +34,17 @@
   // #include <ArduinoOTA.h>
   #define WIFI_STATUS_LED 2
 #else
-  #include <SPI.h>
-  #include <WiFi.h>
   #define WIFI_STATUS_LED 13
-#endif
-
-
-// Define 'serial' as the serial interface to use.
-// Uses SerialUSB (left port), which is native USB, on Arduino Due and Zero, or Serial otherwise.
-// On many boards, eg. Arduino Due, RP2040, Serial may be native USB anyway.
-#if defined(__SAM3X8E__) || defined(__SAMD21G18A__)
-  #define serial SerialUSB
-  // Use this for Programming USB port (right) on Due and Zero.
-  // #define serial Serial
-#else
-  #define serial Serial
+  #if defined(WIFI_101)
+    #include <WiFi101.h>
+  #elif defined(WIFI_NINA)
+    #include <WiFiNINA.h>
+  #elif defined(ARDUINO_UNOWIFIR4)
+    #include <WiFiS3.h>
+  #else
+    #include <SPI.h>
+    #include <WiFi.h>
+  #endif
 #endif
 
 // Configure your WiFi options here. IP address is not configurable. Uses DHCP.
@@ -50,16 +68,21 @@ void indicateWiFi(byte value) {
 }
 
 void printWifiStatus() {
-  serial.println("WiFi Connected");
-  serial.print("SSID: ");
-  serial.println(WiFi.SSID());
-  serial.print("Signal Strength (RSSI):");
-  serial.print(WiFi.RSSI());
-  serial.println(" dBm");
-  serial.print("IP Address: ");
-  serial.println(WiFi.localIP());
-  serial.print("Denko TCP Port: ");
-  serial.println(port);
+  DENKO_SERIAL_IF.println("WiFi Connected");
+  DENKO_SERIAL_IF.print("SSID: ");
+  DENKO_SERIAL_IF.println(WiFi.SSID());
+  DENKO_SERIAL_IF.print("Signal Strength (RSSI):");
+  DENKO_SERIAL_IF.print(WiFi.RSSI());
+  DENKO_SERIAL_IF.println(" dBm");
+  DENKO_SERIAL_IF.print("IP Address: ");
+  #ifdef WIFI_101
+    IPAddress ip = WiFi.localIP();
+    DENKO_SERIAL_IF.println(ip);
+  #else
+    DENKO_SERIAL_IF.println(WiFi.localIP());
+  #endif
+  DENKO_SERIAL_IF.print("Denko TCP Port: ");
+  DENKO_SERIAL_IF.println(port);
   indicateWiFi(true);
 }
 
@@ -70,37 +93,29 @@ void connect(){
   #endif
 
   // Try to connect.
-  serial.print("Connecting to WiFi ");
+  DENKO_SERIAL_IF.print("Connecting to WiFi ");
   WiFi.begin(ssid, pass);
 
   // Delay until connected.
   while (WiFi.status() != WL_CONNECTED) {
     delay(500);
-    serial.print(".");
+    DENKO_SERIAL_IF.print(".");
   }
   connected = true;
+  printWifiStatus();
 }
 
 void maintainWiFi(){
-  if (connected == true){
-    if (WiFi.status() == WL_CONNECTED) return;
+  if (WiFi.status() != WL_CONNECTED) {
     connected = false;
     connect();
   }
-  if (connected == false){
-    if (WiFi.status() != WL_CONNECTED) {
-      connect();
-      return;
-    }
-    connected = true;
-    printWifiStatus();
-  }
 }
 
 void setup() {
   // Wait for serial ready.
-  serial.begin(115200);
-  while(!serial);
+  DENKO_SERIAL_IF.begin(115200);
+  while(!DENKO_SERIAL_IF);
 
   // Enable over the air updates on the ESP8266.
   #if defined(ESP8266)
@@ -117,33 +132,38 @@ void setup() {
   denko.digitalListenCallback = onDigitalListen;
   denko.analogListenCallback = onAnalogListen;
 
-  // Use serial as the denko IO stream until we get a TCP connection.
-  denko.stream = &serial;
+  // Use DENKO_SERIAL_IF as the denko IO stream until we get a TCP connection.
+  denko.stream = &DENKO_SERIAL_IF;
 }
 
 void loop() {
   // Reconnect if we've lost WiFi.
   maintainWiFi();
 
+  // Handle OTA updates.
+  #if defined(ESP8266)
+    ArduinoOTA.handle();
+  #endif
+
+  // End connection if client disconnects.
+  if (client && !client.connected()) {
+    client.stop();
+  }
+
   // Allow one client at a time to be connected. Set it as the denko IO stream.
   if (!client){
     client = server.available();
-    if (client) denko.stream = &client;
+    if (client) {
+      // TCP Client
+      denko.stream = &client;
+    } else {
+      // Serial fallback
+      denko.stream = &DENKO_SERIAL_IF;
+    }
   }
 
   // Main loop of the denko library.
   denko.run();
-
-  // End the connection when client disconnects and revert to serial IO.
-  if (client && !client.connected()){
-    client.stop();
-    denko.stream = &serial;
-  }
-
-  // Handle OTA updates.
-  #if defined(ESP8266)
-    ArduinoOTA.handle();
-  #endif
 }
 
 // This runs every time a digital pin that denko is listening to changes value.

data/src/lib/Denko.cpp

@@ -36,7 +36,7 @@ void Denko::run(){
     parse(stream->read());
     rxBytes ++;
     // Acknowledge when we've received half as many bytes as the serial buffer.
-    if (rxBytes >= rxNotifyLimit) rxNotify();
+    if (rxBytes >= DENKO_RX_ACK_INTERVAL) rxNotify();
   }
 
   #ifdef DENKO_UARTS
@@ -113,7 +113,7 @@ void Denko::process() {
     case 6:  setListener         (pin, val, auxMsg[0], auxMsg[1], false); break;
 
     // Implemented in DenkoEEPROM.cpp
-    #ifdef EEPROM_PRESENT
+    #ifdef DENKO_EEPROM
     case 7:  eepromRead           (); break;
     case 8:  eepromWrite          (); break;
     #endif
@@ -262,19 +262,27 @@ void Denko::handshake() {
   #ifdef DENKO_VERSION
     stream->print(DENKO_VERSION);
   #endif
+  
+  // Third is serial buffer size.
+  stream->print(',');
+  stream->print(DENKO_SERIAL_BUFFER_SIZE);
 
-  // Third is AUX_SIZE.
+  // Fourth is AUX_SIZE.
   stream->print(',');
   stream->print(AUX_SIZE);
   
-  // Fourth is EEPROM size in bytes. None on Due or Zero.
+  // Fifth is EEPROM size. None on Due or Zero.
   stream->print(',');
   #if defined(EEPROM_EMULATED)
   	stream->print(EMULATED_EEPROM_LENGTH);
   #elif defined(EEPROM_PRESENT)
 	  stream->print(EEPROM.length());
-  #else
-    stream->print('0');
+  #endif
+
+  // Sixth is I2C buffer size.
+  stream->print(',');
+  #ifdef DENKO_I2C
+  	stream->print(DENKO_I2C_BUFFER_SIZE);
   #endif
   
   // End

data/src/lib/Denko.h

@@ -154,6 +154,8 @@ class Denko {
     void spiClearListeners     ();
 
     // I2C
+    bool i2cStarted = false;
+    byte i2cSpeed   = 0;
     void i2cBegin              ();
     void i2cEnd                ();
     void i2cSetSpeed           (uint8_t code);
@@ -199,36 +201,23 @@ class Denko {
     // Parsed message storage.
     byte cmdStr[4]; byte cmd;
     byte pinStr[4]; byte pin;
-    byte valStr[4]; byte val;
+    byte valStr[4]; uint16_t val;
     byte auxMsg[AUX_SIZE];
 
     //
     // Flow control stuff.
     //
-    // Notify the computer when the board has received half a serial buffer of bytes.
-    //
+    // Notify computer that board has received bytes.
     void rxNotify();
     uint8_t rxBytes  = 0;
-    //
-    // ESP32 uses a 128 byte FIFO buffer for UART Rx. Notify every 63 bytes instead of 32
-    // so serial over native USB performs better.
-    //
-    // Using 63 instead of 64 since the ATmega32u4 (Leonardo) is limited to 63.
-    //
-    #ifdef ESP32
-      uint8_t rxNotifyLimit = 63;
-    #else
-      uint8_t rxNotifyLimit = 32;
-    #endif
-
     //
     // Tell the computer to halt or resume sending data to the board.
     //
-    // Only use these if running a function on the board that disables interrupts for
+    // Use these if running a function on the board that disables interrupts for
     // longer than a single serial character (~85us at 115,200 baud).
     //
     // If the function was initiated by the computer (eg. writing to a WS2812 strip), do
-    // not call sendHalt(). The computer should have halted transmission itself after sending
+    // not call sendHalt(). The computer should halt transmission itself after sending
     // the WS2812 command. Only call sendReady() after data is written out to the strip.
     //
     // If the function was initiated on the board (eg. New IR input triggered by an interrupt),

data/src/lib/DenkoCoreIO.cpp

@@ -27,8 +27,8 @@ void Denko::setMode(byte p, byte m) {
     if (m != 0b100) dacDisable(p);
   #endif
       
-  // On the SAMD21, mode needs to be INPUT when using the DAC.
-  #ifdef __SAMD21G18A__
+  // On the SAMD21 and RA4M1, mode needs to be INPUT when using the DAC.
+  #if defined(__SAMD21G18A__) || defined(_RENESAS_RA_)
     if (m == 0b100){
       pinMode(p, INPUT);
       return;
@@ -196,7 +196,7 @@ void Denko::dacWrite(byte p, int v, boolean echo) {
     ::dacWrite(p, v);
   #endif
     
-  #if defined(__SAM3X8E__) || defined(__SAMD21G18A__)
+  #if defined(__SAM3X8E__) || defined(__SAMD21G18A__) || defined(_RENESAS_RA_)
     analogWrite(p, v);
   #endif
 }

data/src/lib/DenkoDefines.h

@@ -8,6 +8,7 @@
 #define DENKO_VERSION __VERSION__
 
 // Uncomment these to include features beyond core features.
+// #define DENKO_EEPROM
 // #define DENKO_ONE_WIRE
 // #define DENKO_TONE
 // #define DENKO_SPI_BB
@@ -39,30 +40,24 @@
   #define PIN_COUNT 22
 #endif
 
-// No EEPROM on the Due or Zero.
-#if !defined(__SAM3X8E__) && !defined(__SAMD21G18A__)
-  #define EEPROM_PRESENT
-  #include <EEPROM.h>
-#endif
-
-// Emulate 512 bytes of EEPROM on ESP chips and the RP2040.
-#if defined(ESP8266) || defined(ESP32) || defined(ARDUINO_ARCH_RP2040)
-#  define EEPROM_EMULATED
-#  define EMULATED_EEPROM_LENGTH 512
-#endif
-
 // Figure out how many LEDC channels are available on ESP32 boards.
 #ifdef ESP32
-  #define LEDC_CHANNEL_COUNT 16
+  #if CONFIG_IDF_TARGET_ESP32
+    #define LEDC_CHANNEL_COUNT 16
+  #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+    #define LEDC_CHANNEL_COUNT 8
+  #elif CONFIG_IDF_TARGET_ESP32C3
+    #define LEDC_CHANNEL_COUNT 6
+  #endif
 #endif
 
 // Filter for boards that can set their analog write resolution.
-#if defined(__SAM3X8E__) || defined(__SAMD21G18A__) || defined(ESP32) || defined(ARDUINO_ARCH_RP2040) || defined(ESP8266)
+#if defined(__SAM3X8E__) || defined(__SAMD21G18A__) || defined(_RENESAS_RA_) || defined(ESP32) || defined(ARDUINO_ARCH_RP2040) || defined(ESP8266)
   #define WRITE_RESOLUTION_SETTER
 #endif
 
 // Filter for boards that can set their analog read resolution.
-#if defined(__SAM3X8E__) || defined(__SAMD21G18A__) || defined(ESP32) || defined(ARDUINO_ARCH_RP2040)
+#if defined(__SAM3X8E__) || defined(__SAMD21G18A__) || defined(_RENESAS_RA_) || defined(ESP32) || defined(ARDUINO_ARCH_RP2040)
   #define READ_RESOLUTION_SETTER
 #endif
 
@@ -70,7 +65,7 @@
 #ifdef DENKO_UART
   // Look for TX pin definitions on RP2040.
   #if defined(RP2040)
-    #if   defined(PIN_SERIAL2_TX)
+    #if defined(PIN_SERIAL2_TX)
       #define DENKO_UARTS 2
     #elif defined(PIN_SERIAL_1_TX)
       #define DENKO_UARTS 1
@@ -88,7 +83,15 @@
   #elif defined(ESP8266) && defined(SERIAL_PORT_HARDWARE_OPEN)
     #define DENKO_UARTS 1
 
-  // This works for all the Atmel cores.
+  // Define 1 UART for UNO R4 boards. Always use Serial1.
+  #elif defined(_RENESAS_RA_)
+    #define DENKO_UARTS 1
+
+  // Define 1 UART for ATmega4809.
+  #elif defined(__AVR_ATmega4809__) && defined(SERIAL_PORT_HARDWARE)
+    #define DENKO_UARTS 1
+
+  // This works for all the Atmel cores exept ATmega4809.
   #else
     #if defined(SERIAL_PORT_HARDWARE3)
       #define DENKO_UARTS 3
@@ -107,10 +110,61 @@
 // If no high usage features (core sketch), 32 + 16.
 #if !defined(DENKO_SHIFT) && !defined (DENKO_I2C) && !defined(DENKO_SPI) && !defined(DENKO_UARTS) && !defined(DENKO_UART_BB) && !defined(DENKO_IR_OUT) && !defined(DENKO_LED_ARRAY)
   #define AUX_SIZE 48
-// If using IR_OUT or LED_ARRAY, and not on the ATmega168, 512 + 16.
+// If using IR_OUT or LED_ARRAY, and not on the ATmega168, 768 + 16.
 #elif (defined(DENKO_IR_OUT) || defined(DENKO_LED_ARRAY)) && !defined(__AVR_ATmega168__)
-  #define AUX_SIZE 528
+  #define AUX_SIZE 784
 // Default aux message size to 256 + 16 bytes.
 #else
   #define AUX_SIZE 272
 #endif
+
+// Define 'DENKO_SERIAL_IF' as the serial interface to use.
+// Uses SerialUSB (left port), which is native USB, on Arduino Due & Zero, or Serial otherwise.
+// On many boards, eg. Arduino Leonardo, RP2040, ESP32-S3, Serial is native USB regardless.
+#if defined(__SAM3X8E__) || defined(__SAMD21G18A__)
+  #define DENKO_SERIAL_IF SerialUSB
+  #define DENKO_USB_CDC
+  // To use programming USB (right) on Due and Zero, comment 2 lines above, uncomment 1 line below.
+  // #define DENKO_SERIAL_IF Serial
+#else
+  #define DENKO_SERIAL_IF Serial
+#endif
+
+// Figure out how much serial buffer we have, tell the computer, and set the ack interval.
+// Best performance acknowledging at 64 bytes, or 32 if buffer is only 64.
+//
+// These are 256/64 regardless of whether native USB CDC or UART bridge.
+#if defined(ARDUINO_ARCH_RP2040) ||  defined(ESP32) || defined(ESP8266) || defined(__SAM3X8E__)
+  #define DENKO_SERIAL_BUFFER_SIZE 256
+  #define DENKO_RX_ACK_INTERVAL 64
+// RA4M1 has a 512 Serial buffer.
+#elif defined(_RENESAS_RA_)
+  #define DENKO_SERIAL_BUFFER_SIZE 512
+  #define DENKO_RX_ACK_INTERVAL 64
+// SAMD21 is 256/128 in native USB mode ONLY. Must use defaults on programming port to avoid data loss.
+#elif defined(__SAMD21G18A__) && defined(DENKO_USB_CDC)
+  #define DENKO_SERIAL_BUFFER_SIZE 256
+  #define DENKO_RX_ACK_INTERVAL 128
+// 32u4 is odd. Size is 63 instead of 64. Interval must be 31. 32 doesn't work at all. Off by 1 errors?
+#elif defined(__AVR_ATmega32U4__)
+  #define DENKO_SERIAL_BUFFER_SIZE 63
+  #define DENKO_RX_ACK_INTERVAL 31
+// Defaults
+#else
+  #define DENKO_SERIAL_BUFFER_SIZE 64
+  #define DENKO_RX_ACK_INTERVAL 32
+#endif
+
+// Figure out how big the buffer is on the built-in Wire / I2C library.
+#ifdef DENKO_I2C
+  // RP2040 and SAMD21 can do up to 256, but 255 since 1 byte for length.
+  #if defined(ARDUINO_ARCH_RP2040) || defined(__SAMD21G18A__)
+    #define DENKO_I2C_BUFFER_SIZE 255
+  // ESP32, ESP8266 and megaAVR can do up to 128.
+  #elif defined(ESP32) || defined(ESP8266) || defined(__AVR_ATmega4809__)
+    #define DENKO_I2C_BUFFER_SIZE 128
+  // Fall back to 32 bytes.
+  #else
+    #define DENKO_I2C_BUFFER_SIZE 32
+  #endif
+#endif

data/src/lib/DenkoEEPROM.cpp

@@ -3,7 +3,15 @@
 //
 #include "Denko.h"
 
-#ifdef EEPROM_PRESENT
+#ifdef DENKO_EEPROM
+#include <EEPROM.h>
+
+// Emulate 512 bytes of EEPROM on ESP chips and the RP2040.
+#if defined(ESP8266) || defined(ESP32) || defined(ARDUINO_ARCH_RP2040)
+  #define EEPROM_EMULATED
+  #define EMULATED_EEPROM_LENGTH 512
+#endif
+
 // CMD = 6
 // Read from the microcontroller's EEPROM.
 //

data/src/lib/DenkoI2C.cpp

@@ -6,20 +6,20 @@
 
 #include <Wire.h>
 
-bool i2cStarted = false;
-
 // Only start the I2C interface if not already started.
 // Lazy initialization in case user wants to use I2C pins for something else.
 void Denko::i2cBegin() {
   if (!i2cStarted) {
     Wire.begin();
     i2cStarted = true;
+    i2cSetSpeed(0);
   }
 }
 
 // End the I2C interface.
 // This is mostly used as a Reset in Denko::handshake.
 void Denko::i2cEnd(){
+  i2cSetSpeed(0);
   // ESP8266 core does not define Wire.end()
   #ifndef ESP8266
     Wire.end();
@@ -36,6 +36,7 @@ void Denko::i2cSetSpeed(uint8_t code) {
     case 3:  Wire.setClock(3400000); break;
     default: Wire.setClock(100000);  break;
   }
+  i2cSpeed = code;
 }
 
 // CMD = 33
@@ -43,7 +44,8 @@ void Denko::i2cSetSpeed(uint8_t code) {
 void Denko::i2cSearch() {
   byte error;
   uint8_t addr;
-  i2cBegin();
+  if (!i2cStarted) i2cBegin();
+  i2cSetSpeed(0);
   stream->print(SDA);
 
   // Only addresses from 0x08 to 0x77 are usable (8 to 127).
@@ -77,10 +79,10 @@ void Denko::i2cWrite() {
   uint8_t dataLength  =  (uint8_t)val;
 
   // Limit to 32 bytes.
-  if (dataLength > 32) dataLength = 32;
+  if (dataLength > DENKO_I2C_BUFFER_SIZE) dataLength = DENKO_I2C_BUFFER_SIZE;
 
-  i2cBegin();
-  i2cSetSpeed(auxMsg[0]);
+  if (!i2cStarted)            i2cBegin();
+  if (i2cSpeed != auxMsg[0])  i2cSetSpeed(auxMsg[0]);
 
   Wire.beginTransmission(address);
   Wire.write(&auxMsg[1], dataLength);
@@ -116,10 +118,10 @@ void Denko::i2cRead() {
   uint8_t dataLength      = (uint8_t)val;
 
   // Limit to 32 bytes.
-  if (dataLength > 32) dataLength = 32;
+  if (dataLength > DENKO_I2C_BUFFER_SIZE) dataLength = DENKO_I2C_BUFFER_SIZE;
 
-  i2cBegin();
-  i2cSetSpeed(auxMsg[0]);
+  if (!i2cStarted)            i2cBegin();
+  if (i2cSpeed != auxMsg[0])  i2cSetSpeed(auxMsg[0]);
   
   // Optionally write up to a 4 byte register address before reading.
   if ((auxMsg[1] > 0) && (auxMsg[1] < 5)) {

data/src/lib/DenkoLEDArray.cpp

@@ -8,7 +8,7 @@
 // WS2812 / NeoPixel support using Adafruit library from:
 // https://github.com/adafruit/Adafruit_NeoPixel
 //
-# ifdef DENKO_LED_WS2812
+#ifdef DENKO_LED_WS2812
   #include <Adafruit_NeoPixel.h>
 #endif
 
@@ -17,7 +17,7 @@
 // Write data to a WS2812 LED array. Will generalize to other types later.
 //
 // pin          = Microcontroller pin connected to Data In pin of the LED array.
-// val          = Number of RGB or RGBW LEDS (aka pixels) in the array.
+// val          = Number of raw pixel data bytes to expect. Max 9999.
 // auxMsg[0..3] = Reserved for future settings.
 // auxMsg[4+]   = Raw pixel data, already in correct byte order (GRB, RGB, etc.).
 //
@@ -27,18 +27,12 @@ void Denko::showLEDArray() {
   ledArray.begin();
 
   // Copy LED data into the pixel buffer.
-  // NOTE: val * 3 will have to change to val * 4 for RGBW leds.
-  memcpy(ledArray.getPixels(), &auxMsg[4], val * 3);
+  memcpy(ledArray.getPixels(), &auxMsg[4], val);
 
-  // I have NO idea what causes the first green LED to stay stuck on.
-  // A small delay here seems like a consistent fix. ESP32 doesn't need it.
-  // AVR can get away with 32us, but others need 64.
-  #if defined(ESP8266) || defined(__SAMD21G18A__) || defined(__SAM3X8E__)
+  // ATmega4809 still needs this delay to avoid corrupt data. Not sure why.
+  #if defined(__AVR_ATmega4809__)
     delayMicroseconds(64);
   #endif
-  #ifdef __AVR__
-    delayMicroseconds(32);
-  #endif
 
   // Write the pixel buffer to the array.
   ledArray.show();

data/test/analog_io/input_test.rb

@@ -10,7 +10,7 @@ class AnalogIOInputTest < Minitest::Test
   end
 
   def test__read
-    mock = MiniTest::Mock.new.expect :call, nil, [14, nil, nil, nil]
+    mock = Minitest::Mock.new.expect :call, nil, [14, nil, nil, nil]
     board.stub(:analog_read, mock) do
       part._read
     end
@@ -18,7 +18,7 @@ class AnalogIOInputTest < Minitest::Test
   end
 
   def test__listen
-    mock = MiniTest::Mock.new
+    mock = Minitest::Mock.new
     mock.expect :call, nil, [14, 16]
     mock.expect :call, nil, [14, 32]
     board.stub(:analog_listen, mock) do
@@ -29,7 +29,7 @@ class AnalogIOInputTest < Minitest::Test
   end
 
   def test__stop_listen
-    mock = MiniTest::Mock.new.expect :call, nil, [14]
+    mock = Minitest::Mock.new.expect :call, nil, [14]
     board.stub(:stop_listener, mock) do
       part._stop_listener
     end

data/test/analog_io/output_test.rb

@@ -14,7 +14,7 @@ class AnalogIOOutputTest < Minitest::Test
   end
   
   def test_dac_write
-    mock = MiniTest::Mock.new.expect :call, nil, [14, 128]
+    mock = Minitest::Mock.new.expect :call, nil, [14, 128]
 
     board.stub(:dac_write, mock) do
       part.write 128

data/test/analog_io/potentiometer_test.rb

@@ -1,6 +1,6 @@
 require_relative '../test_helper'
 
-class AnalogIOPotentiometerTest < MiniTest::Test
+class AnalogIOPotentiometerTest < Minitest::Test
   def board
     @board ||= BoardMock.new
   end
@@ -10,7 +10,7 @@ class AnalogIOPotentiometerTest < MiniTest::Test
   end
 
   def test_setup
-    mock = MiniTest::Mock.new.expect(:call, nil, [14,8])
+    mock = Minitest::Mock.new.expect(:call, nil, [14,8])
     board.stub(:analog_listen, mock) do
       part
     end

data/test/behaviors/bus_peripheral_addressed.rb

@@ -33,7 +33,7 @@ class BusPeripheralAddressedTest < Minitest::Test
   end
   
   def test_can_use_bus_atomically   
-    mock = MiniTest::Mock.new
+    mock = Minitest::Mock.new
     1.times {mock.expect(:call, nil)}
     
     bus.mutex.stub(:synchronize, mock) do

data/test/behaviors/bus_peripheral_test.rb

@@ -28,7 +28,7 @@ class BusPeripheralTest < Minitest::Test
   end
 
   def test_can_use_bus_atomically   
-    mock = MiniTest::Mock.new
+    mock = Minitest::Mock.new
     1.times {mock.expect(:call, nil)}
     
     bus.mutex.stub(:synchronize, mock) do

data/test/behaviors/callbacks_test.rb

@@ -29,7 +29,7 @@ class CallbacksTest < Minitest::Test
 
   def test_callback_mutex
     callback = Proc.new{}
-    mock = MiniTest::Mock.new
+    mock = Minitest::Mock.new
     3.times {mock.expect(:call, nil)}
     
     part.callback_mutex.stub(:synchronize, mock) do
@@ -73,8 +73,8 @@ class CallbacksTest < Minitest::Test
   end
 
   def test_update_runs_callbacks_and_removes_read_callbacks
-    cb1 = MiniTest::Mock.new.expect :call, nil
-    cb2 = MiniTest::Mock.new.expect :call, nil
+    cb1 = Minitest::Mock.new.expect :call, nil
+    cb2 = Minitest::Mock.new.expect :call, nil
     part.add_callback        { cb1.call }
     part.add_callback(:read) { cb2.call }
     part.update("data")
@@ -84,7 +84,7 @@ class CallbacksTest < Minitest::Test
   end
 
   def test_pre_callback_filter_modifies_data
-    cb = MiniTest::Mock.new.expect :call, nil, ["denko: value"]
+    cb = Minitest::Mock.new.expect :call, nil, ["denko: value"]
     part.add_callback { |x| cb.call(x) }
     part.update("value")
     cb.verify