denko 0.13.6 → 0.15.0

data/lib/denko.rb

@@ -1,36 +1,43 @@
-Thread.abort_on_exception = true
+# Helpers needed during loading.
+require_relative 'denko/helpers'
 
-module Denko
-  def self.root
-    File.expand_path '../..', __FILE__
+unless Denko.in_mruby_build?
+  Thread.abort_on_exception = true
+
+  require 'bcd'
+
+  module Denko
+    def self.root
+      File.expand_path '../..', __FILE__
+    end
   end
 end
 
-# For method delegation.
-require 'forwardable'
-
-# 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'

data/lib/denko_cli/generator.rb

@@ -15,10 +15,10 @@ class DenkoCLI::Generator
   end
 
   def append_target
-    options[:target] = :mega unless options[:target]
+    options[:target] = :atmega unless options[:target]
     # Preserve the source sketch name, since we need to copy that file.
     options[:src_sketch_name] = options[:sketch_name].dup
-    options[:sketch_name] << "_#{options[:target]}" unless options[:target] == :mega
+    options[:sketch_name] << "_#{options[:target]}"
     options[:sketch_name] << "_#{::Denko::VERSION}"
   end
 

data/lib/denko_cli/packages.rb

@@ -29,6 +29,13 @@ PACKAGES = {
       "DenkoOneWire.cpp",
     ]
   },
+  i2c_bb: {
+    description: "Bit Bang I2C support",
+    directive: "DENKO_I2C_BB",
+    files: [
+      "DenkoI2CBB.cpp",
+    ]
+  },
   spi_bb: {
     description: "Bit Bang SPI support",
     directive: "DENKO_SPI_BB",
@@ -54,7 +61,7 @@ PACKAGES = {
   uart_bb: {
     description: "Bit bang serial output",
     directive: "DENKO_UART_BB",
-    only: [:mega, :mega168],
+    only: [:atmega, :atmega168],
     files: [
       "DenkoUARTBB.cpp",
     ]
@@ -83,19 +90,10 @@ PACKAGES = {
   ir_out: {
     description: "Transmit infrared signals",
     directive: "DENKO_IR_OUT",
-    exclude: [:esp8266, :esp32],
     files: [
       "DenkoIROut.cpp",
     ]
   },
-  ir_out_esp: {
-    description: "Transmit infrared signals with the ESP8266 and ESP32",
-    directive: "DENKO_IR_OUT",
-    only: [:esp8266, :esp32],
-    files: [
-      "DenkoIROutESP.cpp",
-    ]
-  },
   led_array: {
     description: "Support for various protocols that control (RGB) LED arrays.",
     directive: "DENKO_LED_ARRAY",

data/lib/denko_cli/targets.rb

@@ -8,26 +8,26 @@ class DenkoCLI::Generator
     core: [:core],
 
     # Specific features for the old mega168 chips.
-    mega168: [: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.
-    mega: STANDARD_PACKAGES + [:uart_bb],
+    atmega: STANDARD_PACKAGES + [:uart_bb],
 
     # No tone, infrared or EEPROM on SAM3X / Due.
-    sam3x: STANDARD_PACKAGES - [:tone, :ir_out, :eeprom],
-    
+    atsam3x: STANDARD_PACKAGES - [:tone, :ir_out, :eeprom],
+
     # No EEPROM on SAMD / Zero.
-    samd: STANDARD_PACKAGES - [:eeprom],
+    atsamd21: STANDARD_PACKAGES - [:eeprom],
+
+    # Infrared library does not support the UNO R4.
+    ra4m1: STANDARD_PACKAGES - [:ir_out],
 
-    # No IR out and WS2812 on the UNO R4. WS2812 compiles but doesn't work.
-    ra4m1: STANDARD_PACKAGES - [:ir_out, :led_array],
+    # ESP8266 & ESP32
+    esp8266: STANDARD_PACKAGES,
+    esp32:   STANDARD_PACKAGES,
 
-    # ESP8266 + ESP32 use a different IR library.
-    esp8266: STANDARD_PACKAGES - [:ir_out] + [:ir_out_esp],
-    esp32:   STANDARD_PACKAGES - [:ir_out] + [:ir_out_esp],
-    
-    # RP2040 can't use WS2812 yet.
-    rp2040: STANDARD_PACKAGES - [:led_array],
+    # RP2040
+    rp2040: STANDARD_PACKAGES,
   }
 end

data/lib/denko_cli/targets.txt

@@ -1,10 +1,10 @@
 
   Valid targets:
 
-    mega (default)
+    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,44 +41,43 @@
 
       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
-     
 
-   samd
+
+   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
      Boards: Arduino Zero, M0, M0 Pro
 
 
-    sam3x
+    atsam3x
 
       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
@@ -87,12 +86,12 @@
       is the smallest sketch possible, and should be universally compatible.
 
 
-    mega168
+    atmega168
 
       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/lib/denko_cli/usage.txt

@@ -11,7 +11,7 @@
 
   Global options:
 
-    --target TARGET    (default: mega. Run 'denko targets' for more info)
+    --target TARGET    (default: atmega. Run 'denko targets' for more info)
     --debug            (default: off)
 
   Available sketches and options specific to each sketch:

data/src/denko_ethernet.ino

@@ -31,10 +31,6 @@ void setup() {
   Ethernet.begin(mac, ip);
   server.begin();
   printEthernetStatus();
-
-  // Add listener callbacks for local logic.
-  denko.digitalListenCallback = onDigitalListen;
-  denko.analogListenCallback = onAnalogListen;
 }
 
 void loop() {
@@ -58,13 +54,3 @@ void loop() {
   // Main loop of the denko library.
   denko.run();
 }
-
-// This runs every time a digital pin that denko is listening to changes value.
-// p = pin number, v = current value
-void onDigitalListen(byte p, byte v){
-}
-
-// This runs every time an analog pin that denko is listening to gets read.
-// p = pin number, v = read value
-void onAnalogListen(byte p, int v){
-}

data/src/denko_serial.ino

@@ -9,22 +9,8 @@ void setup() {
 
   // Pass serial stream to denko so it can read/write.
   denko.stream = &DENKO_SERIAL_IF;
-
-  // Add listener callbacks for local logic.
-  denko.digitalListenCallback = onDigitalListen;
-  denko.analogListenCallback = onAnalogListen;
 }
 
 void loop() {
   denko.run();
 }
-
-// This runs every time a digital pin that denko is listening to changes value.
-// p = pin number, v = current value
-void onDigitalListen(byte p, byte v){
-}
-
-// This runs every time an analog pin that denko is listening to gets read.
-// p = pin number, v = read value
-void onAnalogListen(byte p, int v){
-}

data/src/denko_wifi.ino

@@ -11,7 +11,7 @@
 // #define WIFI_NINA
 
 // WiFi101 Boards
-#ifdef ARDUINO_SAMD_MKR1000
+#if defined(ARDUINO_SAMD_MKR1000) || defined(ADAFRUIT_FEATHER_M0)
   #define WIFI_101
 #endif
 
@@ -117,6 +117,11 @@ void setup() {
   DENKO_SERIAL_IF.begin(115200);
   while(!DENKO_SERIAL_IF);
 
+  // Adafruit Feather M0 Wi-Fi uses different pins.WiFi
+  #ifdef ADAFRUIT_FEATHER_M0
+    WiFi.setPins(8,7,4,2);
+  #endif
+
   // Attempt initial WiFi connection.
   connect();
 
@@ -153,10 +158,6 @@ void setup() {
   // Start the denko TCP server.
   server.begin();
 
-  // Add listener callbacks for local logic.
-  denko.digitalListenCallback = onDigitalListen;
-  denko.analogListenCallback = onAnalogListen;
-
   // Use DENKO_SERIAL_IF as the denko IO stream until we get a TCP connection.
   denko.stream = &DENKO_SERIAL_IF;
 }
@@ -190,13 +191,3 @@ void loop() {
   // Main loop of the denko library.
   denko.run();
 }
-
-// This runs every time a digital pin that denko is listening to changes value.
-// p = pin number, v = current value
-void onDigitalListen(byte p, byte v){
-}
-
-// This runs every time an analog pin that denko is listening to gets read.
-// p = pin number, v = read value
-void onAnalogListen(byte p, int v){
-}

data/src/lib/Denko.cpp

@@ -35,6 +35,8 @@ void Denko::sendReady() {
 }
 
 void Denko::run(){
+  if (rxBytes != 0) rxNotify();
+
   while(stream->available()) {
     parse(stream->read());
     rxBytes ++;
@@ -55,6 +57,11 @@ void Denko::run(){
 }
 
 void Denko::parse(byte c) {
+  if ((fragmentIndex == 0) && (charIndex == 0) && ((c & 0b10000000) != 0)) {
+    dWrite((c & 0b00111111), ((c & 0b01000000) >> 6), false);
+    return;
+  }
+
   if ((c == '\n') || (c == '\\')) {
     // If last char was a \, this \ or \n is escaped.
     if(escaping){
@@ -161,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
 
@@ -169,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
@@ -182,7 +202,14 @@ 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;
+    case 31: i2c_bb_write        ();  break;
+    case 32: i2c_bb_read         ();  break;
+    #endif
+
     // Implemented in DenkoI2C.cpp
     #ifdef DENKO_I2C
     case 33: i2cSearch           ();  break;
@@ -205,6 +232,7 @@ void Denko::process() {
     case 95: setRegisterDivider       ();  break;
     case 96: setAnalogWriteResolution ();  break;
     case 97: setAnalogReadResolution  ();  break;
+    case 98: binaryEcho               ();  break;
     case 99: microDelay(*reinterpret_cast<uint16_t*>(auxMsg)); break;
 
     // Should send a "feature not implemented" message as default.
@@ -224,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);
 
@@ -254,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
@@ -266,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);
@@ -274,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)
@@ -288,7 +316,7 @@ void Denko::handshake() {
   #ifdef DENKO_I2C
   	stream->print(DENKO_I2C_BUFFER_SIZE);
   #endif
-  
+
   // End
   stream->print('\n');
 }
@@ -300,7 +328,7 @@ void Denko::resetState() {
     spiClearListeners();
   #endif
   #ifdef ESP32
-    clearLedcChannels();
+    ledcDetachAll();
   #endif
   registerDivider = 8; // Update register listeners every ~8ms.
   fragmentIndex = 0;
@@ -319,7 +347,11 @@ void Denko::setRegisterDivider() {
 // Set the analog write resolution.
 void Denko::setAnalogWriteResolution() {
   #ifdef WRITE_RESOLUTION_SETTER
-    analogWriteResolution(val);
+    #ifdef ESP32
+      esp32AnalogWRes = val;
+    #else
+      analogWriteResolution(val);
+    #endif
   #endif
 }
 
@@ -331,11 +363,28 @@ void Denko::setAnalogReadResolution() {
   #endif
 }
 
+// CMD = 98
+// Test to receive binary data and echo it back (as ASCII for now).
+void Denko::binaryEcho() {
+  // Respond on whatever pin was given.
+  stream->print(pin);
+  stream->print(':');
+
+  // Echo bytes from aux back to stream. Val is data length.
+  for (uint16_t i=0; i<val; i++) {
+    stream->print(auxMsg[i]);
+    stream->print(',');
+  }
+
+  // End response.
+  stream->print('\n');
+}
+
 // CMD = 99
 // Use a different blocking microsecond delay on different platforms.
 void Denko::microDelay(uint32_t microseconds){
   #if defined(ESP32)
-    ets_delay_us(microseconds);
+    esp_rom_delay_us(microseconds);
   #else
     delayMicroseconds(microseconds);
   #endif