From 5ac82df94b48cf866f38e08fd53c630abe076c19 Mon Sep 17 00:00:00 2001 From: GOB Date: Fri, 13 Dec 2024 17:13:08 +0900 Subject: [PATCH] Fixes for arduino-m5stack workflow --- examples/UnitUnified/GraphicalMeter/src/meter.cpp | 4 ++-- platformio.ini | 15 +++------------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/examples/UnitUnified/GraphicalMeter/src/meter.cpp b/examples/UnitUnified/GraphicalMeter/src/meter.cpp index b84f5dd..bfac1bd 100644 --- a/examples/UnitUnified/GraphicalMeter/src/meter.cpp +++ b/examples/UnitUnified/GraphicalMeter/src/meter.cpp @@ -72,11 +72,11 @@ void draw_meter(LGFX_Sprite& spr, const int32_t offset, const char* tag, const c spr.setFont(wid >= 240 ? &fonts::FreeSansBold12pt7b : &fonts::FreeSansBold9pt7b); spr.setTextDatum(textdatum_t::middle_left); - spr.drawString(tag, x, y + 32 / 2); + spr.drawString(tag, x, y + hgt / 2); auto s = m5::utility::formatString("%.2f", 0.01f * plotter->latest()); spr.setTextDatum(textdatum_t::middle_right); - spr.drawString(s.c_str(), x + wid, y + 32 / 2); + spr.drawString(s.c_str(), x + wid, y + hgt / 2); spr.setTextDatum(td); spr.setFont(f); diff --git a/platformio.ini b/platformio.ini index 0a8453a..0bc9f6c 100644 --- a/platformio.ini +++ b/platformio.ini @@ -692,19 +692,10 @@ build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/UnitKmeterIS ; [env:GraphicalMeter_Core_Arduino_latest] extends=Core, option_release, arduino_latest +; Choose unit define build_flags = ${option_release.build_flags} -DUSING_VMETER -build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/GraphicalMeter> - -[env:GraphicalMeter_Core_Arduino_latest] -extends=Core, option_release, arduino_latest -build_flags = ${option_release.build_flags} - -DUSING_AMETER -build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/GraphicalMeter> - -[env:GraphicalMeter_Core_Arduino_latest] -extends=Core, option_release, arduino_latest -build_flags = ${option_release.build_flags} - -DUSING_KMETER_ISO +; -DUSING_AMETER +; -DUSING_KMETER_ISO build_src_filter = +<*> -<.git/> -<.svn/> +<../examples/UnitUnified/GraphicalMeter>