From 60fc811bf6a2162121a8df49f78eb5bda45a4122 Mon Sep 17 00:00:00 2001
From: DeltaLima <dontsendmespam@deltalima.org>
Date: Mon, 9 Dec 2024 00:07:43 +0100
Subject: [PATCH] firmware - v0.1.0 - first 'complete' release, much to do

---
 Arduino/CanGrow/CanGrow.ino            | 6 ++----
 Arduino/CanGrow/CanGrow_Version.h      | 5 -----
 Arduino/CanGrow/CanGrow_WebFunctions.h | 6 +++---
 cangrow.sh                             | 6 +++---
 4 files changed, 8 insertions(+), 15 deletions(-)
 delete mode 100644 Arduino/CanGrow/CanGrow_Version.h

diff --git a/Arduino/CanGrow/CanGrow.ino b/Arduino/CanGrow/CanGrow.ino
index 0597d8f..c45c301 100644
--- a/Arduino/CanGrow/CanGrow.ino
+++ b/Arduino/CanGrow/CanGrow.ino
@@ -52,8 +52,6 @@
 #include "CanGrow_Init.h"
 #include "CanGrow_Logo.h"
 #include "CanGrow_Sensors.h"
-
-#include "CanGrow_Version.h"
 #include "CanGrow_HTML.h"
 #include "CanGrow_SysFunctions.h"
 #include "CanGrow_WebFunctions.h"
@@ -95,9 +93,9 @@ void setup() {
   // whats get the cursor somewhere over the place
   Serial.println("420");
   Serial.print(".:: CanGrow firmware v");
-  Serial.print(CanGrowVer);
+  Serial.print(CANGROW_VER);
   Serial.print(" build ");
-  Serial.print(CanGrowBuild);
+  Serial.print(CANGROW_BUILD);
   Serial.println(" starting ::.");
   
   Serial.println(":: initialise I2C ::");  
diff --git a/Arduino/CanGrow/CanGrow_Version.h b/Arduino/CanGrow/CanGrow_Version.h
deleted file mode 100644
index 07ba194..0000000
--- a/Arduino/CanGrow/CanGrow_Version.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* CanGrow_Version.h gets generated from cangrow.sh */
-
-const char* CanGrowVer = "0.1-dev";
-const char* CanGrowBuild = "5df2d0f-20241208233808";
-
diff --git a/Arduino/CanGrow/CanGrow_WebFunctions.h b/Arduino/CanGrow/CanGrow_WebFunctions.h
index 8ec05bd..302d921 100644
--- a/Arduino/CanGrow/CanGrow_WebFunctions.h
+++ b/Arduino/CanGrow/CanGrow_WebFunctions.h
@@ -87,7 +87,7 @@ String returnHTMLheader(String MenuEntry = "") {
 
   // CanGrow Version
   header += "<li><a href='https://git.la10cy.net/DeltaLima/CanGrow' target='_blank'>CanGrow v";
-  header += CanGrowVer;
+  header += CANGROW_VER;
   header += "</a></li>\n";
   
   // close <ul> and start <div>
@@ -235,9 +235,9 @@ void SysUpdate() {
   body += "<h2>&#x1F504; Firmware update</h2>";
   
   body += "<b>Version:</b> ";
-  body += CanGrowVer;
+  body += CANGROW_VER;
   body += "<br><b>Build:</b> ";
-  body += CanGrowBuild;
+  body += CANGROW_BUILD;
   
   body += FPSTR(HTMLupdate);
   
diff --git a/cangrow.sh b/cangrow.sh
index d7b5c20..73a3eeb 100755
--- a/cangrow.sh
+++ b/cangrow.sh
@@ -2,8 +2,8 @@
 #
 
 test -z $TTY && TTY="/dev/ttyUSB0"
-test -z $IP && IP="192.168.30.212"
-test -z $VER && VER="0.1-dev"
+test -z $IP && IP="192.168.4.20"
+test -z $VER && VER="0.1.0"
 BUILD="$(git rev-parse --short HEAD)-$(date '+%Y%m%d%H%M%S')"
 
 ACLI="$HOME/.local/bin/arduino-cli"
@@ -79,7 +79,7 @@ case $1 in
 const char* CanGrowVer = \"${VER}\";
 const char* CanGrowBuild = \"${BUILD}\";
 " > Arduino/CanGrow/CanGrow_Version.h
-		${ACLI_CMD} --no-color compile -b ${BOARD}  "Arduino/CanGrow/CanGrow.ino" --output-dir build/ || exit 1
+		${ACLI_CMD} --no-color compile -b ${BOARD}  "Arduino/CanGrow/CanGrow.ino" --build-property "build.extra_flags=-DCANGROW_VER=\"${VER}\" -DCANGROW_BUILD=\"${BUILD}\"" --output-dir build/ || exit 1
 		cp build/CanGrow.ino.bin build/CanGrow_v${VER}_${BUILD}.bin
 		;;
 	u|upload)