Merge branch 'master' into BusIO

Author: James Foster

CHANGELOG.md

@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 ### Added
 - `arduino_ci_remote.rb` CLI switch `--skip-examples-compilation`
-- Add support for `diditalPinToPort()`, `digitalPinToBitMask()`, and `portOutputRegister()`
+- Add support for `diditalPinToPort()`, `digitalPinToBitMask()`, `portOutputRegister()`, and `portInputRegister()`
 - `CppLibrary.header_files` to find header files
 - `LibraryProperties` to read metadata from Arduino libraries
 - `CppLibrary.library_properties_path`, `CppLibrary.library_properties?`, `CppLibrary.library_properties` to expose library properties of a Cpp library
@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Don't define `ostream& operator<<(nullptr_t)` if already defined by Apple
 - `CppLibrary.in_tests_dir?` no longer produces an error if there is no tests directory
 - The definition of the `_SFR_IO8` macro no longer produces errors about rvalues
+- Typo in `cpp_library.rb`, misspelling of `aux_libraries`
 
 ### Deprecated
 - `arduino_ci_remote.rb` CLI switch `--skip-compilation`

SampleProjects/TestSomething/test/outputRegister.cpp

@@ -21,6 +21,23 @@ unittest(portOutputRegister)
   *(ss_pin_reg) |= ss_pin_mask;               // clear SS
   assertEqual((int) 1, (int) *ss_pin_reg);    // verify value
 }
+
+unittest(portInputRegister)
+{
+  uint8_t ss_pin = 12;
+  uint8_t ss_port = digitalPinToPort(ss_pin);
+  assertEqual(12, ss_port);
+  uint8_t *ss_pin_reg = portInputRegister(ss_port);
+  assertEqual(GODMODE()->pMmapPort(ss_port), ss_pin_reg);
+  uint8_t ss_pin_mask = digitalPinToBitMask(ss_pin);
+  assertEqual(1, ss_pin_mask);
+
+  assertEqual((int) 1, (int) *ss_pin_reg);    // verify initial value
+  *(ss_pin_reg) &= ~ss_pin_mask;              // set SS
+  assertEqual((int) 0, (int) *ss_pin_reg);    // verify value
+  *(ss_pin_reg) |= ss_pin_mask;               // clear SS
+  assertEqual((int) 1, (int) *ss_pin_reg);    // verify value
+}
 #endif
 
 unittest_main()

cpp/arduino/Godmode.h

@@ -182,6 +182,7 @@ inline void noTone(uint8_t _pin) {}
 #if defined(__AVR__)
   #define digitalPinToBitMask(pin)  (1)
   #define digitalPinToPort(pin)     (pin)
+  #define portInputRegister(port)   (GODMODE()->pMmapPort(port))
   #define portOutputRegister(port)  (GODMODE()->pMmapPort(port))
 #else
   // we don't (yet) support other boards

lib/arduino_ci/cpp_library.rb

@@ -410,7 +410,7 @@ def build_for_test_with_configuration(test_file, aux_libraries, gcc_binary, ci_g
 
       # combine library.properties defs (if existing) with config file.
       # TODO: as much as I'd like to rely only on the properties file(s), I think that would prevent testing 1.0-spec libs
-      full_aux_libraries = arduino_library_dependencies.nil? ? aux_libraries : aux_libaries + arduino_library_dependencies
+      full_aux_libraries = arduino_library_dependencies.nil? ? aux_libraries : aux_libraries + arduino_library_dependencies
       arg_sets << test_args(full_aux_libraries, ci_gcc_config)
       arg_sets << cpp_files_libraries(full_aux_libraries).map(&:to_s)
       arg_sets << [test_file.to_s]