From 75a4a3c9d88d88b006fced8b558b7dd29c1deff9 Mon Sep 17 00:00:00 2001 From: GOB Date: Mon, 21 Oct 2024 19:16:17 +0900 Subject: [PATCH] Add supported cores --- .../workflows/arduino-esp-v2-build-check.yml | 7 +- .../workflows/arduino-esp-v3-build-check.yml | 5 +- .github/workflows/arduino-m5-build-check.yml | 12 +- ...ioBuild.yml => platformio-build-check.yml} | 98 ++++++------ boards/m5stack-atoms3r.json | 41 +++++ boards/m5stick-cplus2.json | 40 +++++ .../PlotToSerial/main/PlotToSerial.cpp | 7 - platformio.ini | 148 +++++++++++++++++- .../test_kmeterISO/kmeterISO_test.cpp | 2 +- 9 files changed, 288 insertions(+), 72 deletions(-) rename .github/workflows/{PlatformioBuild.yml => platformio-build-check.yml} (51%) create mode 100644 boards/m5stack-atoms3r.json create mode 100644 boards/m5stick-cplus2.json diff --git a/.github/workflows/arduino-esp-v2-build-check.yml b/.github/workflows/arduino-esp-v2-build-check.yml index 38f1bc0..67584b4 100644 --- a/.github/workflows/arduino-esp-v2-build-check.yml +++ b/.github/workflows/arduino-esp-v2-build-check.yml @@ -8,6 +8,7 @@ on: push: tags-ignore: - '*.*.*' + - 'v*.*.*' branches: - '*' paths: @@ -68,13 +69,9 @@ jobs: - m5stack-atoms3 - m5stack-core-esp32 - m5stack-core2 -# - m5stack-coreink + - m5stack-coreink - m5stack-cores3 - m5stack-fire -# - m5stack-station -# - m5stack-timer-cam -# - m5stamp-pico -# - m5stick-c platform-version: - 2.0.17 diff --git a/.github/workflows/arduino-esp-v3-build-check.yml b/.github/workflows/arduino-esp-v3-build-check.yml index 91ca330..bcbdf3f 100644 --- a/.github/workflows/arduino-esp-v3-build-check.yml +++ b/.github/workflows/arduino-esp-v3-build-check.yml @@ -3,11 +3,11 @@ name: Build(arduino-esp32:3.x) env: SKETCH_NAMES_FIND_START: ./examples/UnitUnified REQUIRED_LIBRARIES: M5Unified,M5UnitUnified - on: push: tags-ignore: - '*.*.*' + - 'v*.*.*' branches: - '*' paths: @@ -70,10 +70,9 @@ jobs: # - m5stack_cardputer - m5stack_core - m5stack_core2 -# - m5stack_coreink + - m5stack_coreink - m5stack_cores3 - m5stack_dial -# - m5stack_dinmeter - m5stack_fire - m5stack_nanoc6 - m5stack_paper diff --git a/.github/workflows/arduino-m5-build-check.yml b/.github/workflows/arduino-m5-build-check.yml index 5a1ffd1..5c5ba87 100644 --- a/.github/workflows/arduino-m5-build-check.yml +++ b/.github/workflows/arduino-m5-build-check.yml @@ -8,6 +8,7 @@ on: push: tags-ignore: - '*.*.*' + - 'v*.*.*' branches: - '*' paths: @@ -59,9 +60,10 @@ jobs: - PlotToSerial unit: - - UnitAmeter - - UnitVmeter - - UnitKmeterISO + - UnitCO2 + - UnitENVIII + - UnitTVOC + - UnitENVPro board: - m5stack_atom @@ -71,10 +73,10 @@ jobs: # - m5stack_cardputer - m5stack_core - m5stack_core2 -# - m5stack_coreink + - m5stack_coreink - m5stack_cores3 - m5stack_dial -# - m5stack_dinmeter + - m5stack_dinmeter - m5stack_fire - m5stack_paper # - m5stack_poe_cam diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/platformio-build-check.yml similarity index 51% rename from .github/workflows/PlatformioBuild.yml rename to .github/workflows/platformio-build-check.yml index 1ad15cb..4b60ae5 100644 --- a/.github/workflows/PlatformioBuild.yml +++ b/.github/workflows/platformio-build-check.yml @@ -1,9 +1,10 @@ -name: PlatformIOBuild +name: Build(platformio) on: push: tags-ignore: - '*.*.*' + - 'v*.*.*' branches: - '*' paths: @@ -43,7 +44,7 @@ on: jobs: build: - name: ${{ matrix.unit }}:${{ matrix.example }}:${{ matrix.board }}:${{ matrix.framework }}@${{ matrix.espressif32 }} + name: ${{ matrix.unit }}:${{ matrix.example }}@${{ matrix.board }}:${{ matrix.framework }}:${{ matrix.espressif32 }} runs-on: ubuntu-latest strategy: @@ -51,63 +52,68 @@ jobs: #max-parallel: 1 matrix: - unit: - - UnitAmeter - - UnitVmeter - - UnitKmeterISO - example: - PlotToSerial + unit: + - UnitCO2 + - UnitENVIII + - UnitTVOC + - UnitENVPro + board: - Core - Core2 - CoreS3 + - Fire - StampS3 - - AtomS3 - Dial + - AtomMatrix + - AtomS3 + - AtomS3R - NanoC6 - StickCPlus + - StickCPlus2 - Paper - - Fire + - Corelink framework: - Arduino espressif32: - latest - - '5_4_0' - - '4_4_0' +# - '5_4_0' +# - '4_4_0' - exclude: - - board: CoreS3 - espressif32: '5_4_0' - - board: CoreS3 - espressif32: '4_4_0' - - board: StampS3 - espressif32: '5_4_0' - - board: StampS3 - espressif32: '4_4_0' - - board: AtomS3 - espressif32: '5_4_0' - - board: AtomS3 - espressif32: '4_4_0' - - board: Dial - espressif32: '5_4_0' - - board: Dial - espressif32: '4_4_0' - - board: NanoC6 - espressif32: '5_4_0' - - board: NanoC6 - espressif32: '4_4_0' - - board: StickCPlus - espressif32: '5_4_0' - - board: StickCPlus - espressif32: '4_4_0' - - board: Paper - espressif32: '5_4_0' - - board: Paper - espressif32: '4_4_0' +# exclude: +# - board: CoreS3 +# espressif32: '5_4_0' +# - board: CoreS3 +# espressif32: '4_4_0' +# - board: StampS3 +# espressif32: '5_4_0' +# - board: StampS3 +# espressif32: '4_4_0' +# - board: AtomS3 +# espressif32: '5_4_0' +# - board: AtomS3 +# espressif32: '4_4_0' +# - board: Dial +# espressif32: '5_4_0' +# - board: Dial +# espressif32: '4_4_0' +# - board: NanoC6 +# espressif32: '5_4_0' +# - board: NanoC6 +# espressif32: '4_4_0' +# - board: StickCPlus +# espressif32: '5_4_0' +# - board: StickCPlus +# espressif32: '4_4_0' +# - board: Paper +# espressif32: '5_4_0' +# - board: Paper +# espressif32: '4_4_0' steps: - name: Checkout @@ -118,11 +124,11 @@ jobs: - name: Build examples uses: karniv00l/platformio-run-action@v1 with: - environments: ${{ matrix.unit }}_${{ matrix.example }}_${{ matrix.board }}_${{ matrix.framework }}_${{ matrix.espressif32 }} - #targets: + environments: ${{ matrix.unit != '' && format('{0}_{1}_{2}_{3}_{4}', matrix.unit, matrix.example, matrix.board, matrix.framework, matrix.espressif32) || format('{0}_{1}_{2}_{3}', matrix.example, matrix.board, matrix.framework, matrix.espressif32) }} +# targets: project-dir: "./" project-conf: "./platformio.ini" - #jobs: 6 - #silent: false - #verbose: true - #disable-auto-clean: false +# jobs: 6 +# silent: false +# verbose: true +# disable-auto-clean: false diff --git a/boards/m5stack-atoms3r.json b/boards/m5stack-atoms3r.json new file mode 100644 index 0000000..fcac372 --- /dev/null +++ b/boards/m5stack-atoms3r.json @@ -0,0 +1,41 @@ +{ + "build": { + "arduino": { + "memory_type": "qio_opi", + "ldscript": "esp32s3_out.ld", + "partitions": "default_8MB.csv" + }, + "core": "esp32", + "extra_flags": [ + "-DARDUINO_M5Stack_ATOMS3R", + "-DBOARD_HAS_PSRAM", + "-DARDUINO_USB_MODE=1", + "-DARDUINO_USB_CDC_ON_BOOT=1", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "dio", + "mcu": "esp32s3", + "variant": "m5stack_atoms3" + }, + "connectivity": [ + "bluetooth", + "wifi" + ], + "frameworks": [ + "arduino", + "espidf" + ], + "name": "M5Stack AtomS3R", + "upload": { + "flash_size": "8MB", + "maximum_ram_size": 327680, + "maximum_size": 8388608, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://docs.m5stack.com/en/core/AtomS3R", + "vendor": "M5Stack" +} diff --git a/boards/m5stick-cplus2.json b/boards/m5stick-cplus2.json new file mode 100644 index 0000000..88d492d --- /dev/null +++ b/boards/m5stick-cplus2.json @@ -0,0 +1,40 @@ +{ + "build": { + "arduino":{ + "ldscript": "esp32_out.ld", + "partitions": "default_8MB.csv" + }, + "core": "esp32", + "extra_flags": [ + "-DM5STACK_M5Stick_CPlus2", + "-DBOARD_HAS_PSRAM", + "-mfix-esp32-psram-cache-issue", + "-mfix-esp32-psram-cache-strategy=memw", + "-DARDUINO_RUNNING_CORE=1", + "-DARDUINO_EVENT_RUNNING_CORE=1" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "dio", + "mcu": "esp32", + "variant": "m5stick_c" + }, + "connectivity": [ + "wifi", + "bluetooth" + ], + "frameworks": [ + "arduino", + "espidf" + ], + "name": "M5Stick-CPlus2", + "upload": { + "flash_size": "8MB", + "maximum_ram_size": 327680, + "maximum_size": 8388608, + "require_upload_port": true, + "speed": 1500000 + }, + "url": "https://docs.m5stack.com/en/core/M5StickC%20PLUS2", + "vendor": "M5Stack" +} diff --git a/examples/UnitUnified/UnitKmeterISO/PlotToSerial/main/PlotToSerial.cpp b/examples/UnitUnified/UnitKmeterISO/PlotToSerial/main/PlotToSerial.cpp index 67bdab3..1e867cf 100644 --- a/examples/UnitUnified/UnitKmeterISO/PlotToSerial/main/PlotToSerial.cpp +++ b/examples/UnitUnified/UnitKmeterISO/PlotToSerial/main/PlotToSerial.cpp @@ -51,13 +51,6 @@ void setup() #pragma message "Using Wire" // Using TwoWire Wire.begin(pin_num_sda, pin_num_scl, 100000U); - for (int i = 0; i < 10; ++i) { - Wire.beginTransmission(unit.address()); - auto wret = Wire.endTransmission(); - M5_LOGW(">>%d", wret); - delay(10); - } - if (!Units.add(unit, Wire) || !Units.begin()) { M5_LOGE("Failed to begin"); lcd.clear(TFT_RED); diff --git a/platformio.ini b/platformio.ini index 7e57bd3..487c4af 100644 --- a/platformio.ini +++ b/platformio.ini @@ -3,9 +3,6 @@ ; For UnitTest and examples (Using M5UnitUnified) ;----------------------------------------------------------------------- [platformio] -;default_envs = test_Ameter_Core, test_Ameter_Core2, test_Ameter_CoreS3, test_Ameter_Fire, test_Ameter_StampS3, test_Ameter_Dial, test_Ameter_AtomS3, test_Ameter_NanoC6, test_Ameter_StickCPlus, test_Ameter_Paper, test_Vmeter_Core, test_Vmeter_Core2, test_Vmeter_CoreS3, test_Vmeter_Fire, test_Vmeter_StampS3, test_Vmeter_Dial, test_Vmeter_AtomS3, test_Vmeter_NanoC6, test_Vmeter_StickCPlus, test_Vmeter_Paper, test_UnitKmeterISO_Core, test_UnitKmeterISO_Core2, test_UnitKmeterISO_CoreS3, test_UnitKmeterISO_Fire, test_UnitKmeterISO_StampS3, test_UnitKmeterISO_Dial, test_UnitKmeterISO_AtomS3, test_UnitKmeterISO_NanoC6, test_UnitKmeterISO_StickCPlus, test_UnitKmeterISO_Paper -;default_envs = UnitAmeter_PlotToSerial_Core_Arduino_latest, UnitAmeter_PlotToSerial_Core_Arduino_5_4_0, UnitAmeter_PlotToSerial_Core_Arduino_4_4_0, UnitAmeter_PlotToSerial_Core2_Arduino_latest, UnitAmeter_PlotToSerial_Core2_Arduino_5_4_0, UnitAmeter_PlotToSerial_Core2_Arduino_4_4_0, UnitAmeter_PlotToSerial_CoreS3_Arduino_latest, UnitAmeter_PlotToSerial_StampS3_Arduino_latest, UnitAmeter_PlotToSerial_AtomS3_Arduino_latest, UnitAmeter_PlotToSerial_Dial_Arduino_latest, UnitAmeter_PlotToSerial_NanoC6_Arduino_latest, UnitAmeter_PlotToSerial_StickCPlus_Arduino_latest, UnitAmeter_PlotToSerial_Paper_Arduino_latest, UnitAmeter_PlotToSerial_Fire_Arduino_latest, UnitAmeter_PlotToSerial_Fire_Arduino_5_4_0, UnitAmeter_PlotToSerial_Fire_Arduino_4_4_0, UnitVmeter_PlotToSerial_Core_Arduino_latest, UnitVmeter_PlotToSerial_Core_Arduino_5_4_0, UnitVmeter_PlotToSerial_Core_Arduino_4_4_0, UnitVmeter_PlotToSerial_Core2_Arduino_latest, UnitVmeter_PlotToSerial_Core2_Arduino_5_4_0, UnitVmeter_PlotToSerial_Core2_Arduino_4_4_0, UnitVmeter_PlotToSerial_CoreS3_Arduino_latest, UnitVmeter_PlotToSerial_StampS3_Arduino_latest, UnitVmeter_PlotToSerial_AtomS3_Arduino_latest, UnitVmeter_PlotToSerial_Dial_Arduino_latest, UnitVmeter_PlotToSerial_NanoC6_Arduino_latest, UnitVmeter_PlotToSerial_StickCPlus_Arduino_latest, UnitVmeter_PlotToSerial_Paper_Arduino_latest, UnitVmeter_PlotToSerial_Fire_Arduino_latest, UnitVmeter_PlotToSerial_Fire_Arduino_5_4_0, UnitVmeter_PlotToSerial_Fire_Arduino_4_4_0, UnitKmeterISO_PlotToSerial_Core_Arduino_latest, UnitKmeterISO_PlotToSerial_Core_Arduino_5_4_0, UnitKmeterISO_PlotToSerial_Core_Arduino_4_4_0, UnitKmeterISO_PlotToSerial_Core2_Arduino_latest, UnitKmeterISO_PlotToSerial_Core2_Arduino_5_4_0, UnitKmeterISO_PlotToSerial_Core2_Arduino_4_4_0, UnitKmeterISO_PlotToSerial_CoreS3_Arduino_latest, UnitKmeterISO_PlotToSerial_StampS3_Arduino_latest, UnitKmeterISO_PlotToSerial_AtomS3_Arduino_latest, UnitKmeterISO_PlotToSerial_Dial_Arduino_latest, UnitKmeterISO_PlotToSerial_NanoC6_Arduino_latest, UnitKmeterISO_PlotToSerial_StickCPlus_Arduino_latest, UnitKmeterISO_PlotToSerial_Paper_Arduino_latest, UnitKmeterISO_PlotToSerial_Fire_Arduino_latest, UnitKmeterISO_PlotToSerial_Fire_Arduino_5_4_0, UnitKmeterISO_PlotToSerial_Fire_Arduino_4_4_0 - [env] build_flags =-Wall -Wextra -Wreturn-local-addr -Werror=format -Werror=return-local-addr @@ -46,7 +43,7 @@ board = m5stack-fire lib_deps = ${env.lib_deps} [StampS3] -;include M5Capsule +;include M5Capsule, DinMeter extends = m5base board = m5stack-stamps3 lib_deps = ${env.lib_deps} @@ -57,11 +54,22 @@ board = m5stack-stamps3 lib_deps = ${env.lib_deps} m5stack/M5Dial +[AtomMatrix] +extends = m5base +board = m5stack-atom +lib_deps = ${env.lib_deps} + [AtomS3] extends = m5base board = m5stack-atoms3 lib_deps = ${env.lib_deps} +; Using ./boards/m5stack-atoms3r.json +[AtomS3R] +extends = m5base +board = m5stack-atoms3r +lib_deps = ${env.lib_deps} + ; Using ./boards/m5stack-nanoc6.json [NanoC6] extends = m5base @@ -78,10 +86,20 @@ extends = m5base board = m5stick-c lib_deps = ${env.lib_deps} +; Using ./boards/m5stick-cplus2.json +[StickCPlus2] +extends = m5base +board = m5stick-cplus2 +lib_deps = ${env.lib_deps} + [Paper] extends = m5base board = m5stack-fire -; Using M5Fire instead of the M5Paper(Noting...) +lib_deps = ${env.lib_deps} + +[Corelink] +extends = m5base +board = m5stack-coreink lib_deps = ${env.lib_deps} [sdl] @@ -204,12 +222,24 @@ lib_deps = ${Dial.lib_deps} ${test_fw.lib_deps} test_filter= embedded/test_ameter +[env:test_Ameter_AtomMatrix] +extends=AtomMatrix, option_release, arduino_latest +lib_deps = ${AtomMatrix.lib_deps} + ${test_fw.lib_deps} +test_filter= embedded/test_ameter + [env:test_Ameter_AtomS3] extends=AtomS3, option_release, arduino_latest lib_deps = ${AtomS3.lib_deps} ${test_fw.lib_deps} test_filter= embedded/test_ameter +[env:test_Ameter_AtomS3R] +extends=AtomS3R, option_release, arduino_latest +lib_deps = ${AtomS3R.lib_deps} + ${test_fw.lib_deps} +test_filter= embedded/test_ameter + [env:test_Ameter_NanoC6] extends=NanoC6, option_release, arduino_latest lib_deps = ${NanoC6.lib_deps} @@ -222,12 +252,24 @@ lib_deps = ${StickCPlus.lib_deps} ${test_fw.lib_deps} test_filter= embedded/test_ameter +[env:test_Ameter_StickCPlus2] +extends=StickCPlus2, option_release, arduino_latest +lib_deps = ${StickCPlus2.lib_deps} + ${test_fw.lib_deps} +test_filter= embedded/test_ameter + [env:test_Ameter_Paper] extends=Paper, option_release, arduino_latest lib_deps = ${Paper.lib_deps} ${test_fw.lib_deps} test_filter= embedded/test_ameter +[env:test_Ameter_Corelink] +extends=Corelink, option_release, arduino_latest +lib_deps = ${Corelink.lib_deps} + ${test_fw.lib_deps} +test_filter= embedded/test_ameter + ; Vmeter [env:test_Vmeter_Core] extends=Core, option_release, arduino_latest @@ -265,12 +307,24 @@ lib_deps = ${Dial.lib_deps} ${test_fw.lib_deps} test_filter= embedded/test_vmeter +[env:test_Vmeter_AtomMatrix] +extends=AtomMatrix, option_release, arduino_latest +lib_deps = ${AtomMatrix.lib_deps} + ${test_fw.lib_deps} +test_filter= embedded/test_vmeter + [env:test_Vmeter_AtomS3] extends=AtomS3, option_release, arduino_latest lib_deps = ${AtomS3.lib_deps} ${test_fw.lib_deps} test_filter= embedded/test_vmeter +[env:test_Vmeter_AtomS3R] +extends=AtomS3R, option_release, arduino_latest +lib_deps = ${AtomS3R.lib_deps} + ${test_fw.lib_deps} +test_filter= embedded/test_vmeter + [env:test_Vmeter_NanoC6] extends=NanoC6, option_release, arduino_latest lib_deps = ${NanoC6.lib_deps} @@ -283,12 +337,24 @@ lib_deps = ${StickCPlus.lib_deps} ${test_fw.lib_deps} test_filter= embedded/test_vmeter +[env:test_Vmeter_StickCPlus2] +extends=StickCPlus2, option_release, arduino_latest +lib_deps = ${StickCPlus2.lib_deps} + ${test_fw.lib_deps} +test_filter= embedded/test_vmeter + [env:test_Vmeter_Paper] extends=Paper, option_release, arduino_latest lib_deps = ${Paper.lib_deps} ${test_fw.lib_deps} test_filter= embedded/test_vmeter +[env:test_Vmeter_Corelink] +extends=Corelink, option_release, arduino_latest +lib_deps = ${Corelink.lib_deps} + ${test_fw.lib_deps} +test_filter= embedded/test_vmeter + ; KMeterISO [env:test_UnitKmeterISO_Core] extends=Core, option_release, arduino_latest @@ -326,12 +392,24 @@ lib_deps = ${Dial.lib_deps} ${test_fw.lib_deps} test_filter= embedded/test_kmeterISO +[env:test_UnitKmeterISO_AtomMatrix] +extends=AtomMatrix, option_release, arduino_latest +lib_deps = ${AtomMatrix.lib_deps} + ${test_fw.lib_deps} +test_filter= embedded/test_kmeterISO + [env:test_UnitKmeterISO_AtomS3] extends=AtomS3, option_release, arduino_latest lib_deps = ${AtomS3.lib_deps} ${test_fw.lib_deps} test_filter= embedded/test_kmeterISO +[env:test_UnitKmeterISO_AtomS3R] +extends=AtomS3R, option_release, arduino_latest +lib_deps = ${AtomS3R.lib_deps} + ${test_fw.lib_deps} +test_filter= embedded/test_kmeterISO + [env:test_UnitKmeterISO_NanoC6] extends=NanoC6, option_release, arduino_latest lib_deps = ${NanoC6.lib_deps} @@ -344,12 +422,24 @@ lib_deps = ${StickCPlus.lib_deps} ${test_fw.lib_deps} test_filter= embedded/test_kmeterISO +[env:test_UnitKmeterISO_StickCPlus2] +extends=StickCPlus2, option_release, arduino_latest +lib_deps = ${StickCPlus2.lib_deps} + ${test_fw.lib_deps} +test_filter= embedded/test_kmeterISO + [env:test_UnitKmeterISO_Paper] extends=Paper, option_release, arduino_latest lib_deps = ${Paper.lib_deps} ${test_fw.lib_deps} test_filter= embedded/test_kmeterISO +[env:test_UnitKmeterISO_Corelink] +extends=Corelink, option_release, arduino_latest +lib_deps = ${Corelink.lib_deps} + ${test_fw.lib_deps} +test_filter= embedded/test_kmeterISO + ; -------------------------------- ;Examples by M5UnitUnified ; -------------------------------- @@ -386,10 +476,18 @@ build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitAmeter/P extends=StampS3, option_release, arduino_latest build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitAmeter/PlotToSerial> +[env:UnitAmeter_PlotToSerial_AtomMatrix_Arduino_latest] +extends=AtomMatrix, option_release, arduino_latest +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitAmeter/PlotToSerial> + [env:UnitAmeter_PlotToSerial_AtomS3_Arduino_latest] extends=AtomS3, option_release, arduino_latest build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitAmeter/PlotToSerial> +[env:UnitAmeter_PlotToSerial_AtomS3R_Arduino_latest] +extends=AtomS3R, option_release, arduino_latest +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitAmeter/PlotToSerial> + [env:UnitAmeter_PlotToSerial_Dial_Arduino_latest] extends=Dial, option_release, arduino_latest build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitAmeter/PlotToSerial> @@ -402,10 +500,18 @@ build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitAmeter/P extends=StickCPlus, option_release, arduino_latest build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitAmeter/PlotToSerial> +[env:UnitAmeter_PlotToSerial_StickCPlus2_Arduino_latest] +extends=StickCPlus2, option_release, arduino_latest +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitAmeter/PlotToSerial> + [env:UnitAmeter_PlotToSerial_Paper_Arduino_latest] extends=Paper, option_release, arduino_latest build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitAmeter/PlotToSerial> +[env:UnitAmeter_PlotToSerial_Corelink_Arduino_latest] +extends=Corelink, option_release, arduino_latest +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitAmeter/PlotToSerial> + [env:UnitAmeter_PlotToSerial_Fire_Arduino_latest] extends=Fire, option_release, arduino_latest build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitAmeter/PlotToSerial> @@ -451,10 +557,18 @@ build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitVmeter/P extends=StampS3, option_release, arduino_latest build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitVmeter/PlotToSerial> +[env:UnitVmeter_PlotToSerial_AtomMatrix_Arduino_latest] +extends=AtomMatrix, option_release, arduino_latest +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitVmeter/PlotToSerial> + [env:UnitVmeter_PlotToSerial_AtomS3_Arduino_latest] extends=AtomS3, option_release, arduino_latest build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitVmeter/PlotToSerial> +[env:UnitVmeter_PlotToSerial_AtomS3R_Arduino_latest] +extends=AtomS3R, option_release, arduino_latest +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitVmeter/PlotToSerial> + [env:UnitVmeter_PlotToSerial_Dial_Arduino_latest] extends=Dial, option_release, arduino_latest build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitVmeter/PlotToSerial> @@ -467,10 +581,18 @@ build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitVmeter/P extends=StickCPlus, option_release, arduino_latest build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitVmeter/PlotToSerial> +[env:UnitVmeter_PlotToSerial_StickCPlus2_Arduino_latest] +extends=StickCPlus2, option_release, arduino_latest +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitVmeter/PlotToSerial> + [env:UnitVmeter_PlotToSerial_Paper_Arduino_latest] extends=Paper, option_release, arduino_latest build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitVmeter/PlotToSerial> +[env:UnitVmeter_PlotToSerial_Corelink_Arduino_latest] +extends=Corelink, option_release, arduino_latest +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitVmeter/PlotToSerial> + [env:UnitVmeter_PlotToSerial_Fire_Arduino_latest] extends=Fire, option_release, arduino_latest build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitVmeter/PlotToSerial> @@ -516,10 +638,18 @@ build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitKmeterIS extends=StampS3, option_release, arduino_latest build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitKmeterISO/PlotToSerial> +[env:UnitKmeterISO_PlotToSerial_AtomMatrix_Arduino_latest] +extends=AtomMatrix, option_release, arduino_latest +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitKmeterISO/PlotToSerial> + [env:UnitKmeterISO_PlotToSerial_AtomS3_Arduino_latest] extends=AtomS3, option_release, arduino_latest build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitKmeterISO/PlotToSerial> +[env:UnitKmeterISO_PlotToSerial_AtomS3R_Arduino_latest] +extends=AtomS3R, option_release, arduino_latest +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitKmeterISO/PlotToSerial> + [env:UnitKmeterISO_PlotToSerial_Dial_Arduino_latest] extends=Dial, option_release, arduino_latest build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitKmeterISO/PlotToSerial> @@ -532,10 +662,18 @@ build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitKmeterIS extends=StickCPlus, option_release, arduino_latest build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitKmeterISO/PlotToSerial> +[env:UnitKmeterISO_PlotToSerial_StickCPlus2_Arduino_latest] +extends=StickCPlus2, option_release, arduino_latest +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitKmeterISO/PlotToSerial> + [env:UnitKmeterISO_PlotToSerial_Paper_Arduino_latest] extends=Paper, option_release, arduino_latest build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitKmeterISO/PlotToSerial> +[env:UnitKmeterISO_PlotToSerial_Corelink_Arduino_latest] +extends=Corelink, option_release, arduino_latest +build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitKmeterISO/PlotToSerial> + [env:UnitKmeterISO_PlotToSerial_Fire_Arduino_latest] extends=Fire, option_release, arduino_latest build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitKmeterISO/PlotToSerial> diff --git a/test/embedded/test_kmeterISO/kmeterISO_test.cpp b/test/embedded/test_kmeterISO/kmeterISO_test.cpp index faf3c46..d2f8d01 100644 --- a/test/embedded/test_kmeterISO/kmeterISO_test.cpp +++ b/test/embedded/test_kmeterISO/kmeterISO_test.cpp @@ -168,7 +168,7 @@ TEST_P(TestKmeterISO, I2CAddress) EXPECT_TRUE(unit->changeI2CAddress(0x52)); EXPECT_TRUE(unit->readI2CAddress(addr)); EXPECT_EQ(addr, 0x52); - EXPECT_EQ(unit->address(), 0528); + EXPECT_EQ(unit->address(), 0x52); EXPECT_TRUE(unit->readFirmwareVersion(ver)); EXPECT_NE(ver, 0x00);