From 7cacbe8789f58e860d45a6825155da0180b5bc36 Mon Sep 17 00:00:00 2001 From: Stephen Parry Date: Sun, 2 Aug 2020 17:03:32 +0100 Subject: [PATCH 1/5] Reorganised folder structure for arduino 1.5+ and added library metadata files. --- .development | 1 + keywords.txt | 1 + library.properties | 9 +++++++++ MemoryFree.cpp => src/MemoryFree.cpp | 0 MemoryFree.h => src/MemoryFree.h | 0 5 files changed, 11 insertions(+) create mode 100644 .development create mode 100644 keywords.txt create mode 100644 library.properties rename MemoryFree.cpp => src/MemoryFree.cpp (100%) rename MemoryFree.h => src/MemoryFree.h (100%) diff --git a/.development b/.development new file mode 100644 index 0000000..8d1c8b6 --- /dev/null +++ b/.development @@ -0,0 +1 @@ + diff --git a/keywords.txt b/keywords.txt new file mode 100644 index 0000000..30739ce --- /dev/null +++ b/keywords.txt @@ -0,0 +1 @@ +freeMemory KEYWORD2 diff --git a/library.properties b/library.properties new file mode 100644 index 0000000..a58972a --- /dev/null +++ b/library.properties @@ -0,0 +1,9 @@ +name=MemoryFree +version=1.0 +author=Various; see https://forum.arduino.cc/index.php?topic=27536.0 +maintainer=Neil McNeight (http://mcneight.org/) +sentence=Functions for calculating amount for free data memory (RAM). +paragraph=Functions for calculating amount for free data memory (RAM). +category=Other +url=https://github.com/McNeight/MemoryFree +architectures=* diff --git a/MemoryFree.cpp b/src/MemoryFree.cpp similarity index 100% rename from MemoryFree.cpp rename to src/MemoryFree.cpp diff --git a/MemoryFree.h b/src/MemoryFree.h similarity index 100% rename from MemoryFree.h rename to src/MemoryFree.h From 1b8db18730eaf23a56c08daf91be4996d9c5b811 Mon Sep 17 00:00:00 2001 From: Stephen Parry Date: Sat, 15 Aug 2020 18:32:59 +0100 Subject: [PATCH 2/5] Corrections in line with latest arduino library standards --- .development | 1 - .gitignore | 1 + keywords.txt | 2 +- library.properties | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 .development diff --git a/.development b/.development deleted file mode 100644 index 8d1c8b6..0000000 --- a/.development +++ /dev/null @@ -1 +0,0 @@ - diff --git a/.gitignore b/.gitignore index cdbd978..51f9749 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,6 @@ [._]s[a-w][a-z] *.un~ Session.vim +.development .netrwhist *~ diff --git a/keywords.txt b/keywords.txt index 30739ce..ccea7b3 100644 --- a/keywords.txt +++ b/keywords.txt @@ -1 +1 @@ -freeMemory KEYWORD2 +freeMemory KEYWORD2 diff --git a/library.properties b/library.properties index a58972a..9ae5378 100644 --- a/library.properties +++ b/library.properties @@ -1,9 +1,9 @@ name=MemoryFree -version=1.0 +version=1.0.0 author=Various; see https://forum.arduino.cc/index.php?topic=27536.0 maintainer=Neil McNeight (http://mcneight.org/) sentence=Functions for calculating amount for free data memory (RAM). -paragraph=Functions for calculating amount for free data memory (RAM). +paragraph=This library contains functions for calculating the amount for free data memory (RAM) available, based on factors such as the top of heap, stack size and the size of the free list. category=Other url=https://github.com/McNeight/MemoryFree architectures=* From d935b116acdc4a0c4f2c0993623b1d2c3fd41741 Mon Sep 17 00:00:00 2001 From: Stephen Parry Date: Sat, 15 Aug 2020 18:57:43 +0100 Subject: [PATCH 3/5] Attempt fix stalling travis build --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 091f37f..300b6ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,10 @@ install: - ln -s $PWD $HOME/arduino_ide/libraries/MemoryFree - export PATH="$HOME/arduino_ide:$PATH" - arduino --pref "boardsmanager.additional.urls=https://adafruit.github.io/arduino-board-index/package_adafruit_index.json,http://arduino.esp8266.com/stable/package_esp8266com_index.json" --save-prefs 2>&1 - - arduino --install-boards arduino:sam 2>&1 /dev/null - - arduino --install-boards arduino:samd 2>&1 /dev/null - - arduino --install-boards esp8266:esp8266 2>&1 /dev/null - - arduino --install-boards adafruit:avr 2>&1 /dev/null + - arduino --install-boards arduino:sam 2>&1 + - arduino --install-boards arduino:samd 2>&1 + - arduino --install-boards esp8266:esp8266 2>&1 + - arduino --install-boards adafruit:avr 2>&1 - arduino --install-library TinyWireM 2>&1 - arduino --pref "compiler.warning_level=all" --save-prefs script: From 48f46cac29fc3d356c354034f1d80cc0d393c02c Mon Sep 17 00:00:00 2001 From: Stephen Parry Date: Wed, 19 Aug 2020 21:41:51 +0100 Subject: [PATCH 4/5] travis: TinyWireM already included in install. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 300b6ec..f5e0c52 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,6 @@ install: - arduino --install-boards arduino:samd 2>&1 - arduino --install-boards esp8266:esp8266 2>&1 - arduino --install-boards adafruit:avr 2>&1 - - arduino --install-library TinyWireM 2>&1 - arduino --pref "compiler.warning_level=all" --save-prefs script: - arduino --verify --board arduino:avr:uno $PWD/examples/FreeMemory/FreeMemory.ino From 97e25d58f712680c9d39f1cb3004f452ec287a7e Mon Sep 17 00:00:00 2001 From: per1234 Date: Wed, 19 Aug 2020 21:51:25 -0700 Subject: [PATCH 5/5] Correct board ID for Zero in Travis CI configuration Incorrect FQBN causes the Arduino IDE to attempt to start the GUI, which results in a hang and eventual timeout on the headless Travis CI machine. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f5e0c52..f956021 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ install: script: - arduino --verify --board arduino:avr:uno $PWD/examples/FreeMemory/FreeMemory.ino - arduino --verify --board arduino:sam:arduino_due_x $PWD/examples/FreeMemory/FreeMemory.ino - - arduino --verify --board arduino:samd:zero $PWD/examples/FreeMemory/FreeMemory.ino + - arduino --verify --board arduino:samd:arduino_zero_edbg $PWD/examples/FreeMemory/FreeMemory.ino - arduino --verify --board esp8266:esp8266:huzzah $PWD/examples/FreeMemory/FreeMemory.ino - arduino --verify --board arduino:avr:leonardo $PWD/examples/FreeMemory/FreeMemory.ino - arduino --verify --board adafruit:avr:trinket5 $PWD/examples/FreeMemory/FreeMemory.ino