Fixes for arduino-m5stack workflow

m5stack · Dec 13, 2024 · 5ac82df · 5ac82df
1 parent 7f93b98
commit 5ac82df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git 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
@@ -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>