denko 0.13.5 → 0.14.0

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, :one_wire, :tone, :i2c, :spi, :servo],
 
     # 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],
 
     # No IR out and WS2812 on the UNO R4. WS2812 compiles but doesn't work.
     ra4m1: STANDARD_PACKAGES - [:ir_out, :led_array],
 
-    # ESP8266 + ESP32 use a different IR library.
-    esp8266: STANDARD_PACKAGES - [:ir_out] + [:ir_out_esp],
-    esp32:   STANDARD_PACKAGES - [:ir_out] + [:ir_out_esp],
+    # ESP8266 uses an IR library specific to it.
+    esp8266: STANDARD_PACKAGES,
+    esp32:   STANDARD_PACKAGES,
     
     # RP2040 can't use WS2812 yet.
-    rp2040: STANDARD_PACKAGES - [:led_array],
+    rp2040: STANDARD_PACKAGES,
   }
 end

data/lib/denko_cli/targets.txt

@@ -1,7 +1,7 @@
 
   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.
@@ -54,7 +54,7 @@
      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.
@@ -65,7 +65,7 @@
      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.
@@ -87,7 +87,7 @@
       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.

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){
@@ -183,6 +190,13 @@ void Denko::process() {
     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 +219,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.
@@ -300,7 +315,7 @@ void Denko::resetState() {
     spiClearListeners();
   #endif
   #ifdef ESP32
-    clearLedcChannels();
+    ledcDetachAll();
   #endif
   registerDivider = 8; // Update register listeners every ~8ms.
   fragmentIndex = 0;
@@ -319,7 +334,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 +350,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

data/src/lib/Denko.h

@@ -13,14 +13,6 @@ class Denko {
     // Store it and call ->print, ->write, ->available, ->read etc. on it.
     Stream* stream;
 
-    // Callback hooks for local logic (defined in main sketch) based on listeners.
-    // These should be used if:
-    //   1) a round-trip to the remote client is too slow, or
-    //   2) something needs to happen regardless of remote client connection.
-    // Eg. Instant feedback from a smart light switch.
-    void (*digitalListenCallback)(byte p, byte v);
-    void (*analogListenCallback)(byte p, int v);
-
     // Core IO API Functions
     // Functions with a cmd value can be called through the remote API.
     //
@@ -35,10 +27,10 @@ class Denko {
     void dacWrite    (byte p, int v,  boolean echo=true);  //cmd = 4
     int  aRead       (byte p);                             //cmd = 5
     void setListener (byte p, boolean enabled, byte analog, byte exponent, boolean local=true); //cmd = 6
-    
+
     // Read value of micros() every loop.
     unsigned long currentTime;
-    
+
     // Counts 1ms ticks based on currentTime. Rolls over every 256ms.
     byte tickCount;
 
@@ -53,19 +45,10 @@ class Denko {
     void clearCoreListeners    ();
     void findLastActiveListener();
 
-    //
-    // Tanslating aWrite to ledcWrite for PWM out on the ESP32.
-    //
-    // Track which pin is assigned to each LEDC channel.
-    // Byte 0 = enabled or disabled
-    // Byte 1 = pin number attached to that channel
-    //
     #ifdef ESP32
-    byte ledcPins[LEDC_CHANNEL_COUNT][2];
-    byte ledcChannel(byte p);
-    byte assignLEDC(byte channel, byte pin);
-    void releaseLEDC(byte p);
-    void clearLedcChannels();
+      // 8-bit global PWM resolution by default, to match other boards. Reconfigurable.
+      uint8_t esp32AnalogWRes = 8;
+      void ledcDetachAll();
     #endif
 
     //
@@ -136,7 +119,7 @@ class Denko {
     void showLEDArray       (); //cmd = 19
 
     // Bit Bang SPI
-    void spiBBtransfer         (uint8_t clock, uint8_t input, uint8_t output, uint8_t select, uint8_t settings, 
+    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
     byte spiBBtransferByte     (uint8_t clock, uint8_t input, uint8_t output, uint8_t select,
                                 uint8_t mode, uint8_t bitOrder, byte data);
@@ -149,7 +132,7 @@ class Denko {
     void spiTransfer           (uint32_t clockRate, uint8_t select, uint8_t settings, uint8_t rLength, uint8_t wLength, byte *data);    //cmd = 26
     void spiAddListener        ();                                                                                                      //cmd = 27
     void spiReadListener       (uint8_t i);
- 
+
     // SPI Listeners (both hardware and bit bang)
     void spiRemoveListener     ();                                                                                                      //cmd = 28
     void spiUpdateListeners    ();
@@ -182,6 +165,7 @@ class Denko {
     void setRegisterDivider             ();  //cmd = 97
     void setAnalogWriteResolution       ();  //cmd = 96
     void setAnalogReadResolution        ();  //cmd = 97
+    void binaryEcho                     ();  //cmd = 98
     void microDelay(uint32_t microseconds);  //cmd = 99, Platform specific microsecond delay
     unsigned long lastTime;
     unsigned long timeDiff;
@@ -211,7 +195,12 @@ class Denko {
     //
     // Notify computer that board has received bytes.
     void rxNotify();
-    uint8_t rxBytes  = 0;
+    // 8-bit counter on AVR for efficiency, 32-bit otherwise.
+    #ifdef __AVR__
+      uint8_t  rxBytes = 0;
+    #else
+      uint32_t rxBytes = 0;
+    #endif
     //
     // Tell the computer to halt or resume sending data to the board.
     //
@@ -232,7 +221,7 @@ class Denko {
 
     //
     // Shared SPI listeners that can be used by either hardware or bit bang SPI.
-    // 
+    //
     #if defined(DENKO_SPI) || defined(DENKO_SPI_BB)
       // How many SPI lsiteners.
       #define SPI_LISTENER_COUNT 4
@@ -247,4 +236,31 @@ class Denko {
       };
       SpiListener spiListeners[SPI_LISTENER_COUNT];
     #endif
+
+    // I2C Bit Bang Interface
+    #if defined(DENKO_I2C_BB)
+      uint8_t i2c_bb_scl_pin;
+      uint8_t i2c_bb_sda_pin;
+      uint8_t i2c_bb_quarter_period = 1;
+
+      // Internal stuff
+      void    i2c_bb_delay_quarter_period();
+      void    i2c_bb_delay_half_period();
+      void    i2c_bb_sda_high   ();
+      void    i2c_bb_sda_low    ();
+      void    i2c_bb_scl_high   ();
+      void    i2c_bb_scl_low    ();
+      void    i2c_bb_start      ();
+      void    i2c_bb_stop       ();
+      uint8_t i2c_bb_read_bit   ();
+      void    i2c_bb_write_bit  (uint8_t  bit );
+      uint8_t i2c_bb_read_byte  (bool     back);
+      int     i2c_bb_write_byte (uint8_t  data);
+      void    i2c_bb_init       (uint8_t scl, uint8_t sda);
+
+      // Remote exposed interface
+      void i2c_bb_search ();
+      void i2c_bb_write  ();
+      void i2c_bb_read   ();
+    #endif
 };