From 24ea452a554025cbd812d0f0a74d25c36f65ae1d Mon Sep 17 00:00:00 2001 From: James Foster Date: Sun, 4 Apr 2021 12:10:41 -0700 Subject: [PATCH 1/7] Suppress warnings in external libraries. --- .arduino-ci.yml | 51 ++++++++++++++++++++++++++++--------------------- GUI/Makefile | 3 +++ 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/.arduino-ci.yml b/.arduino-ci.yml index 1de4457fb..d2308e4ab 100644 --- a/.arduino-ci.yml +++ b/.arduino-ci.yml @@ -1,25 +1,32 @@ +platforms: + mega2560: + gcc: + warnings: + - no-unknown-attributes + - no-address-of-packed-member + unittest: - platforms: - - mega2560 - libraries: - - "Adafruit BusIO" - - "Adafruit MAX31865" - - "Arduino-PID-Library" - - "Ethernet" - - "LiquidCrystal" - - "RTClib" - - "Keypad" - - "SD" + platforms: + - mega2560 + libraries: + - "Adafruit BusIO" + - "Adafruit MAX31865" + - "Arduino-PID-Library" + - "Ethernet" + - "LiquidCrystal" + - "RTClib" + - "Keypad" + - "SD" compile: - platforms: - - mega2560 - libraries: - - "Adafruit BusIO" - - "Adafruit MAX31865" - - "Arduino-PID-Library" - - "Ethernet" - - "LiquidCrystal" - - "RTClib" - - "Keypad" - - "SD" + platforms: + - mega2560 + libraries: + - "Adafruit BusIO" + - "Adafruit MAX31865" + - "Arduino-PID-Library" + - "Ethernet" + - "LiquidCrystal" + - "RTClib" + - "Keypad" + - "SD" diff --git a/GUI/Makefile b/GUI/Makefile index 8653a2f74..5db7087d7 100644 --- a/GUI/Makefile +++ b/GUI/Makefile @@ -1,5 +1,6 @@ CC = g++ -std=c++17 -O3 -fPIC DEFINES = -D__AVR__ -D__AVR_ATmega2560__ -DARDUINO_ARCH_AVR -DARDUINO_AVR_MEGA2560 -DARDUINO=100 +WARNINGS = -Wno-unknown-attributes -Wno-address-of-packed-member LIBRARIES = $(shell bundle exec arduino_library_location.rb) PY_PATH = $(shell cd ../pybind11; python3 -m pybind11 --includes) SUFFIX = $(shell python3-config --extension-suffix) @@ -13,6 +14,7 @@ $(PY_LIB) : TankControllerLib.o ../pybind11/setup.py ../libTC.cpp echo "===== Compiling PY_LIB ($(PY_LIB)) =====" > /dev/null $(CC) -shared -fPIC \ $(DEFINES) \ + $(WARNINGS) \ -Wl,-undefined,dynamic_lookup \ $(PY_PATH) \ -I$(TC_PATH) \ @@ -37,6 +39,7 @@ TankControllerLib.o : Godmode.o echo "===== Compiling TankControllerLib =====" > /dev/null $(CC) -c \ $(DEFINES) \ + $(WARNINGS) \ -I$(TC_PATH) \ -I$(TC_PATH)/Devices \ -I$(TC_PATH)/UIState \ From 64b5df8d3a17d9e303a8b56b3eda66e92d208b7e Mon Sep 17 00:00:00 2001 From: James Foster Date: Sun, 4 Apr 2021 12:34:21 -0700 Subject: [PATCH 2/7] Add `gcc` to expected spelling. --- .github/actions/spelling/expect.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt index c07c8b92a..a12584f43 100644 --- a/.github/actions/spelling/expect.txt +++ b/.github/actions/spelling/expect.txt @@ -34,6 +34,7 @@ EZO FONTFAMILY FONTSTYLE FONTWEIGHT +gcc Gemfile github globals From 5fc69df8ed8fa1e499e33d021f57663e8366f952 Mon Sep 17 00:00:00 2001 From: James Foster Date: Sun, 4 Apr 2021 14:08:36 -0700 Subject: [PATCH 3/7] Depends on https://github.com/Arduino-CI/arduino_ci/pull/297. --- .arduino-ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.arduino-ci.yml b/.arduino-ci.yml index d2308e4ab..ff8d0a228 100644 --- a/.arduino-ci.yml +++ b/.arduino-ci.yml @@ -1,9 +1,18 @@ platforms: mega2560: + board: arduino:avr:mega:cpu=atmega2560 + package: arduino:avr gcc: + features: + defines: + - __AVR__ + - __AVR_ATmega2560__ + - ARDUINO_ARCH_AVR + - ARDUINO_AVR_MEGA2560 warnings: - no-unknown-attributes - no-address-of-packed-member + flags: unittest: platforms: From 3c42474b7896f097194aed7f1e8cb0ff9c313ad0 Mon Sep 17 00:00:00 2001 From: James Foster Date: Sun, 4 Apr 2021 14:38:34 -0700 Subject: [PATCH 4/7] Try to fix spelling issue. --- .github/actions/spelling/excludes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt index f8dd1dc86..1a42ddf96 100644 --- a/.github/actions/spelling/excludes.txt +++ b/.github/actions/spelling/excludes.txt @@ -12,5 +12,6 @@ LICENSE .all-contributorsrc .gitignore Makefile +^GUI/Makefile$ ^other/* ^docs/Menus.xlsx$ From 8619beb417186df6dac8908a6091473e2e66dcfb Mon Sep 17 00:00:00 2001 From: James Foster Date: Sun, 4 Apr 2021 14:50:21 -0700 Subject: [PATCH 5/7] Another attempt at spelling. --- .github/actions/spelling/excludes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt index 1a42ddf96..25db06c3b 100644 --- a/.github/actions/spelling/excludes.txt +++ b/.github/actions/spelling/excludes.txt @@ -12,6 +12,6 @@ LICENSE .all-contributorsrc .gitignore Makefile -^GUI/Makefile$ +.arduino-ci.yml ^other/* ^docs/Menus.xlsx$ From c7f96d91d7b07d02531b5a5c0bce127483bbbb47 Mon Sep 17 00:00:00 2001 From: James Foster Date: Tue, 13 Apr 2021 12:49:38 -0700 Subject: [PATCH 6/7] fix indent --- .arduino-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.arduino-ci.yml b/.arduino-ci.yml index ff8d0a228..c54c2a9d8 100644 --- a/.arduino-ci.yml +++ b/.arduino-ci.yml @@ -16,7 +16,7 @@ platforms: unittest: platforms: - - mega2560 + - mega2560 libraries: - "Adafruit BusIO" - "Adafruit MAX31865" From 947cb3860dd9e41add465df3da25fd6cd7e703fb Mon Sep 17 00:00:00 2001 From: James Foster Date: Tue, 10 Aug 2021 14:53:28 -0700 Subject: [PATCH 7/7] Push trivial change to see if failing test in PR causes badge to update. --- GUI/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GUI/README.md b/GUI/README.md index cd04ec93e..eadba2ef8 100644 --- a/GUI/README.md +++ b/GUI/README.md @@ -1,5 +1,5 @@ # TankControllerGUI -A Python GUI for TankController running on the mocks provided by `Arduino CI` +A Python GUI for TankController running on the mocks provided by `Arduino CI`. ## Build Process Follow these steps