denko 0.13.0 → 0.13.2

data/test/behaviors/reader_test.rb

@@ -51,13 +51,20 @@ class ReaderTest < Minitest::Test
     assert_equal part.read, 42
   end
   
-  def test_read_using
+  def test_read_using_with_lambda
     inject(1)
     reader = MiniTest::Mock.new.expect :call, nil
     part.read_using -> { reader.call }
     reader.verify
   end
 
+  def test_read_using_with_method_and_args
+    inject(1)
+    reader = MiniTest::Mock.new.expect :call, nil, [10, 20], test_arg: 2
+    part.read_using reader, 10, 20, test_arg: 2
+    reader.verify
+  end
+
   def test_add_run_remove_callback
     cb = MiniTest::Mock.new.expect :call, nil
     inject(1)

data/test/board/helper_test.rb

@@ -20,10 +20,6 @@ class APIHelperTest < Minitest::Test
     assert_equal pack(:uint8, [25,26]), "\x19\x1A"
   end
   
-  def test_padding
-    assert_equal pack(:uint8, 25, pad: 2), "\x19\x00"
-  end
-  
   def test_min
     assert_raises(ArgumentError) { pack(:uint8, 25, min: 2) }
   end

data/test/display/hd44780_test.rb

@@ -20,4 +20,14 @@ class HD44780Test < MiniTest::Test
     
     end 
   end
+
+  def test_write4
+    part.write4 "10100101"
+
+    # Pin states should match lower 4 bits, since they are sent last.
+    assert_equal 1, part.d4.state
+    assert_equal 0, part.d5.state
+    assert_equal 1, part.d6.state
+    assert_equal 0, part.d7.state
+  end
 end

data/test/led/seven_segment_test.rb

@@ -60,14 +60,17 @@ class SevenSegmentLEDTest < MiniTest::Test
   end
 
   def test_scroll
-    mock = MiniTest::Mock.new.expect :call, nil, ['foo']
-    part.stub(:scroll, mock) do
-      part.display('foo')
+    mock = MiniTest::Mock.new
+    mock.expect :call, nil, ['H']
+    mock.expect :call, nil, ['I']
+    part.stub(:write, mock) do
+      part.display('hi')
     end
     mock.verify
   end
 
   def test_display_ensures_on
+    part.off
     mock = MiniTest::Mock.new.expect :call, nil
     part.stub(:on, mock) do
       part.display(1)
@@ -75,12 +78,31 @@ class SevenSegmentLEDTest < MiniTest::Test
     mock.verify
   end
 
-  def test_display_clears_if_unknown_char
-    mock = MiniTest::Mock.new.expect :call, nil
-    part.stub(:clear, mock) do
-      part.display('+')
+  def test_write_clears_if_unknown_char
+    # Turn all the segments on.
+    part.display('8')
+
+    # Expect every segment to get #write(1). Inverted logic because anode.
+    mocks = []
+    part.segments.each do 
+      mocks << MiniTest::Mock.new.expect(:call, nil, [1])
     end
-    mock.verify
+    part.segments[0].stub(:write, mocks[0]) do
+      part.segments[1].stub(:write, mocks[1]) do
+        part.segments[2].stub(:write, mocks[2]) do
+          part.segments[3].stub(:write, mocks[3]) do
+            part.segments[4].stub(:write, mocks[4]) do
+              part.segments[5].stub(:write, mocks[5]) do
+                part.segments[6].stub(:write, mocks[6]) do
+                  part.display('+')
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+    mocks.each { |mock| mock.verify}
   end
   # Test with cathode
 end

data/test/one_wire/bus_enumerator_test.rb

@@ -131,4 +131,8 @@ class OneWireEnumeratorTest < Minitest::Test
     found_addresses = bus.found_devices.map { |d| d[:address] }
     assert_equal found_addresses.sort, bus_sim.addresses.sort
   end
+
+  def test_includes_constants
+    assert Denko::OneWire::BusEnumerator.ancestors.include?(Denko::OneWire::Constants)
+  end
 end

data/test/one_wire/helper_test.rb

@@ -3,16 +3,16 @@ require_relative '../test_helper'
 class OneWireHelper < Minitest::Test
   
   def test_with_valid_crc
-    assert Denko::OneWire::Helper.crc_check(18086456125349333800)
-    assert Denko::OneWire::Helper.crc_check([121, 117, 144, 185, 6, 165, 43, 26])
+    assert Denko::OneWire::Helper.crc(18086456125349333800)
+    assert Denko::OneWire::Helper.crc([121, 117, 144, 185, 6, 165, 43, 26])
   end
   
   def test_with_invalid_crc
-    refute Denko::OneWire::Helper.crc_check(18086456125349333801)
+    refute Denko::OneWire::Helper.crc(18086456125349333801)
   end
   
   def test_arbitrary_length_read
-    assert Denko::OneWire::Helper.crc_check([181, 1, 75, 70, 127, 255, 11, 16, 163])
-    refute Denko::OneWire::Helper.crc_check([181, 1, 75, 70, 127, 255, 11, 16, 164])
+    assert Denko::OneWire::Helper.crc([181, 1, 75, 70, 127, 255, 11, 16, 163])
+    refute Denko::OneWire::Helper.crc([181, 1, 75, 70, 127, 255, 11, 16, 164])
   end
 end

data/test/sensor/ds18b20_test.rb

@@ -43,6 +43,16 @@ class DS18B20Test < MiniTest::Test
     assert_equal 0.75, part.instance_variable_get(:@convert_time)
   end
 
+  def test_pre_callback_filter_does_crc_and_returns_error_on_fail
+    raw_bytes = [239, 1, 75, 70, 127, 255, 1, 16, 245]
+    mock = MiniTest::Mock.new.expect(:call, false, [raw_bytes])
+
+    Denko::OneWire::Helper.stub(:crc, mock) do
+      assert_equal({crc_error: true}, part.pre_callback_filter(raw_bytes))
+    end
+    mock.verify
+  end
+
   # test resolution=
 
   def test_convert_is_atomic

data/test/test_helper.rb

@@ -100,7 +100,12 @@ module Constants
     opts[:on].send(:remove_const, const) if self.class.const_defined?(const)
     opts[:on].const_set(const, value)
   end
-  ACK = "SAMD_ZERO,0.13.0,528,1024"
+  # Imaginary handshake ack from the board. Not a real SAMD_ZERO device.
+  # Serial buffer = 256
+  # Aux size = 528
+  # EEPROM size = 1024
+  # I2C buffer = 32
+  ACK = "SAMD_ZERO,0.13.0,256,528,1024,32"
 
   # Some test redefine RUBY_PLATFORM. Save the original to reset it.
   ORIGINAL_RUBY_PLATFORM = RUBY_PLATFORM
@@ -137,6 +142,9 @@ class ConnectionMock
   def handshake
     Constants::ACK
   end
+  def remote_buffer_size=(size)
+    @remote_buffer_size = size
+  end
 end
 
 class BoardMock < Denko::Board
@@ -211,7 +219,7 @@ module TestPacker
   end
 end
 
-# Speed up one wire tests.
+# Speed up tests which use long delays.
 module Denko
   module OneWire
     class Bus
@@ -220,4 +228,11 @@ module Denko
       end
     end
   end
+  module LED
+    class SevenSegment
+      def sleep(time)
+        super(0.001)
+      end
+    end
+  end
 end

data/vendor/board-maps/.gitmodules

@@ -19,3 +19,6 @@
 [submodule "cores/sam3x"]
 	path = cores/sam3x
 	url = https://github.com/arduino/ArduinoCore-sam
+[submodule "cores/ra4m1"]
+	path = cores/ra4m1
+	url = https://github.com/arduino/ArduinoCore-renesas.git

data/vendor/board-maps/BoardMap.h

@@ -378,18 +378,6 @@
   #define BOARD_MAP "ADAFRUIT_FEATHER_ESP32S2_REVTFT"
 #endif
 
-#ifdef ARDUINO_ADAFRUIT_QTPY_ESP32S2
-  #define BOARD_MAP "ADAFRUIT_QTPY_ESP32S2"
-#endif
-
-#ifdef ARDUINO_ADAFRUIT_QTPY_ESP32C3
-  #define BOARD_MAP "ADAFRUIT_QTPY_ESP32C3"
-#endif
-
-#ifdef ARDUINO_ADAFRUIT_QTPY_ESP32_PICO
-  #define BOARD_MAP "ADAFRUIT_QTPY_ESP32_PICO"
-#endif
-
 #ifdef ARDUINO_ADAFRUIT_FEATHER_ESP32_V2
   #define BOARD_MAP "ADAFRUIT_FEATHER_ESP32_V2"
 #endif
@@ -410,10 +398,26 @@
   #define BOARD_MAP "ADAFRUIT_FEATHER_ESP32S3_REVTFT"
 #endif
 
+#ifdef ARDUINO_ADAFRUIT_QTPY_ESP32_PICO
+  #define BOARD_MAP "ADAFRUIT_QTPY_ESP32_PICO"
+#endif
+
+#ifdef ARDUINO_ADAFRUIT_QTPY_ESP32C3
+  #define BOARD_MAP "ADAFRUIT_QTPY_ESP32C3"
+#endif
+
+#ifdef ARDUINO_ADAFRUIT_QTPY_ESP32S2
+  #define BOARD_MAP "ADAFRUIT_QTPY_ESP32S2"
+#endif
+
 #ifdef ARDUINO_ADAFRUIT_QTPY_ESP32S3_NOPSRAM
   #define BOARD_MAP "ADAFRUIT_QTPY_ESP32S3_NOPSRAM"
 #endif
 
+#ifdef ARDUINO_ADAFRUIT_QTPY_ESP32S3_N4R2
+  #define BOARD_MAP "ADAFRUIT_QTPY_ESP32S3_N4R2"
+#endif
+
 #ifdef ARDUINO_ADAFRUIT_ITSYBITSY_ESP32
   #define BOARD_MAP "ADAFRUIT_ITSYBITSY_ESP32"
 #endif
@@ -1142,6 +1146,10 @@
   #define BOARD_MAP "NANO_RP2040_CONNECT"
 #endif
 
+#ifdef ARDUINO_ARTRONSHOP_RP2_NANO
+  #define BOARD_MAP "ARTRONSHOP_RP2_NANO"
+#endif
+
 #ifdef ARDUINO_BRIDGETEK_IDM2040-7A
   #define BOARD_MAP "BRIDGETEK_IDM2040-7A"
 #endif
@@ -1194,6 +1202,10 @@
   #define BOARD_MAP "CHALLENGER_2040_WIFI_BLE_RP2040"
 #endif
 
+#ifdef ARDUINO_CHALLENGER_2040_WIFI6_BLE_RP2040
+  #define BOARD_MAP "CHALLENGER_2040_WIFI6_BLE_RP2040"
+#endif
+
 #ifdef ARDUINO_CHALLENGER_NB_2040_WIFI_RP2040
   #define BOARD_MAP "CHALLENGER_NB_2040_WIFI_RP2040"
 #endif
@@ -1234,6 +1246,10 @@
   #define BOARD_MAP "PIMORONI_PGA2040"
 #endif
 
+#ifdef ARDUINO_PIMORONI_PLASMA2040
+  #define BOARD_MAP "PIMORONI_PLASMA2040"
+#endif
+
 #ifdef ARDUINO_SOLDERPARTY_RP2040_STAMP
   #define BOARD_MAP "SOLDERPARTY_RP2040_STAMP"
 #endif
@@ -1362,3 +1378,15 @@
   #define BOARD_MAP "SAMD_TIAN"
 #endif
 
+#ifdef ARDUINO_PORTENTA_C33
+  #define BOARD_MAP "PORTENTA_C33"
+#endif
+
+#ifdef ARDUINO_MINIMA
+  #define BOARD_MAP "MINIMA"
+#endif
+
+#ifdef ARDUINO_UNOWIFIR4
+  #define BOARD_MAP "UNOWIFIR4"
+#endif
+

data/vendor/board-maps/README.md

@@ -18,6 +18,7 @@ This is the exact use case this was deisgned for, in support of the [denko](http
 - [megaavr](https://github.com/arduino/ArduinoCore-megaavr)
 - [sam](https://github.com/arduino/ArduinoCore-sam)
 - [samd](https://github.com/arduino/ArduinoCore-samd)
+- [renesas](https://github.com/arduino/ArduinoCore-renesas)
 - [esp8266](https://github.com/esp8266/Arduino)
 - [esp32](https://github.com/espressif/arduino-esp32)
 - [rp2040](https://github.com/earlephilhower/arduino-pico)

data/vendor/board-maps/lib/header_parser.rb

@@ -27,6 +27,9 @@ class HeaderParser
     file.each_line do |line|
       # Reject comments.
       next if line.match /\A\/\//
+      
+      # Reject anything to do with QSPI.
+      next if line.match /QSPI/
 
       # Reject lines that end with pin-style identifiers, instead of numbers.
       next if line.match /(PIN_)*(A|D|DAC|T)(\d+)\s*;*\s*\z/
@@ -41,22 +44,43 @@ class HeaderParser
 
       # Match RP2040 analog overrides and store them with prefixed keys like :_A0
       # Will substitute them later in #clean_map
-      rp2040_analog = line.match /__PIN(_A\d+)\s*\(?(\d+)\w*\)?/
+      rp2040_analog = line.match /__PIN(_A\d+)\s+\(?(\d+)\w*\)?/
       if rp2040_analog
         @map[rp2040_analog[1].to_sym] = rp2040_analog[2].to_i
         next
       end
 
       #
-      # Match analog input and DAC pins declared like:
+      # Match analog input pins declared like:
       #     #define PIN_A0 (14ul)
-      #     #define PIN_DAC0 (14)
       #     #define PIN_A0 14
       #     #define A0 14
       #
-      pin = line.match /(PIN_)*((A|DAC)\d+)\s*\(?(\d+)\w*\)?/
+      pin = line.match /(PIN_)*(A\d+)\s+\(?(\d+)\w*\)?/
       if pin
-        @map[pin[2].to_sym] = pin[4].to_i
+        @map[pin[2].to_sym] = pin[3].to_i
+        next
+      end
+      
+      #
+      # Strict matcher for DAC pins in Arduino SAMD core:
+      #     #define DAC  A0
+      #     #define DAC1 14
+      #
+      pin = line.match /(PIN_)(DAC\d+)\s+\(?(\d+)\w*\)?/
+      if pin
+        @map[pin[2].to_sym] = pin[3].to_i
+        next
+      end
+      
+      #
+      # Match I2C/SPI pins declared like: (first seen in UNO R4)
+      #     #define WIRE_SDA_PIN 20
+      #     #define WIRE_SCL1_PIN 20
+      #
+      pin = line.match /(WIRE(\d*)_(SCL_|SDA_)PIN)\s*\(?(\d+)\w*\)?/
+      if pin
+        @map[pin[1].gsub("_PIN", "").to_sym] = pin[4].to_i
         next
       end
 
@@ -73,6 +97,7 @@ class HeaderParser
         next
       end
 
+      # This mostly affectes SAM3X, ESP32 and ESP8266.
       #
       # Match custom labeled D* pins (eg. ESP8266) declared like: 
       #     static const uint D4 = (2)

data/vendor/board-maps/run.rb

@@ -1,7 +1,7 @@
 require_relative "lib/boards_parser"
 require_relative "lib/header_parser"
 
-CORES = ["avr", "esp32", "esp8266", "megaavr", "rp2040", "sam3x", "samd"]
+CORES = ["avr", "esp32", "esp8266", "megaavr", "rp2040", "sam3x", "samd", "ra4m1"]
 
 # This will end up containing a map for each board identified. Each key
 # is a board's identifier and the value is its pin map as a hash.
@@ -15,11 +15,21 @@ CORES.each do |core|
 
   # For each board, parse its header and add it to the hash of maps.
   board_headers.each do |board, header_folder|
+    # No idea what this is, but doesn't seem to be a real board.
+    next if board.match /muxto/i
+    
     parser = HeaderParser.new(header_folder)
     board_maps[board] = parser.map
   end
 end
 
+# Manually set DAC pins for Arduino branded RA4M1 boards.
+# Should handle with different matchers for each core, but this works for now.
+board_maps["ARDUINO_MINIMA"][:DAC] = 14
+board_maps["ARDUINO_UNOWIFIR4"][:DAC] = 14
+board_maps["ARDUINO_PORTENTA_C33"][:DAC] = 21
+board_maps["ARDUINO_PORTENTA_C33"][:DAC1] = 20
+
 # Remove chars from board identifier that won't work in a filename.
 def board_to_filename(board_identifier)
   board_identifier.gsub(":", "_").gsub(",", "_").gsub(/\AARDUINO_/, "")

data/vendor/board-maps/yaml/ADAFRUIT_FEATHER_ESP32S3.yml

@@ -7,7 +7,7 @@
 :SCK: 36
 :MISO: 37
 :A0: 18
-:A1: 4
+:A1: 17
 :A2: 16
 :A3: 15
 :A4: 14
@@ -16,6 +16,11 @@
 :A7: 4
 :A8: 5
 :A9: 6
+:A10: 9
+:A11: 10
+:A12: 11
+:A13: 12
+:A14: 13
 :T3: 3
 :T4: 4
 :T5: 5

data/vendor/board-maps/yaml/ADAFRUIT_FEATHER_ESP32S3_NOPSRAM.yml

@@ -7,7 +7,7 @@
 :SCK: 36
 :MISO: 37
 :A0: 18
-:A1: 4
+:A1: 17
 :A2: 16
 :A3: 15
 :A4: 14
@@ -16,6 +16,11 @@
 :A7: 4
 :A8: 5
 :A9: 6
+:A10: 9
+:A11: 10
+:A12: 11
+:A13: 12
+:A14: 13
 :T3: 3
 :T4: 4
 :T5: 5

data/vendor/board-maps/yaml/ADAFRUIT_FEATHER_ESP32_V2.yml

@@ -7,7 +7,7 @@
 :MISO: 21
 :SCK: 5
 :A0: 26
-:A1: 3
+:A1: 25
 :A2: 34
 :A3: 39
 :A4: 36
@@ -16,6 +16,10 @@
 :A7: 32
 :A8: 15
 :A9: 33
+:A10: 27
+:A11: 12
+:A12: 13
+:A13: 35
 :T0: 4
 :T1: 0
 :T2: 2

data/vendor/board-maps/yaml/ADAFRUIT_QTPY_ESP32S3_N4R2.yml

@@ -0,0 +1,20 @@
+---
+:SDA: 7
+:SCL: 6
+:A1: 17
+:SS: 42
+:MOSI: 35
+:SCK: 36
+:MISO: 37
+:A0: 18
+:A2: 9
+:A3: 8
+:A4: 7
+:A5: 6
+:A6: 5
+:A7: 16
+:T5: 5
+:T6: 6
+:T7: 7
+:T8: 8
+:T9: 9

data/vendor/board-maps/yaml/ADAFRUIT_QTPY_ESP32_PICO.yml

@@ -1,7 +1,7 @@
 ---
 :SDA: 4
 :SCL: 33
-:A1: 0
+:A1: 25
 :SS: 27
 :MOSI: 13
 :MISO: 12
@@ -15,6 +15,7 @@
 :A7: 7
 :A8: 14
 :A9: 12
+:A10: 13
 :T0: 4
 :T3: 15
 :T4: 13

data/vendor/board-maps/yaml/ARTRONSHOP_RP2_NANO.yml

@@ -0,0 +1,32 @@
+---
+:LED_BUILTIN: 13
+:D0: 0
+:D1: 1
+:D2: 2
+:D3: 3
+:D4: 4
+:D5: 5
+:D6: 6
+:D7: 7
+:D8: 8
+:D9: 9
+:D10: 10
+:D11: 11
+:D12: 12
+:D13: 13
+:A0: 26
+:A1: 27
+:A2: 28
+:A3: 29
+:MISO0: 4
+:MOSI0: 3
+:SCK0: 2
+:SS0: 5
+:MISO1: 12
+:MOSI1: 11
+:SCK1: 10
+:SS1: 13
+:SDA0: 16
+:SCL0: 17
+:SDA1: 18
+:SCL1: 19

data/vendor/board-maps/yaml/AVR_CIRCUITPLAY.yml

@@ -7,7 +7,7 @@
 :MISO: 14
 :SCK: 15
 :A0: 18
-:A1: 1
+:A1: 19
 :A2: 20
 :A3: 21
 :A4: 22

data/vendor/board-maps/yaml/AVR_ESPLORA.yml

@@ -1,7 +1,7 @@
 ---
 :LED_BUILTIN: 13
 :A0: 18
-:A1: 1
+:A1: 19
 :A2: 20
 :A3: 21
 :A4: 22

data/vendor/board-maps/yaml/AVR_INDUSTRIAL101.yml

@@ -1,7 +1,7 @@
 ---
 :LED_BUILTIN: 13
 :A0: 18
-:A1: 1
+:A1: 19
 :A2: 20
 :A3: 21
 :A4: 22

data/vendor/board-maps/yaml/AVR_LEONARDO.yml

@@ -1,7 +1,7 @@
 ---
 :LED_BUILTIN: 13
 :A0: 18
-:A1: 1
+:A1: 19
 :A2: 20
 :A3: 21
 :A4: 22

data/vendor/board-maps/yaml/AVR_LEONARDO_ETH.yml

@@ -1,7 +1,7 @@
 ---
 :LED_BUILTIN: 13
 :A0: 18
-:A1: 1
+:A1: 19
 :A2: 20
 :A3: 21
 :A4: 22

data/vendor/board-maps/yaml/AVR_LILYPAD_USB.yml

@@ -1,7 +1,7 @@
 ---
 :LED_BUILTIN: 13
 :A0: 18
-:A1: 1
+:A1: 19
 :A2: 20
 :A3: 21
 :A4: 22

data/vendor/board-maps/yaml/AVR_LININO_ONE.yml

@@ -1,7 +1,7 @@
 ---
 :LED_BUILTIN: 13
 :A0: 18
-:A1: 1
+:A1: 19
 :A2: 20
 :A3: 21
 :A4: 22

data/vendor/board-maps/yaml/AVR_MICRO.yml

@@ -1,7 +1,7 @@
 ---
 :LED_BUILTIN: 13
 :A0: 18
-:A1: 1
+:A1: 19
 :A2: 20
 :A3: 21
 :A4: 22

data/vendor/board-maps/yaml/AVR_ROBOT_CONTROL.yml

@@ -1,6 +1,6 @@
 ---
 :A0: 18
-:A1: 1
+:A1: 19
 :A2: 20
 :A3: 21
 :A4: 22

data/vendor/board-maps/yaml/AVR_ROBOT_MOTOR.yml

@@ -1,6 +1,6 @@
 ---
 :A0: 18
-:A1: 1
+:A1: 19
 :A2: 20
 :A3: 21
 :A4: 22

data/vendor/board-maps/yaml/AVR_YUN.yml

@@ -1,7 +1,7 @@
 ---
 :LED_BUILTIN: 13
 :A0: 18
-:A1: 1
+:A1: 19
 :A2: 20
 :A3: 21
 :A4: 22

data/vendor/board-maps/yaml/AVR_YUNMINI.yml

@@ -1,7 +1,7 @@
 ---
 :LED_BUILTIN: 13
 :A0: 18
-:A1: 1
+:A1: 19
 :A2: 20
 :A3: 21
 :A4: 22