arduino_ci 0.1.10 → 0.1.11

data/cpp/arduino/Godmode.cpp

@@ -1,5 +1,6 @@
 #include "Godmode.h"
 #include "HardwareSerial.h"
+#include "SPI.h"
 
 GodmodeState godmode = GodmodeState();
 
@@ -67,6 +68,16 @@ int analogRead(unsigned char pin) {
   return godmode->analogPin[pin].retrieve();
 }
 
+void attachInterrupt(uint8_t interrupt, void ISR(void), uint8_t mode) {
+  GodmodeState* godmode = GODMODE();
+  godmode->interrupt[interrupt].attached = true;
+  godmode->interrupt[interrupt].mode = mode;
+}
+
+void detachInterrupt(uint8_t interrupt) {
+  GodmodeState* godmode = GODMODE();
+  godmode->interrupt[interrupt].attached = false;
+}
 
 // Serial ports
 #if defined(HAVE_HWSERIAL0)
@@ -87,3 +98,6 @@ inline std::ostream& operator << ( std::ostream& out, const PinHistory<T>& ph )
   out << ph;
   return out;
 }
+
+// defined in SPI.h
+SPIClass SPI = SPIClass(&godmode.spi.dataIn, &godmode.spi.dataOut);

data/cpp/arduino/Godmode.h

@@ -2,7 +2,6 @@
 #include "ArduinoDefines.h"
 #include <avr/io.h>
 #include "WString.h"
-#include "ci/Queue.h"
 #include "PinHistory.h"
 
 // random
@@ -39,8 +38,9 @@ class GodmodeState {
     unsigned long readDelayMicros;
   };
 
-  struct ToneDef {
-
+  struct InterruptDef {
+    bool attached;
+    uint8_t mode;
   };
 
   public:
@@ -50,6 +50,8 @@ class GodmodeState {
     PinHistory<bool> digitalPin[MOCK_PINS_COUNT];
     PinHistory<int> analogPin[MOCK_PINS_COUNT];
     struct PortDef serialPort[NUM_SERIAL_PORTS];
+    struct InterruptDef interrupt[MOCK_PINS_COUNT]; // not sure how to get actual number
+    struct PortDef spi;
 
     void resetPins() {
       for (int i = 0; i < MOCK_PINS_COUNT; ++i) {
@@ -62,9 +64,33 @@ class GodmodeState {
       micros = 0;
     }
 
+    void resetInterrupts() {
+      for (int i = 0; i < MOCK_PINS_COUNT; ++i) {
+        interrupt[i].attached = false;
+      }
+    }
+
+    void resetPorts() {
+      for (int i = 0; i < serialPorts(); ++i)
+      {
+        serialPort[i].dataIn = "";
+        serialPort[i].dataOut = "";
+        serialPort[i].readDelayMicros = 0;
+      }
+    }
+
+    void resetSPI() {
+      spi.dataIn = "";
+      spi.dataOut = "";
+      spi.readDelayMicros = 0;
+    }
+
     void reset() {
       resetClock();
       resetPins();
+      resetInterrupts();
+      resetPorts();
+      resetSPI();
       seed = 1;
     }
 
@@ -75,14 +101,7 @@ class GodmodeState {
     GodmodeState()
     {
       reset();
-      for (int i = 0; i < serialPorts(); ++i)
-      {
-        serialPort[i].dataIn = "";
-        serialPort[i].dataOut = "";
-        serialPort[i].readDelayMicros = 0;
-      }
-  }
-
+    }
 };
 
 // io pins
@@ -95,10 +114,11 @@ int analogRead(uint8_t);
 void analogWrite(uint8_t, int);
 #define analogReadResolution(...) _NOP()
 #define analogWriteResolution(...) _NOP()
+void attachInterrupt(uint8_t interrupt, void ISR(void), uint8_t mode);
+void detachInterrupt(uint8_t interrupt);
 
 // TODO: issue #26 to track the commanded state here
 inline void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0) {}
-inline void tone(uint8_t _pin, unsigned int frequency) {}
 inline void noTone(uint8_t _pin) {}
 
 

data/cpp/arduino/SPI.h

@@ -0,0 +1,150 @@
+#pragma once
+
+#include "Stream.h"
+
+// defines from original file
+#define _SPI_H_INCLUDED
+#define SPI_HAS_TRANSACTION 1
+#define SPI_HAS_NOTUSINGINTERRUPT 1
+#define SPI_ATOMIC_VERSION 1
+#define SPI_CLOCK_DIV4 0x00
+#define SPI_CLOCK_DIV16 0x01
+#define SPI_CLOCK_DIV64 0x02
+#define SPI_CLOCK_DIV128 0x03
+#define SPI_CLOCK_DIV2 0x04
+#define SPI_CLOCK_DIV8 0x05
+#define SPI_CLOCK_DIV32 0x06
+#define SPI_MODE0 0x00
+#define SPI_MODE1 0x04
+#define SPI_MODE2 0x08
+#define SPI_MODE3 0x0C
+#define SPI_MODE_MASK 0x0C
+#define SPI_CLOCK_MASK 0x03
+#define SPI_2XCLOCK_MASK 0x01
+
+#ifndef LSBFIRST
+#define LSBFIRST 0
+#endif
+#ifndef MSBFIRST
+#define MSBFIRST 1
+#endif
+
+#if defined(EIMSK)
+  #define SPI_AVR_EIMSK  EIMSK
+#elif defined(GICR)
+  #define SPI_AVR_EIMSK  GICR
+#elif defined(GIMSK)
+  #define SPI_AVR_EIMSK  GIMSK
+#endif
+
+
+class SPISettings {
+public:
+  SPISettings(uint32_t clock, uint8_t bitOrder, uint8_t dataMode){};
+  SPISettings(){};
+};
+
+
+class SPIClass: public ObservableDataStream {
+public:
+
+  SPIClass(String* dataIn, String* dataOut) {
+    this->dataIn = dataIn;
+    this->dataOut = dataOut;
+  }
+
+  // Initialize the SPI library
+  void begin() { isStarted = true; }
+
+  // Disable the SPI bus
+  void end() { isStarted = false; }
+
+  // this has no tangible effect in a mocked Arduino
+  void usingInterrupt(uint8_t interruptNumber){}
+  void notUsingInterrupt(uint8_t interruptNumber){}
+
+  // Before using SPI.transfer() or asserting chip select pins,
+  // this function is used to gain exclusive access to the SPI bus
+  // and configure the correct settings.
+  void beginTransaction(SPISettings settings)
+  {
+    #ifdef SPI_TRANSACTION_MISMATCH_LED
+    if (inTransactionFlag) {
+      pinMode(SPI_TRANSACTION_MISMATCH_LED, OUTPUT);
+      digitalWrite(SPI_TRANSACTION_MISMATCH_LED, HIGH);
+    }
+    inTransactionFlag = 1;
+    #endif
+  }
+
+  // Write to the SPI bus (MOSI pin) and also receive (MISO pin)
+  uint8_t transfer(uint8_t data) {
+    //FIXME!
+    // push memory->bus
+    dataOut->append(String((char)data));
+    advertiseByte((char)data);
+
+    // pop bus->memory data from its queue and return it
+    if (dataIn->empty()) return 0;
+    char ret = (*dataIn)[0];
+    *dataIn = dataIn->substr(1, dataIn->length());
+    return ret;
+  }
+
+  uint16_t transfer16(uint16_t data) {
+    union { uint16_t val; struct { uint8_t lsb; uint8_t msb; }; } in, out;
+    in.val = data;
+    if (!(SPCR & (1 << DORD))) {
+      out.msb = transfer(in.msb);
+      out.lsb =  transfer(in.lsb);
+    } else {
+      out.lsb =  transfer(in.lsb);
+      out.msb = transfer(in.msb);
+    }
+    return out.val;
+  }
+
+  void transfer(void *buf, size_t count) {
+    // TODO: this logic is rewritten from the original,
+    // I'm not sure what role the SPDR register (which I removed) plays
+
+    uint8_t *p = (uint8_t *)buf;
+    for (int i = 0; i < count; ++i) {
+      *(p + i) = transfer(*(p + i));
+    }
+  }
+
+  // After performing a group of transfers and releasing the chip select
+  // signal, this function allows others to access the SPI bus
+  void endTransaction(void) {
+    #ifdef SPI_TRANSACTION_MISMATCH_LED
+    if (!inTransactionFlag) {
+      pinMode(SPI_TRANSACTION_MISMATCH_LED, OUTPUT);
+      digitalWrite(SPI_TRANSACTION_MISMATCH_LED, HIGH);
+    }
+    inTransactionFlag = 0;
+    #endif
+  }
+
+  // deprecated functions, skip 'em
+  void setBitOrder(uint8_t bitOrder){}
+  void setDataMode(uint8_t dataMode){}
+  void setClockDivider(uint8_t clockDiv){}
+  void attachInterrupt(){}
+  void detachInterrupt(){}
+
+private:
+  uint8_t initialized;   // initialized in Godmode.cpp
+  uint8_t interruptMode; // 0=none, 1=mask, 2=global
+  uint8_t interruptMask; // which interrupts to mask
+  uint8_t interruptSave; // temp storage, to restore state
+  #ifdef SPI_TRANSACTION_MISMATCH_LED
+  uint8_t inTransactionFlag;
+  #endif
+
+  bool isStarted = false;
+  String* dataIn;
+  String* dataOut;
+};
+
+extern SPIClass SPI;

data/cpp/arduino/ci/Table.h

@@ -27,6 +27,13 @@ class ArduinoCITable {
   public:
     ArduinoCITable() : mNilK(), mNilV() { init(); }
 
+    ArduinoCITable(const ArduinoCITable& obj) : mNilK(), mNilV() {
+      init();
+      for (Node* p = obj.mStart; p; p = p->next) {
+        add(p->key, p->val);
+      }
+    }
+
     // number of things in the table
     inline unsigned long size() const { return mSize; }
 
@@ -119,6 +126,7 @@ class ArduinoCITable {
         mStart = mStart->next;
         delete p;
       }
+      mSize = 0;
     }
 
     ~ArduinoCITable() { clear(); }

data/exe/arduino_ci_remote.rb

@@ -1,10 +1,12 @@
 #!/usr/bin/env ruby
 require 'arduino_ci'
 require 'set'
+require 'pathname'
 
 WIDTH = 80
 
 @failure_count = 0
+@passfail = proc { |result| result ? "✓" : "✗" }
 
 # terminate after printing any debug info.  TODO: capture debug info
 def terminate(final = nil)
@@ -21,7 +23,7 @@ def terminate(final = nil)
 end
 
 # make a nice status line for an action and react to the action
-def perform_action(message, multiline, on_fail_msg, abort_on_fail)
+def perform_action(message, multiline, mark_fn, on_fail_msg, abort_on_fail)
   line = "#{message}... "
   endline = "...#{message} "
   if multiline
@@ -29,8 +31,9 @@ def perform_action(message, multiline, on_fail_msg, abort_on_fail)
   else
     print line
   end
+  STDOUT.flush
   result = yield
-  mark = result ? "✓" : "✗"
+  mark = mark_fn.nil? ? "" : mark_fn.call(result)
   # if multline, put checkmark at full width
   print endline if multiline
   puts mark.rjust(WIDTH - line.length, " ")
@@ -45,17 +48,38 @@ end
 
 # Make a nice status for something that defers any failure code until script exit
 def attempt(message, &block)
-  perform_action(message, false, nil, false, &block)
+  perform_action(message, false, @passfail, nil, false, &block)
 end
 
 # Make a nice status for something that defers any failure code until script exit
 def attempt_multiline(message, &block)
-  perform_action(message, true, nil, false, &block)
+  perform_action(message, true, @passfail, nil, false, &block)
 end
 
 # Make a nice status for something that kills the script immediately on failure
 def assure(message, &block)
-  perform_action(message, false, "This may indicate a problem with ArduinoCI!", true, &block)
+  perform_action(message, false, @passfail, "This may indicate a problem with ArduinoCI, or your configuration", true, &block)
+end
+
+def assure_multiline(message, &block)
+  perform_action(message, true, @passfail, "This may indicate a problem with ArduinoCI, or your configuration", true, &block)
+end
+
+def inform(message, &block)
+  perform_action(message, false, proc { |x| x }, nil, false, &block)
+end
+
+def inform_multiline(message, &block)
+  perform_action(message, true, nil, nil, false, &block)
+end
+
+# Assure that a platform exists and return its definition
+def assured_platform(purpose, name, config)
+  platform_definition = config.platform_definition(name)
+  assure("Requested #{purpose} platform '#{name}' is defined in 'platforms' YML") do
+    !platform_definition.nil?
+  end
+  platform_definition
 end
 
 # initialize command and config
@@ -63,10 +87,23 @@ config = ArduinoCI::CIConfig.default.from_project_library
 @arduino_cmd = ArduinoCI::ArduinoInstallation.autolocate!
 
 # initialize library under test
-installed_library_path = assure("Installing library under test") { @arduino_cmd.install_local_library(".") }
+installed_library_path = attempt("Installing library under test") do
+  @arduino_cmd.install_local_library(Pathname.new("."))
+end
+if installed_library_path.exist?
+  inform("Library installed at") { installed_library_path.to_s }
+else
+  assure_multiline("Library installed successfully") do
+    @arduino_cmd.lib_dir.ascend do |path_part|
+      next unless path_part.exist?
+
+      break puts path_part.find.to_a.to_s
+    end
+    false
+  end
+end
 library_examples = @arduino_cmd.library_examples(installed_library_path)
-cpp_library = ArduinoCI::CppLibrary.new(installed_library_path)
-attempt("Library installed at #{installed_library_path}") { true }
+cpp_library = ArduinoCI::CppLibrary.new(installed_library_path, @arduino_cmd.lib_dir)
 
 # check GCC
 compilers = config.compilers_to_use
@@ -75,6 +112,7 @@ compilers.each do |gcc_binary|
   attempt_multiline("Checking #{gcc_binary} version") do
     version = cpp_library.gcc_version(gcc_binary)
     next nil unless version
+
     puts version.split("\n").map { |l| "    #{l}" }.join("\n")
     version
   end
@@ -85,10 +123,11 @@ end
 # while we're doing that, get the aux libraries as well
 all_platforms = {}
 aux_libraries = Set.new(config.aux_libraries_for_unittest + config.aux_libraries_for_build)
-config.platforms_to_unittest.each { |p| all_platforms[p] = config.platform_definition(p) }
+# while collecting the platforms, ensure they're defined
+config.platforms_to_unittest.each { |p| all_platforms[p] = assured_platform("unittest", p, config) }
 library_examples.each do |path|
   ovr_config = config.from_example(path)
-  ovr_config.platforms_to_build.each { |p| all_platforms[p] = config.platform_definition(p) }
+  ovr_config.platforms_to_build.each { |p| all_platforms[p] = assured_platform("library example", p, config) }
   aux_libraries.merge(ovr_config.aux_libraries_for_build)
 end
 
@@ -109,22 +148,34 @@ all_packages.each do |p|
 end
 
 aux_libraries.each do |l|
-  assure("Installing aux library '#{l}'") { @arduino_cmd.install_library(l) }
+  if @arduino_cmd.library_present?(l)
+    inform("Using pre-existing library") { l.to_s }
+  else
+    assure("Installing aux library '#{l}'") { @arduino_cmd.install_library(l) }
+  end
 end
 
 # iterate boards / tests
 last_board = nil
-if cpp_library.test_files.empty?
-  attempt("Skipping unit tests; no test files were found") { true }
+if !cpp_library.tests_dir.exist?
+  inform_multiline("Skipping unit tests; no tests dir at #{cpp_library.tests_dir}") do
+    puts cpp_library.tests_dir.find.to_a.to_s
+    true
+  end
+elsif cpp_library.test_files.empty?
+  inform_multiline("Skipping unit tests; no test files were found in #{cpp_library.tests_dir}") do
+    puts cpp_library.tests_dir.find.to_a.to_s
+    true
+  end
 elsif config.platforms_to_unittest.empty?
-  attempt("Skipping unit tests; no platforms were requested") { true }
+  inform("Skipping unit tests") { "no platforms were requested" }
 else
   config.platforms_to_unittest.each do |p|
     board = all_platforms[p][:board]
-    # assure("Switching to board for #{p} (#{board})") { @arduino_cmd.use_board(board) } unless last_board == board
+    assure("Switching to board for #{p} (#{board})") { @arduino_cmd.use_board(board) } unless last_board == board
     last_board = board
     cpp_library.test_files.each do |unittest_path|
-      unittest_name = File.basename(unittest_path)
+      unittest_name = unittest_path.basename.to_s
       compilers.each do |gcc_binary|
         attempt_multiline("Unit testing #{unittest_name} with #{gcc_binary}") do
           exe = cpp_library.build_for_test_with_configuration(
@@ -147,26 +198,30 @@ else
   end
 end
 
-unless library_examples.empty?
+if library_examples.empty?
+  inform_multiline("Skipping libraries; no examples found in #{installed_library_path}") do
+    puts installed_library_path.find.to_a.to_s
+  end
+else
   attempt("Setting compiler warning level")  { @arduino_cmd.set_pref("compiler.warning_level", "all") }
-end
 
-# unlike previous, iterate examples / boards
-library_examples.each do |example_path|
-  ovr_config = config.from_example(example_path)
-  ovr_config.platforms_to_build.each do |p|
-    board = all_platforms[p][:board]
-    assure("Switching to board for #{p} (#{board})") { @arduino_cmd.use_board(board) } unless last_board == board
-    last_board = board
-    example_name = File.basename(example_path)
-    attempt("Verifying #{example_name}") do
-      ret = @arduino_cmd.verify_sketch(example_path)
-      unless ret
-        puts
-        puts "Last command: #{@arduino_cmd.last_msg}"
-        puts @arduino_cmd.last_err
+  # unlike previous, iterate examples / boards
+  library_examples.each do |example_path|
+    ovr_config = config.from_example(example_path)
+    ovr_config.platforms_to_build.each do |p|
+      board = all_platforms[p][:board]
+      assure("Switching to board for #{p} (#{board})") { @arduino_cmd.use_board(board) } unless last_board == board
+      last_board = board
+      example_name = File.basename(example_path)
+      attempt("Verifying #{example_name}") do
+        ret = @arduino_cmd.verify_sketch(example_path)
+        unless ret
+          puts
+          puts "Last command: #{@arduino_cmd.last_msg}"
+          puts @arduino_cmd.last_err
+        end
+        ret
       end
-      ret
     end
   end
 end