From 5275f5a810d9efbd38815193f5a5aff9bfc29d95 Mon Sep 17 00:00:00 2001 From: nick-4711 Date: Mon, 22 Apr 2024 19:52:13 +0700 Subject: [PATCH] compile git version into firmware --- .gitignore | 1 + examples/OneOpenAir/OneOpenAir.ino | 2 ++ platformio.ini | 6 +++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fb4b0b5..a1ec5b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.DS_Store build .vscode +/.idea/ .pio diff --git a/examples/OneOpenAir/OneOpenAir.ino b/examples/OneOpenAir/OneOpenAir.ino index b6ac178..7de2027 100644 --- a/examples/OneOpenAir/OneOpenAir.ino +++ b/examples/OneOpenAir/OneOpenAir.ino @@ -467,6 +467,8 @@ static void oneIndoorInit(void) { /** Show boot display */ Serial.println("Firmware Version: " + ag->getVersion()); + Serial.printf("Firmware version: %s\n", GIT_VERSION); + oledDisplay.setText("AirGradient ONE", "FW Version: ", ag->getVersion().c_str()); delay(DISPLAY_DELAY_SHOW_CONTENT_MS); diff --git a/platformio.ini b/platformio.ini index 184ca66..a102edd 100644 --- a/platformio.ini +++ b/platformio.ini @@ -12,13 +12,13 @@ platform = espressif32 board = esp32-c3-devkitm-1 framework = arduino -build_flags = - -DARDUINO_USB_CDC_ON_BOOT=1 - -DARDUINO_USB_MODE=1 +build_flags = '-D ARDUINO_USB_CDC_ON_BOOT=1 -D ARDUINO_USB_MODE=1 -D GIT_VERSION=\\"'$(git describe --tags --always --dirty)'\\"' board_build.partitions = partitions.csv monitor_speed = 115200 lib_deps = aglib=symlink://../arduino +monitor_filters = time + [platformio] src_dir = examples/OneOpenAir