denko 0.14.0 → 0.15.0

data/lib/denko/uart/bit_bang.rb

@@ -10,6 +10,7 @@ module Denko
       include Behaviors::MultiPin
       include Behaviors::Callbacks
       include Behaviors::Lifecycle
+      include Common
 
       attr_reader :baud
 
@@ -24,32 +25,6 @@ module Denko
         start(params[:baud] || 9600)
       end
 
-      def initialize_buffer
-        @buffer       = ""
-        @buffer_mutex = Mutex.new
-        self.add_callback(:buffer) do |data|
-          @buffer_mutex.synchronize do
-            @buffer = "#{@buffer}#{data}"
-          end
-        end
-      end
-
-      def gets
-        @buffer_mutex.synchronize do
-          newline = @buffer.index("\n")
-          return nil unless newline
-          line = @buffer[0..newline-1]
-          @buffer = @buffer[newline+1..-1]
-          return line
-        end
-      end
-
-      def flush
-        @buffer_mutex.synchronize do
-          @buffer = ""
-        end
-      end
-
       def start(baud)
         @baud = baud
         board.uart_bb_start(pins[:tx], pins[:rx], @baud)
@@ -64,7 +39,7 @@ module Denko
       end
 
       def hook_rx_callback
-        rx.add_callback {|data| self.update(data)}
+        rx.add_callback { |data| self.update(data) }
       end
     end
   end

data/lib/denko/uart/common.rb

@@ -0,0 +1,33 @@
+module Denko
+  module UART
+    module Common
+      def initialize_buffer
+        @buffer       = String.new
+        @buffer_mutex = Denko.gil? ? Denko::MutexStub.new : Mutex.new
+        self.add_callback(:buffer) do |data|
+          @buffer_mutex.lock
+          @buffer = "#{@buffer}#{data}"
+          @buffer_mutex.unlock
+        end
+      end
+
+      def gets
+        line = nil
+        @buffer_mutex.lock
+        newline = @buffer.index("\n")
+        if newline
+          line = @buffer[0..newline-1]
+          @buffer = @buffer[newline+1..-1]
+        end
+        @buffer_mutex.unlock
+        line
+      end
+
+      def flush
+        @buffer_mutex.lock
+        @buffer = ""
+        @buffer_mutex.unlock
+      end
+    end
+  end
+end

data/lib/denko/uart/hardware.rb

@@ -4,6 +4,7 @@ module Denko
       include Behaviors::SinglePin
       include Behaviors::Callbacks
       include Behaviors::Lifecycle
+      include Common
 
       attr_reader :index, :baud
 
@@ -23,32 +24,6 @@ module Denko
         start(params[:baud] ||= 9600)
       end
 
-      def initialize_buffer
-        @buffer       = ""
-        @buffer_mutex = Mutex.new
-        self.add_callback(:buffer) do |data|
-          @buffer_mutex.synchronize do
-            @buffer = "#{@buffer}#{data}"
-          end
-        end
-      end
-
-      def gets
-        @buffer_mutex.synchronize do
-          newline = @buffer.index("\n")
-          return nil unless newline
-          line = @buffer[0..newline-1]
-          @buffer = @buffer[newline+1..-1]
-          return line
-        end
-      end
-
-      def flush
-        @buffer_mutex.synchronize do
-          @buffer = ""
-        end
-      end
-
       def start(baud)
         @baud = baud
         board.uart_start(index, baud, true)

data/lib/denko/uart.rb

@@ -1,6 +1,20 @@
+# Represent files to be autoloaded in CRuby as an Array.
+# This allows Mruby::Build to parse and preload them instead.
+UART_FILES = [
+  [nil,        "common"],
+  [:Hardware,  "hardware"],
+  [:BitBang,   "bit_bang"],
+]
+
 module Denko
   module UART
-    autoload :Hardware, "#{__dir__}/uart/hardware"
-    autoload :BitBang,  "#{__dir__}/uart/bit_bang"
+    UART_FILES.each do |file|
+      file_path = "#{__dir__}/uart/#{file[1]}"
+      if file[0]
+        autoload file[0], file_path
+      else
+        require file_path
+      end
+    end
   end
 end

data/lib/denko/version.rb

@@ -1,3 +1,3 @@
 module Denko
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

data/lib/denko.rb

@@ -1,49 +1,46 @@
-Thread.abort_on_exception = true
+# Helpers needed during loading.
+require_relative 'denko/helpers'
 
-module Denko
-  def self.root
-    File.expand_path '../..', __FILE__
-  end
+unless Denko.in_mruby_build?
+  Thread.abort_on_exception = true
+
+  require 'bcd'
 
-  def self.cruby?
-    RUBY_ENGINE == "ruby"
+  module Denko
+    def self.root
+      File.expand_path '../..', __FILE__
+    end
   end
 end
 
-# For method delegation.
-require 'forwardable'
-
-# Bypass mutexes where possible for CRuby.
-require_relative 'denko/mutex_stub'
-
-# Component support stuff.
+# Early shared behavior
 require_relative 'denko/version'
 require_relative 'denko/behaviors'
-require_relative 'denko/fonts'
 
-# Board stuff.
-require_relative 'denko/message'
-require_relative 'denko/connection'
-require_relative 'denko/board'
+# Denko::Board implementation for connected microcontrollers
+unless Denko.in_mruby_build?
+  require_relative 'denko/message'
+  require_relative 'denko/connection'
+  require_relative 'denko/board'
+  # Diagnostics
+  require_relative 'denko/connection/binary_echo'
+end
 
-# Basic IO components.
+# Basic IO peripherals
 require_relative 'denko/digital_io'
 require_relative 'denko/analog_io'
 require_relative 'denko/pulse_io'
 
-# Buses and interfaces.
+# Buses and interfaces
 require_relative 'denko/uart'
 require_relative 'denko/spi'
 require_relative 'denko/i2c'
 require_relative 'denko/one_wire'
 
-# Everything else.
+# Everything else
 require_relative 'denko/display'
 require_relative 'denko/eeprom'
 require_relative 'denko/led'
 require_relative 'denko/motor'
 require_relative 'denko/rtc'
 require_relative 'denko/sensor'
-
-# Diagnostics
-require_relative 'denko/connection/binary_echo'

data/lib/denko_cli/targets.rb

@@ -8,7 +8,7 @@ class DenkoCLI::Generator
     core: [:core],
 
     # Specific features for the old mega168 chips.
-    atmega168: [:core, :one_wire, :tone, :i2c, :spi, :servo],
+    atmega168: [:core, :tone, :i2c, :spi, :servo, :uart_bb],
 
     # Other ATmega chips do everything.
     # Add bit bang serial for 328p / UNO since it has no extra hardware UART.
@@ -16,18 +16,18 @@ class DenkoCLI::Generator
 
     # No tone, infrared or EEPROM on SAM3X / Due.
     atsam3x: STANDARD_PACKAGES - [:tone, :ir_out, :eeprom],
-    
+
     # No EEPROM on SAMD / Zero.
     atsamd21: STANDARD_PACKAGES - [:eeprom],
 
-    # No IR out and WS2812 on the UNO R4. WS2812 compiles but doesn't work.
-    ra4m1: STANDARD_PACKAGES - [:ir_out, :led_array],
+    # Infrared library does not support the UNO R4.
+    ra4m1: STANDARD_PACKAGES - [:ir_out],
 
-    # ESP8266 uses an IR library specific to it.
+    # ESP8266 & ESP32
     esp8266: STANDARD_PACKAGES,
     esp32:   STANDARD_PACKAGES,
-    
-    # RP2040 can't use WS2812 yet.
+
+    # RP2040
     rp2040: STANDARD_PACKAGES,
   }
 end

data/lib/denko_cli/targets.txt

@@ -4,7 +4,7 @@
     atmega (default)
 
       Covers the Atmel/Microchip AVR 8-bit chips and associated Arduino boards.
-      This is the default target. All component features are included.
+      This is the default target. All interfaces are included.
 
       Chips:  ATmega328p, ATmega32u4, ATmega1280, ATmega2560
               Atmega4809 (unconfirmed)
@@ -17,20 +17,20 @@
     esp32
 
       For the the ESP32 chip by Espressif, with integrated 2.4Ghz WiFi.
-      No WiFi OTA updates yet.
-      This option includes all component features EXCEPT:
+      WiFi over-the-air updates are enabled by default.
+      This option includes all interfaces EXCEPT:
           SoftwareSerial
 
       Chips:  ESP32, ESP32-S2, ESP32-S3
       Boards: ESP32 DevKit, LOLIN D32 / D32 Pro, LOLIN S2 Pico / Mini,
               LOLIN S3 Pico / Mini
-         
+
 
     esp8266
 
       For the ESP8266 chip by Espressif, with integrated 2.4Ghz WiFi.
       WiFi over-the-air updates are enabled by default.
-      This option includes all component features EXCEPT:
+      This option includes all interfaces EXCEPT:
           SoftwareSerial
 
       Chips:  ES8266, ESP8285
@@ -41,24 +41,23 @@
 
       Note: After the initial upload via serial, the WiFi sketch for this target
             supports over-the-air updates from the Arduino IDE using ArduinoOTA.
-            
-            
+
+
    rp2040
 
-     For the Raspberry Pi RP2040 microcontroller.
-     Software Serial doesn't work. WiFi available only on the W version.
-     This option includes all component features EXCEPT:
-         SoftwareSerial, LEDArray
+     For the Raspberry Pi RP2040 microcontroller. WiFi available on the W version.
+     This option includes all interfaces EXCEPT:
+         SoftwareSerial
 
      Chips:  RP2040
      Boards: Raspberry Pi Pico, Raspberry Pi Pico W, and many others
-     
+
 
    atsamd21
 
      For the ATSAMD21G18, with native USB and no EEPROM.
      Similar to the mega option, but Software Serial doesn't work.
-     This option includes all component features EXCEPT:
+     This option includes all interfaces EXCEPT:
          EEPROM, SoftwareSerial
 
      Chips:  ATSAMD21G18
@@ -69,16 +68,16 @@
 
       Fpr the ATSAM3X8E, with native USB and no EEPROM.
       Similar to the mega option, but some features don't work.
-      This option includes all component features EXCEPT:
+      This option includes all interfaces EXCEPT:
           EEPROM, SoftwareSerial, Tone, IR Out
 
       Chips:  ATSAM3X8E
       Boards: Arduino Due
-      
-      
+
+
     core
 
-      This includes only the core component feature set of denko:
+      This includes only the core interface set of denko:
         Set Pin Mode
         Digital Read/Write/Listen
         Analog Read/Write/Listen
@@ -91,8 +90,8 @@
 
       This targets the older ATmega168 chip used in early Arduinos.
       With half the RAM and flash available, we need to cut the sketch down.
-      This option includes all component features EXCEPT:
-          SoftwareSerial, IR Out 
+      This option includes all interfaces EXCEPT:
+          EEPROM, OneWire, BitBang I2C, BitBang SPI, Hardware UART, IR Out, WS2812
 
       Chips:  ATmega168
       Boards: Duemilanove, Diecimila, Pro (some), Pro Mini (some)
@@ -103,7 +102,7 @@
             There is not enough memory available for Wi-Fi or Ethernet.
             Try the core target instead to tradeoff features for networking.
 
-      Note: Aux message is always limited to 264 bytes or less for the ATmega168.
+      Note: Aux message is always limited to 48 bytes or less for the ATmega168.
             Servo count is always limited to 6 (normally 12) for the ATmega168 chip.
             These limits apply as long as an Atmega168 is selected in the
             Arduino IDE, regardless of the options passed to this sketch generator.

data/src/lib/Denko.cpp

@@ -168,7 +168,14 @@ void Denko::process() {
 
     // Implemented in DenkoSPIBB.cpp
     #ifdef DENKO_SPI_BB
-    case 21: spiBBtransfer       (auxMsg[3], auxMsg[4], auxMsg[5], pin, auxMsg[0], auxMsg[1], auxMsg[2], &auxMsg[7]);  break;
+    case 21: {
+      // Unpack read and write lengths from their 3 shared bytes.
+      uint16_t  readLength  = (((uint16_t)auxMsg[3] & 0xF0) << 4) | auxMsg[1];
+      uint16_t  writeLength = (((uint16_t)auxMsg[3] & 0x0F) << 8) | auxMsg[2];
+
+      spiBBtransfer (auxMsg[4], auxMsg[5], auxMsg[6], pin, auxMsg[0], readLength, writeLength, &auxMsg[8]);
+      break;
+    }
     case 22: spiBBaddListener    ();  break;
     #endif
 
@@ -176,11 +183,17 @@ void Denko::process() {
     #ifdef DENKO_SPI
     case 26: {
       // Do this since RP2040 crashes with reinterpet_cast of uint32_t.
-      uint32_t  clockRate  = (uint32_t)auxMsg[3];
-                clockRate |= (uint32_t)auxMsg[4] << 8;
-                clockRate |= (uint32_t)auxMsg[5] << 16;
-                clockRate |= (uint32_t)auxMsg[6] << 24;
-      spiTransfer(clockRate, pin, auxMsg[0], auxMsg[1], auxMsg[2], &auxMsg[7]); break;
+      uint32_t  clockRate  = (uint32_t)auxMsg[4];
+                clockRate |= (uint32_t)auxMsg[5] << 8;
+                clockRate |= (uint32_t)auxMsg[6] << 16;
+                clockRate |= (uint32_t)auxMsg[7] << 24;
+
+      // Unpack read and write lengths from their 3 shared bytes.
+      uint16_t  readLength  = (((uint16_t)auxMsg[3] & 0xF0) << 4) | auxMsg[1];
+      uint16_t  writeLength = (((uint16_t)auxMsg[3] & 0x0F) << 8) | auxMsg[2];
+
+      spiTransfer(clockRate, pin, auxMsg[0], readLength, writeLength, &auxMsg[8]);
+      break;
     }
     case 27: spiAddListener   ();  break;
     #endif
@@ -189,7 +202,7 @@ void Denko::process() {
     #if defined(DENKO_SPI) || defined(DENKO_SPI_BB)
     case 28: spiRemoveListener();  break;
     #endif
-    
+
     // Implemented in DenkoI2CBB.cpp
     #ifdef DENKO_I2C_BB
     case 30: i2c_bb_search       ();  break;
@@ -239,11 +252,11 @@ void Denko::process() {
 void Denko::updateListeners() {
   currentTime = micros();
   timeDiff = currentTime - lastTime;
-  
+
   if (timeDiff > 999) {
     // Add a tick for every 1000us passed.
     tickCount = tickCount + (timeDiff / 1000);
-      
+
     // lastTime for next run is currentTime offset by remainder.
     lastTime = currentTime - (timeDiff % 1000);
 
@@ -269,7 +282,7 @@ void Denko::handshake() {
 
   // Reset this so we never send Rx along with ACK:
   rxBytes = 0;
-  
+
   // First handshake value is BOARD_MAP if set.
   stream->print("ACK:");
   #ifdef BOARD_MAP
@@ -281,7 +294,7 @@ void Denko::handshake() {
   #ifdef DENKO_VERSION
     stream->print(DENKO_VERSION);
   #endif
-  
+
   // Third is serial buffer size.
   stream->print(',');
   stream->print(DENKO_SERIAL_BUFFER_SIZE);
@@ -289,7 +302,7 @@ void Denko::handshake() {
   // Fourth is AUX_SIZE.
   stream->print(',');
   stream->print(AUX_SIZE);
-  
+
   // Fifth is EEPROM size. None on Due or Zero.
   stream->print(',');
   #if defined(EEPROM_EMULATED)
@@ -303,7 +316,7 @@ void Denko::handshake() {
   #ifdef DENKO_I2C
   	stream->print(DENKO_I2C_BUFFER_SIZE);
   #endif
-  
+
   // End
   stream->print('\n');
 }

data/src/lib/Denko.h

@@ -120,7 +120,7 @@ class Denko {
 
     // Bit Bang SPI
     void spiBBtransfer         (uint8_t clock, uint8_t input, uint8_t output, uint8_t select, uint8_t settings,
-                                uint8_t rLength, uint8_t wLength, byte *data);                                                          //cmd = 21
+                                uint16_t rLength, uint16_t wLength, byte *data);                                                        //cmd = 21
     byte spiBBtransferByte     (uint8_t clock, uint8_t input, uint8_t output, uint8_t select,
                                 uint8_t mode, uint8_t bitOrder, byte data);
     void spiBBaddListener      ();                                                                                                      //cmd = 22
@@ -129,7 +129,7 @@ class Denko {
     // Hardware SPI
     void spiBegin              (byte settings, uint32_t clockRate);
     void spiEnd                ();
-    void spiTransfer           (uint32_t clockRate, uint8_t select, uint8_t settings, uint8_t rLength, uint8_t wLength, byte *data);    //cmd = 26
+    void spiTransfer           (uint32_t clockRate, uint8_t select, uint8_t settings, uint16_t rLength, uint16_t wLength, byte *data);  //cmd = 26
     void spiAddListener        ();                                                                                                      //cmd = 27
     void spiReadListener       (uint8_t i);
 
@@ -228,10 +228,10 @@ class Denko {
 
       // How to store a SPI listener.
       struct SpiListener{
-        uint32_t clock;     // Clock rate if hardware SPI. If bit bang: bits[0..7] = clock pin, bits [8..15] = input pin.
+        uint32_t freq;      // Frequency if hardware SPI. If bit bang: bits[0..7] = SCK pin, bits [8..15] = MOSI pin.
         uint8_t  select;    // Select pin.
         uint8_t  settings;  // Settings mask as given in request.
-        uint8_t  length;    // Read length as given in request.
+        uint16_t length;    // Read length as given in request.
         uint8_t  enabled;   // 0 = disabled, 1 = hardware, 2 = bit bang.
       };
       SpiListener spiListeners[SPI_LISTENER_COUNT];

data/src/lib/DenkoDefines.h

@@ -28,29 +28,14 @@
 
 // Define number of pins to set up listener storage.
 #if defined(ESP32)
-  #define PIN_COUNT 45
-#elif defined(ESP8266)
-  #define PIN_COUNT 18
-#elif defined(ARDUINO_ARCH_RP2040)
-  #define PIN_COUNT 30
-// These may have more physical pins, but limited to 54 by the Arduino cores.
-#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__SAM3X8E__)
-  #define PIN_COUNT 54
-// Very small optimization for the 328P/UNO.
-#elif defined(__AVR_ATmega328P__) || defined(__AVR_ATmega328__)
-  #define PIN_COUNT 20
-// This catches ATmega32u4, SAMD21, RA4M1 etc.
+  #define PIN_COUNT SOC_GPIO_PIN_COUNT
 #else
-  #define PIN_COUNT 22
+  #define PIN_COUNT NUM_DIGITAL_PINS
 #endif
 
 // Figure out how many LEDC channels are available on ESP32 boards.
 #ifdef ESP32
-  #if CONFIG_IDF_TARGET_ESP32
-    #define LEDC_CHANNEL_COUNT 16
-  #else
-    #define LEDC_CHANNEL_COUNT SOC_LEDC_CHANNEL_NUM
-  #endif
+  #define LEDC_CHANNEL_COUNT SOC_LEDC_CHANNEL_NUM
 #endif
 
 // Filter for boards that can set their analog write resolution.
@@ -72,7 +57,7 @@
     #elif defined(PIN_SERIAL_1_TX)
       #define DENKO_UARTS 1
     #endif
-  
+
   // ESP32 has either 1 or 2 extra UARTS enabled, depending on chip and board.
   #elif defined(ESP32)
     #define DENKO_UARTS (SOC_UART_NUM - 1)
@@ -105,15 +90,11 @@
   #include <SoftwareSerial.h>
 #endif
 
-// 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)
+// 32 + 16 bytes aux message for ATmega168. 512 + 16 bytes for all others.
+#if defined(__AVR_ATmega168__)
   #define AUX_SIZE 48
-// 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 784
-// Default aux message size to 256 + 16 bytes.
 #else
-  #define AUX_SIZE 272
+  #define AUX_SIZE 528
 #endif
 
 // Define 'DENKO_SERIAL_IF' as the serial interface to use.

data/src/lib/DenkoLEDArray.cpp

@@ -10,9 +10,6 @@
 //
 #ifdef DENKO_LED_WS2812
   #include <Adafruit_NeoPixel.h>
-  #ifdef ESP32
-    #include <esp.c>
-  #endif
 
   #ifdef ARDUINO_ARCH_RP2040
     Adafruit_NeoPixel ledArray;
@@ -32,12 +29,8 @@
 #define WS2812_DATA_OFFSET 8
 //
 void Denko::showLEDArray() {
-  // Avoid memcpy on ESP32 by calling espShow() directly.
-  #ifdef ESP32
-    espShow(pin, &auxMsg[WS2812_DATA_OFFSET], val, true);
-
   // Pre-init instance (one PIO) on Pi Pico.
-  #elif defined(ARDUINO_ARCH_RP2040)
+  #ifdef ARDUINO_ARCH_RP2040
     ledArray.setPin(pin);
     ledArray.updateLength(val);
     memcpy(ledArray.getPixels(), &auxMsg[WS2812_DATA_OFFSET], val);

data/src/lib/DenkoSPI.cpp

@@ -45,7 +45,7 @@ void Denko::spiBegin(byte settings, uint32_t clockRate) {
 
   // SPI mode is the lowest 2 bits of settings.
   byte mode = settings & 0B00000011;
-  
+
   // Bit 7 of settings controls bit order. 0 = LSBFIRST, 1 = MSBFIRST.
   if (bitRead(settings, 7) == 0) {
     // True integer value for these macros vary by platform, so just do this.
@@ -92,35 +92,39 @@ void Denko::spiEnd() {
 // auxMsg[3-6] = clock frequency (uint32_t as 4 bytes)
 // auxMsg[7+]  = data (bytes) (write only)
 //
-void Denko::spiTransfer(uint32_t clockRate, uint8_t select, uint8_t settings, uint8_t rLength, uint8_t wLength, byte *data) {
+void Denko::spiTransfer(uint32_t clockRate, uint8_t select, uint8_t settings, uint16_t rLength, uint16_t wLength, byte *data) {
   spiBegin(settings, clockRate);
 
-  // Stream read bytes as if coming from select pin.
-  if (rLength > 0) {
-    stream->print(select);
-    stream->print(':');
-  }
-
   // Pull select low.
   if (bitRead(settings, 6) == 1) {
     pinMode(select, OUTPUT);
     digitalWrite(select, LOW);
   }
-  
-  for (byte i = 0;  (i < rLength || i < wLength);  i++) {
-    byte b;
 
-    if (i < wLength) {
-      b = SPI.transfer(data[i]);
-    } else {
-      b = SPI.transfer(0x00);
-    }
+  // Go one byte at a time if reading bytes out.
+  if (rLength > 0) {
+    // Stream read bytes as if coming from select pin.
+    stream->print(select);
+    stream->print(':');
+
+    for (uint16_t i=0; (i < rLength || i < wLength); i++) {
+      byte b;
 
-    if (i < rLength) {
-      // Print read byte, then a comma or \n if it's the last read byte.
-      stream->print(b);
-      stream->print((i+1 == rLength) ? '\n' : ',');
+      if (i < wLength) {
+        b = SPI.transfer(data[i]);
+      } else {
+        b = SPI.transfer(0x00);
+      }
+
+      if (i < rLength) {
+        // Print read byte, then a comma or \n if it's the last read byte.
+        stream->print(b);
+        stream->print((i+1 == rLength) ? '\n' : ',');
+      }
     }
+  // Write the entire buffer at once if not reading.
+  } else {
+    SPI.transfer(data, wLength);
   }
 
   // Leave select high.
@@ -137,16 +141,14 @@ void Denko::spiAddListener() {
             clockRate |= (uint32_t)auxMsg[4] << 8;
             clockRate |= (uint32_t)auxMsg[5] << 16;
             clockRate |= (uint32_t)auxMsg[6] << 24;
-  
+
   for (int i = 0;  i < SPI_LISTENER_COUNT;  i++) {
     if (spiListeners[i].enabled == 0) {
-      spiListeners[i] = {
-        clockRate,
-        pin,        // Select pin
-        auxMsg[0],  // Settings
-        auxMsg[1],  // Read length
-        1           // Enabled = 1 sets hardware SPI listener
-      };
+      spiListeners[i].freq      = clockRate;
+      spiListeners[i].select    = pin;                                              // Select pin
+      spiListeners[i].settings  = auxMsg[0];                                        // Settings mask
+      spiListeners[i].length    = (((uint16_t)auxMsg[3] & 0xF0) << 4) | auxMsg[1];  // Read length
+      spiListeners[i].enabled   = 1;                                                // 1 sets this listener as Hardware SPI
       return;
     } else {
     // Should send some kind of error if all are in use.
@@ -156,7 +158,7 @@ void Denko::spiAddListener() {
 
 // Called by spiUpdateListeners to read an individual hardware SPI listener.
 void Denko::spiReadListener(uint8_t i) {
-  spiTransfer(spiListeners[i].clock,
+  spiTransfer(spiListeners[i].freq,
               spiListeners[i].select,
               spiListeners[i].settings,
               spiListeners[i].length,