From d8b6f770f7a2675d77c2abd5b8711312af290e84 Mon Sep 17 00:00:00 2001 From: Todd Herbert Date: Thu, 10 Jul 2025 01:14:30 +1200 Subject: [PATCH] Tidying --- .../nicheGraphics.h | 10 ++++------ .../seeed_wio_tracker_L1-inkhud/platformio.ini | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/variants/seeed_wio_tracker_L1-inkhud/nicheGraphics.h b/variants/seeed_wio_tracker_L1-inkhud/nicheGraphics.h index d0c848ef3..7fb890303 100644 --- a/variants/seeed_wio_tracker_L1-inkhud/nicheGraphics.h +++ b/variants/seeed_wio_tracker_L1-inkhud/nicheGraphics.h @@ -54,10 +54,10 @@ void setupNicheGraphics() InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252; // Customize default settings - inkhud->persistence->settings.userTiles.maxCount = 2; // Two applets side-by-side - // 270 degrees clockwise + inkhud->persistence->settings.rotation = 1; // 90 degrees clockwise inkhud->persistence->settings.optionalFeatures.batteryIcon = true; // Device definitely has a battery - inkhud->persistence->settings.userTiles.count = 1; // One tile only by default, keep things simple for new users + inkhud->persistence->settings.userTiles.count = 1; // One tile only by default, keep things simple for new users + inkhud->persistence->settings.userTiles.maxCount = 2; // Two applets side-by-side // Pick applets // Note: order of applets determines priority of "auto-show" feature @@ -69,11 +69,9 @@ void setupNicheGraphics() inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet); // - inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0); // Activated, no autoshow, default on tile 0 - inkhud->persistence->settings.rotation = 1; - // inkhud->persistence->printSettings(&inkhud->persistence->settings); // Start running InkHUD inkhud->begin(); - // inkhud->persistence->printSettings(&inkhud->persistence->settings); + // Buttons // -------------------------- diff --git a/variants/seeed_wio_tracker_L1-inkhud/platformio.ini b/variants/seeed_wio_tracker_L1-inkhud/platformio.ini index 2e5231caf..d432a209a 100644 --- a/variants/seeed_wio_tracker_L1-inkhud/platformio.ini +++ b/variants/seeed_wio_tracker_L1-inkhud/platformio.ini @@ -1,14 +1,16 @@ [env:seeed_wio_tracker_L1-inkhud] board = seeed_wio_tracker_L1 extends = nrf52840_base, inkhud -;board_level = extra -build_flags = ${nrf52840_base.build_flags} ${inkhud.build_flags} - -I $PROJECT_DIR/variants/seeed_wio_tracker_L1-inkhud - -D SEEED_WIO_TRACKER_L1 - -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 +build_flags = + ${nrf52840_base.build_flags} + ${inkhud.build_flags} + -I variants/seeed_wio_tracker_L1-inkhud + -D SEEED_WIO_TRACKER_L1 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld -build_src_filter = ${nrf52_base.build_src_filter} +<../variants/seeed_wio_tracker_L1-inkhud> ${inkhud.build_src_filter} +build_src_filter = + ${nrf52_base.build_src_filter} + ${inkhud.build_src_filter} lib_deps = - ${inkhud.lib_deps} + ${inkhud.lib_deps} ; Before base libs_deps, so we use ZinggJM/GFXRoot instead of AdafruitGFX (saves space) ${nrf52840_base.lib_deps} -debug_tool = jlink +debug_tool = jlink \ No newline at end of file