From 16074669c35b0bb5e8502de903d3bcba75854ff7 Mon Sep 17 00:00:00 2001
From: Marcus <marcus@deltalima.org>
Date: Sat, 19 Oct 2024 01:29:45 +0200
Subject: [PATCH] get rid of CanGrow_Version.h

---
 .gitignore                        | 1 -
 Arduino/CanGrow/CanGrow.ino       | 2 +-
 Arduino/CanGrow/cangrow.sh        | 8 ++++----
 Arduino/CanGrow/include/CanGrow.h | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index c331d08..0a20f3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,4 @@ KiCad/CanGrow/CanGrow.kicad_sch-bak
 KiCad/CanGrow/fp-info-cache
 KiCad/CanGrow/gerber/*.zip
 Arduino/CanGrow/CanGrow.geany
-Arduino/CanGrow/include/CanGrow_Version.h
 build/
diff --git a/Arduino/CanGrow/CanGrow.ino b/Arduino/CanGrow/CanGrow.ino
index 393f003..989f12c 100644
--- a/Arduino/CanGrow/CanGrow.ino
+++ b/Arduino/CanGrow/CanGrow.ino
@@ -91,7 +91,7 @@ void setup() {
   // Write a line before doing serious output, because before there is some garbage in serial
   // whats get the cursor somewhere over the place
   Serial.println("420");
-  Serial.printf(".:: CanGrow firmware v%s build %s starting ::.\n", CanGrowVer, CanGrowBuild);
+  Serial.printf(".:: CanGrow firmware v%s build %s starting ::.\n", CANGROW_VER, CANGROW_BUILD);
     
   Serial.print("II To format LittleFS, pull GPIO ");
   Serial.print(PinWIPE); 
diff --git a/Arduino/CanGrow/cangrow.sh b/Arduino/CanGrow/cangrow.sh
index 911a17d..8eac57d 100755
--- a/Arduino/CanGrow/cangrow.sh
+++ b/Arduino/CanGrow/cangrow.sh
@@ -99,16 +99,16 @@ case $1 in
 	b|build)
 		check_acli
 		echo ":: Building firmware $VER $BUILD, target dir: $(pwd)/build/"
-		version_header
+		#version_header
 		test -d build || mkdir build
-		${ACLI_CMD} --no-color compile -b ${BOARD}  "CanGrow.ino" --output-dir build/ || exit 1
+		${ACLI_CMD} --no-color compile -b ${BOARD} --build-property "build.extra_flags=-DCANGROW_VER=\"${VER}\" -DCANGROW_BUILD=\"${BUILD}\"" "CanGrow.ino" --output-dir build/ || exit 1
 		cp build/CanGrow.ino.bin build/CanGrow_v${VER}_${BUILD}.bin
 		;;
 	u|upload)
 		check_acli
 		echo ":: Build and upload firmware $VER $BUILD to $TTY"
-		version_header
-		${ACLI_CMD} --no-color compile -b ${BOARD} -u -p $TTY  "CanGrow.ino"
+		#version_header
+		${ACLI_CMD} --no-color compile -b ${BOARD} --build-property "build.extra_flags=-DCANGROW_VER=\"${VER}\" -DCANGROW_BUILD=\"${BUILD}\""  ${ACLI_BUILD_OPTS} -u -p $TTY  "CanGrow.ino"
 		;;
 	w|webupload)
 		echo ":: Uploading to $IP"
diff --git a/Arduino/CanGrow/include/CanGrow.h b/Arduino/CanGrow/include/CanGrow.h
index d4ac8e4..2c3d670 100644
--- a/Arduino/CanGrow/include/CanGrow.h
+++ b/Arduino/CanGrow/include/CanGrow.h
@@ -27,7 +27,7 @@
  *
  */
 
-#include "CanGrow_Version.h"
+//#include "CanGrow_Version.h"
 
 struct Config_WiFi {
   char ssid[32];