Fix compilation errors in busIO code

Author: ianfixes

CHANGELOG.md

@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Mocks of built-in macros made more accurate
 - NUM_SERIAL_PORTS can now be set explicitly
 - Improve SPI header strategy
+- Arduino backend is now `arduino-cli` version `0.13.0`
 
 ### Fixed
 - Don't define `ostream& operator<<(nullptr_t)` if already defined by Apple
@@ -39,6 +40,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Deprecated `arduino_ci_remote.rb` in favor of `arduino_ci.rb`
 
 ### Removed
+- `ARDUINO_CI_SKIP_SPLASH_SCREEN_RSPEC_TESTS` no longer affects any tests because there are no longer splash screens since switching to `arduino-cli`
 
 ### Security
 

CONTRIBUTING.md

@@ -31,7 +31,6 @@ See `SampleProjects/TestSomething/test/*.cpp` for the existing tests (run by rsp
 
 To speed up testing by targeting only the files you're working on, you can set several environment variables that `bundle exec rspec` will respond to:
 
-* `ARDUINO_CI_SKIP_SPLASH_SCREEN_RSPEC_TESTS`: if set, this will avoid any rspec test that calls the arduino executable (and as such, causes the splash screen to pop up).
 * `ARDUINO_CI_SKIP_RUBY_RSPEC_TESTS`: if set, this will skip all tests against ruby code (useful if you are not changing Ruby code).
 * `ARDUINO_CI_SKIP_CPP_RSPEC_TESTS`: if set, this will skip all tests against the `TestSomething` sample project (useful if you are not changing C++ code).
 * `ARDUINO_CI_SELECT_CPP_TESTS=<glob>`: if set, this will skip all C++ unit tests whose filenames don't match the provided glob (executed in the tests directory)

SampleProjects/BusIO/src/BusIO.h

@@ -6,4 +6,4 @@ class BusIO {
   BusIO() {}
   ~BusIO() {}
   int answer() { return 42; }
-}
+};

SampleProjects/BusIO/test/test.cpp renamed to SampleProjects/BusIO/test/busio.cpp

@@ -8,10 +8,10 @@ bundle exec arduino_ci.rb --skip-examples-compilation
 #include <ArduinoUnitTests.h>
 #include <BusIO.h>
 
-unittest(loop) {
+unittest(busio_answer) {
   // token test
   BusIO busIO;
-  assertEqual(42, busIO.answer()));
+  assertEqual(42, busIO.answer());
 }
 
 unittest_main()

cpp/arduino/Wire.h

@@ -116,7 +116,7 @@ class TwoWire : public ObservableDataStream {
   // https://www.arduino.cc/en/Reference/WireRequestFrom
   // Used by the master to request bytes from a slave device. The bytes may then
   // be retrieved with the available() and read() functions.
-  uint8_t requestFrom(uint8_t address, size_t quantity, bool stop) {
+  uint8_t requestFrom(uint8_t address, uint8_t quantity, uint32_t _iaddress, uint8_t _isize, uint8_t stop) {
     assert(_didBegin);
     assert(address > 0 && address < SLAVE_COUNT);
     assert(quantity <= BUFFER_LENGTH);
@@ -131,11 +131,20 @@ class TwoWire : public ObservableDataStream {
       return 0;
     }
   }
+
+  uint8_t requestFrom(uint8_t address, uint8_t quantity, uint8_t stop) {
+    return requestFrom((uint8_t)address, (uint8_t)quantity, (uint32_t)0, (uint8_t)0, (uint8_t)stop);
+  }
+
+  uint8_t requestFrom(uint8_t address, uint8_t quantity) {
+    return requestFrom((uint8_t)address, (uint8_t)quantity, (uint8_t)true);
+  }
+
   uint8_t requestFrom(int address, int quantity) {
-    return requestFrom((uint8_t)address, (size_t)quantity, true);
+    return requestFrom((uint8_t)address, (uint8_t)quantity, (uint8_t)true);
   }
   uint8_t requestFrom(int address, int quantity, int stop) {
-    return requestFrom((uint8_t)address, (size_t)quantity, (bool)stop);
+    return requestFrom((uint8_t)address, (uint8_t)quantity, (uint8_t)stop);
   }
 
   // https://www.arduino.cc/en/Reference/WireWrite

exe/arduino_ci.rb

@@ -262,9 +262,6 @@ def perform_compilation_tests(config)
     return
   end
 
-  # index the existing libraries
-  attempt("Indexing libraries") { @arduino_cmd.index_libraries } unless @arduino_cmd.libraries_indexed
-
   # initialize library under test
   installed_library_path = attempt("Installing library under test") do
     @arduino_cmd.install_local_library(Pathname.new("."))
@@ -345,7 +342,6 @@ def perform_compilation_tests(config)
 
   install_arduino_library_dependencies(aux_libraries)
 
-  last_board = nil
   if config.platforms_to_build.empty?
     inform("Skipping builds") { "no platforms were requested" }
     return
@@ -356,8 +352,6 @@ def perform_compilation_tests(config)
     return
   end
 
-  attempt("Setting compiler warning level")  { @arduino_cmd.set_pref("compiler.warning_level", "all") }
-
   # switching boards takes time, so iterate board first
   # _then_ whichever examples match it
   examples_by_platform = library_examples.each_with_object({}) do |example_path, acc|
@@ -370,13 +364,10 @@ def perform_compilation_tests(config)
 
   examples_by_platform.each do |platform, example_paths|
     board = example_platform_info[platform][:board]
-    assure("Switching to board for #{platform} (#{board})") { @arduino_cmd.use_board(board) } unless last_board == board
-    last_board = board
-
     example_paths.each do |example_path|
       example_name = File.basename(example_path)
-      attempt("Verifying #{example_name}") do
-        ret = @arduino_cmd.verify_sketch(example_path)
+      attempt("Compiling #{example_name} for #{board}") do
+        ret = @arduino_cmd.compile_sketch(example_path, board)
         unless ret
           puts
           puts "Last command: #{@arduino_cmd.last_msg}"
@@ -393,7 +384,7 @@ def perform_compilation_tests(config)
 config = ArduinoCI::CIConfig.default.from_project_library
 
 @arduino_cmd = ArduinoCI::ArduinoInstallation.autolocate!
-inform("Located Arduino binary") { @arduino_cmd.binary_path.to_s }
+inform("Located arduino-cli binary") { @arduino_cmd.binary_path.to_s }
 
 perform_unit_tests(config)
 perform_compilation_tests(config)