arduino_ci 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70602a4768ed2df9cbd04f83888f229119f00267
-  data.tar.gz: 337f60474895f3cfdecd9497328a7772adcc9254
+  metadata.gz: 36ae4dec579913479fdb655f0bf7be717b055149
+  data.tar.gz: ba9d142cd8c840a9bd54ec84efa4e6351ddc45b0
 SHA512:
-  metadata.gz: 78f6e93158cd15a1398396a631646f20b4ce843d5fd386185505ea84b230f2fc5da927e532bdb174818bf73c060bdb09d2e870ab742653df58fa68c802a37c49
-  data.tar.gz: 2cf0fb5e0755ed5fe2ac989fa591a923fb162c922499c6467a45edb7dd6bd811a2e23ceb945597cf48311656fee45cb0eddbc5005d0688a52179dedf4cce01ec
+  metadata.gz: dfaefbfed33fa5dc78c8c106311c8896328f3416557a640f1b5366bb3f2278de8993da41386073aca8d274c8de03b405f7b991fdd91068ecf80ff9c3f3bff421
+  data.tar.gz: 7c56fe74249b2849338a6f439361d658ed49ff9e68b7e5cb3b73d686542a08ada22d45b036d03e0b6196807ed229fa6c0a330f88ba6723b45de2add5b6f351c1

data/README.md

@@ -1,5 +1,5 @@
 
-# ArduinoCI Ruby gem (`arduino_ci`) [![Gem Version](https://badge.fury.io/rb/arduino_ci.svg)](https://rubygems.org/gems/arduino_ci) [![Documentation](http://img.shields.io/badge/docs-rdoc.info-blue.svg)](http://www.rubydoc.info/gems/arduino_ci/0.1.19)
+# ArduinoCI Ruby gem (`arduino_ci`) [![Gem Version](https://badge.fury.io/rb/arduino_ci.svg)](https://rubygems.org/gems/arduino_ci) [![Documentation](http://img.shields.io/badge/docs-rdoc.info-blue.svg)](http://www.rubydoc.info/gems/arduino_ci/0.1.20)
 
 You want to run tests on your Arduino library (bonus: without hardware present), but the IDE doesn't support that.  Arduino CI provides that ability.
 

data/cpp/arduino/Arduino.h.orig

@@ -0,0 +1,143 @@
+#pragma once
+/*
+Mock Arduino.h library.
+
+Where possible, variable names from the Arduino library are used to avoid conflicts
+
+*/
+// Chars and strings
+
+#include "ArduinoDefines.h"
+
+#include "WCharacter.h"
+#include "WString.h"
+#include "Print.h"
+#include "Stream.h"
+#include "HardwareSerial.h"
+#include "SPI.h"
+#include "Nullptr.h"
+
+typedef bool boolean;
+typedef uint8_t byte;
+
+#include "binary.h"
+
+// Math and Trig
+#include "AvrMath.h"
+
+#include "Godmode.h"
+
+
+// Bits and Bytes
+#define bit(b) (1UL << (b))
+#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
+#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
+#define bitSet(value, bit) ((value) |= (1UL << (bit)))
+#define bitWrite(value, bit, bitvalue) (bitvalue ? bitSet(value, bit) : bitClear(value, bit))
+#define highByte(w) ((uint8_t) ((w) >> 8))
+#define lowByte(w) ((uint8_t) ((w) & 0xff))
+
+// Arduino defines this
+#define _NOP() do { 0; } while (0)
+
+// might as well use that NO-op macro for these, while unit testing
+// you need interrupts? interrupt yourself
+#define yield() _NOP()
+#define interrupts() _NOP()
+#define noInterrupts() _NOP()
+
+// TODO: correctly establish this per-board!
+#define F_CPU 1000000UL
+#define clockCyclesPerMicrosecond() ( F_CPU / 1000000L )
+#define clockCyclesToMicroseconds(a) ( (a) / clockCyclesPerMicrosecond() )
+#define microsecondsToClockCycles(a) ( (a) * clockCyclesPerMicrosecond() )
+
+typedef unsigned int word;
+
+#define bit(b) (1UL << (b))
+
+
+
+/*
+unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
+unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout);
+
+void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
+uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
+
+*/
+
+// Get the bit location within the hardware port of the given virtual pin.
+// This comes from the pins_*.c file for the active board configuration.
+
+#define analogInPinToBit(P) (P)
+#define digitalPinToInterrupt(P) (P)
+
+/*
+// On the ATmega1280, the addresses of some of the port registers are
+// greater than 255, so we can't store them in uint8_t's.
+extern const uint16_t PROGMEM port_to_mode_PGM[];
+extern const uint16_t PROGMEM port_to_input_PGM[];
+extern const uint16_t PROGMEM port_to_output_PGM[];
+
+extern const uint8_t PROGMEM digital_pin_to_port_PGM[];
+// extern const uint8_t PROGMEM digital_pin_to_bit_PGM[];
+extern const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[];
+extern const uint8_t PROGMEM digital_pin_to_timer_PGM[];
+
+// Get the bit location within the hardware port of the given virtual pin.
+// This comes from the pins_*.c file for the active board configuration.
+//
+// These perform slightly better as macros compared to inline functions
+//
+#define digitalPinToPort(P) ( pgm_read_byte( digital_pin_to_port_PGM + (P) ) )
+#define digitalPinToBitMask(P) ( pgm_read_byte( digital_pin_to_bit_mask_PGM + (P) ) )
+#define digitalPinToTimer(P) ( pgm_read_byte( digital_pin_to_timer_PGM + (P) ) )
+#define analogInPinToBit(P) (P)
+#define portOutputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_output_PGM + (P))) )
+#define portInputRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_input_PGM + (P))) )
+#define portModeRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_mode_PGM + (P))) )
+
+*/
+
+
+/* TODO
+
+// USB
+#include "USBAPI.h"
+Keyboard
+Mouse
+
+*/
+
+// uint16_t makeWord(uint16_t w);
+// uint16_t makeWord(byte h, byte l);
+inline unsigned int makeWord(unsigned int w) { return w; }
+inline unsigned int makeWord(unsigned char h, unsigned char l) { return (h << 8) | l; }
+
+#define word(...) makeWord(__VA_ARGS__)
+
+<<<<<<< Updated upstream
+
+=======
+unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
+unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
+
+// audio is taken care of in GODMODE
+
+
+// BIG TODO ON THIS ONE
+// $ find . | grep pins_
+// ./arduino-1.8.5/hardware/arduino/avr/variants/circuitplay32u4/pins_arduino.h
+// ./arduino-1.8.5/hardware/arduino/avr/variants/eightanaloginputs/pins_arduino.h
+// ./arduino-1.8.5/hardware/arduino/avr/variants/ethernet/pins_arduino.h
+// ./arduino-1.8.5/hardware/arduino/avr/variants/gemma/pins_arduino.h
+// ./arduino-1.8.5/hardware/arduino/avr/variants/leonardo/pins_arduino.h
+// ./arduino-1.8.5/hardware/arduino/avr/variants/mega/pins_arduino.h
+// ./arduino-1.8.5/hardware/arduino/avr/variants/micro/pins_arduino.h
+// ./arduino-1.8.5/hardware/arduino/avr/variants/robot_control/pins_arduino.h
+// ./arduino-1.8.5/hardware/arduino/avr/variants/robot_motor/pins_arduino.h
+// ./arduino-1.8.5/hardware/arduino/avr/variants/standard/pins_arduino.h
+// ./arduino-1.8.5/hardware/arduino/avr/variants/yun/pins_arduino.h
+// #include "pins_arduino.h"
+>>>>>>> Stashed changes

data/cpp/unittest/ArduinoUnitTests.h

@@ -154,7 +154,9 @@ class Test
         p->mReporter = reporter;
         TestData t1 = {p->name(), p->result()};
         if (reporter) reporter->onTestStart(t1);
+        if (TestSetup::sInstance) TestSetup::sInstance->run();
         p->test();
+        if (TestTeardown::sInstance) TestTeardown::sInstance->run();
         if (p->mResult == RESULT_PASS) ++results.passed;
         if (p->mResult == RESULT_FAIL) ++results.failed;
         if (p->mResult == RESULT_SKIP) ++results.skipped;
@@ -172,9 +174,7 @@ class Test
     static int run_and_report(int argc, char *argv[]) {
       // TODO: pick a reporter based on args
       ReporterTAP rep;
-      if (TestSetup::sInstance) TestSetup::sInstance->run();
       Results results = run(&rep);
-      if (TestTeardown::sInstance) TestTeardown::sInstance->run();
       return results.failed + results.skipped;
     }
 

data/lib/arduino_ci/version.rb

@@ -1,3 +1,3 @@
 module ArduinoCI
-  VERSION = "0.1.19".freeze
+  VERSION = "0.1.20".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arduino_ci
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - Ian Katz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -123,6 +123,7 @@ files:
 - README.md
 - cpp/arduino/Arduino.cpp
 - cpp/arduino/Arduino.h
+- cpp/arduino/Arduino.h.orig
 - cpp/arduino/ArduinoDefines.h
 - cpp/arduino/AvrMath.h
 - cpp/arduino/Godmode.cpp