Skip to content

Commit

Permalink
Merge pull request #25 from bxparks/develop
Browse files Browse the repository at this point in the history
merge v1.2.4 into master
  • Loading branch information
bxparks committed Jan 22, 2021
2 parents e3b2e54 + 37424df commit 53382ef
Show file tree
Hide file tree
Showing 68 changed files with 95 additions and 92 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/aunit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Setup
run: |
cd ..
git clone https://github.com/bxparks/UnixHostDuino
git clone https://github.com/bxparks/EpoxyDuino
git clone https://github.com/bxparks/AceCommon
git clone https://github.com/bxparks/AUnit
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Changelog

* Unreleased
* 1.2.4 (2021-01-22)
* Update UnixHostDuino 0.4 to EpoxyDuino 0.5.
* No functional change in this release.
* 1.2.3 (2021-01-19)
* Add official support for STM32 by validating on a Blue Pill board.
* Add scripts to `AutoBenchmark` to automate data collection.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ AceRoutine is a self-contained library that works on any platform supporting the
Arduino API (AVR, Teensy, ESP8266, ESP32, etc), and it provides a handful of
additional macros that can reduce boilerplate code.

**Version**: 1.2.3 (2021-01-19)
**Version**: 1.2.4 (2021-01-22)

**Changelog**: [CHANGELOG.md](CHANGELOG.md)

Expand Down Expand Up @@ -511,7 +511,7 @@ It should work with [PlatformIO](https://platformio.org/) but I have
not tested it.
The library works on Linux or MacOS (using both g++ and clang++ compilers) using
the [UnixHostDuino](https://github.com/bxparks/UnixHostDuino) emulation layer.
the [EpoxyDuino](https://github.com/bxparks/EpoxyDuino) emulation layer.
### Operating System
Expand Down
2 changes: 1 addition & 1 deletion USER_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ See the [README.md](README.md) for installation instructions and other
background information. This document describes how to use the library once it
is installed.

**Version**: 1.2.3 (2021-01-19)
**Version**: 1.2.4 (2021-01-22)

## Table of Contents

Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "AceRoutine"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 1.2.3
PROJECT_NUMBER = 1.2.4

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
6 changes: 3 additions & 3 deletions docs/html/AceRoutine_8h_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down Expand Up @@ -103,8 +103,8 @@
<div class="line"><a name="l00041"></a><span class="lineno"> 41</span>&#160;<span class="preprocessor">#include &quot;ace_routine/Channel.h&quot;</span></div>
<div class="line"><a name="l00042"></a><span class="lineno"> 42</span>&#160; </div>
<div class="line"><a name="l00043"></a><span class="lineno"> 43</span>&#160;<span class="comment">// Version format: xxyyzz == &quot;xx.yy.zz&quot;</span></div>
<div class="line"><a name="l00044"></a><span class="lineno"> 44</span>&#160;<span class="preprocessor">#define ACE_ROUTINE_VERSION 10203</span></div>
<div class="line"><a name="l00045"></a><span class="lineno"> 45</span>&#160;<span class="preprocessor">#define ACE_ROUTINE_VERSION_STRING &quot;1.2.3&quot;</span></div>
<div class="line"><a name="l00044"></a><span class="lineno"> 44</span>&#160;<span class="preprocessor">#define ACE_ROUTINE_VERSION 10204</span></div>
<div class="line"><a name="l00045"></a><span class="lineno"> 45</span>&#160;<span class="preprocessor">#define ACE_ROUTINE_VERSION_STRING &quot;1.2.4&quot;</span></div>
<div class="line"><a name="l00046"></a><span class="lineno"> 46</span>&#160; </div>
<div class="line"><a name="l00047"></a><span class="lineno"> 47</span>&#160;<span class="preprocessor">#endif</span></div>
</div><!-- fragment --></div><!-- contents -->
Expand Down
2 changes: 1 addition & 1 deletion docs/html/Channel_8h_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/CoroutineScheduler_8cpp_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/CoroutineScheduler_8h_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/Coroutine_8cpp_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/Coroutine_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/Coroutine_8h_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/annotated.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classace__routine_1_1Channel-members.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classace__routine_1_1Channel.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classace__routine_1_1Coroutine-members.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classace__routine_1_1Coroutine.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classace__routine_1_1CoroutineScheduler.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classes.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/compat_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
4 changes: 2 additions & 2 deletions docs/html/compat_8h_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down Expand Up @@ -122,7 +122,7 @@
<div class="line"><a name="l00071"></a><span class="lineno"> 71</span>&#160;<span class="preprocessor">#elif defined(ESP32)</span></div>
<div class="line"><a name="l00072"></a><span class="lineno"> 72</span>&#160;<span class="preprocessor"> #include &lt;pgmspace.h&gt;</span></div>
<div class="line"><a name="l00073"></a><span class="lineno"> 73</span>&#160; </div>
<div class="line"><a name="l00074"></a><span class="lineno"> 74</span>&#160;<span class="preprocessor">#elif defined(UNIX_HOST_DUINO)</span></div>
<div class="line"><a name="l00074"></a><span class="lineno"> 74</span>&#160;<span class="preprocessor">#elif defined(EPOXY_DUINO)</span></div>
<div class="line"><a name="l00075"></a><span class="lineno"> 75</span>&#160;<span class="preprocessor"> #include &lt;pgmspace.h&gt;</span></div>
<div class="line"><a name="l00076"></a><span class="lineno"> 76</span>&#160; </div>
<div class="line"><a name="l00077"></a><span class="lineno"> 77</span>&#160;<span class="preprocessor">#else</span></div>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/dir_000000_000001.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/dir_bbf1ec131ffa96b8d365d81f56025723.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/files.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/functions.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/functions_func.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/functions_type.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/functions_vars.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/globals.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/globals_defs.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/graph_legend.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">AceRoutine
&#160;<span id="projectnumber">1.2.3</span>
&#160;<span id="projectnumber">1.2.4</span>
</div>
<div id="projectbrief">A low-memory, fast-switching, cooperative multitasking library using stackless coroutines on Arduino platforms.</div>
</td>
Expand Down
4 changes: 2 additions & 2 deletions examples/AutoBenchmark/AutoBenchmark.ino
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ void printStats(float baselineMicros, float coroutineMicros) {
}

void setup() {
#if ! defined(UNIX_HOST_DUINO)
#if ! defined(EPOXY_DUINO)
delay(1000);
#endif

Expand Down Expand Up @@ -95,7 +95,7 @@ void setup() {

SERIAL_PORT_MONITOR.println(F("END"));

#if defined(UNIX_HOST_DUINO)
#if defined(EPOXY_DUINO)
exit(0);
#endif
}
Expand Down
4 changes: 2 additions & 2 deletions examples/AutoBenchmark/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# See https://github.com/bxparks/UnixHostDuino for documentation about this
# See https://github.com/bxparks/EpoxyDuino for documentation about this
# Makefile to compile and run Arduino programs natively on Linux or MacOS.

APP_NAME := AutoBenchmark
ARDUINO_LIBS := AceCommon AceRoutine
include ../../../UnixHostDuino/UnixHostDuino.mk
include ../../../EpoxyDuino/EpoxyDuino.mk

.PHONY: benchmarks

Expand Down
2 changes: 1 addition & 1 deletion examples/AutoBenchmark/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ is the overhead caused by the `Coroutine` context switch.

All times in below are in microseconds.

**Version**: AceRoutine v1.2.3
**Version**: AceRoutine v1.2.4

**DO NOT EDIT**: This file was auto-generated using `make README.md`.

Expand Down
2 changes: 1 addition & 1 deletion examples/AutoBenchmark/generate_readme.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
All times in below are in microseconds.
**Version**: AceRoutine v1.2.3
**Version**: AceRoutine v1.2.4
**DO NOT EDIT**: This file was auto-generated using `make README.md`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ BlinkSlowCoroutine blinkSlow;
ButtonCoroutine buttonCoroutine(blinkFast, blinkSlow);

void setup() {
#if ! defined(UNIX_HOST_DUINO)
#if ! defined(EPOXY_DUINO)
delay(1000);
#endif
Serial.begin(115200);
Expand Down
Loading

0 comments on commit 53382ef

Please sign in to comment.