DeltaLima/CanGrow
DeltaLima/CanGrow
0
0
Fork 0
Code Issues 12 Pull requests Projects 1 Releases 6 Packages Wiki Activity

firmware - v0.1.0 - first 'complete' release, much to do

Browse source
This commit is contained in:
DeltaLima 2024-12-09 00:07:43 +01:00
parent 9585bec612
commit 60fc811bf6
4 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Arduino/CanGrow/CanGrow.ino
View file

@ -52,8 +52,6 @@
#include "CanGrow_Init.h" #include "CanGrow_Init.h"
#include "CanGrow_Logo.h" #include "CanGrow_Logo.h"
#include "CanGrow_Sensors.h" #include "CanGrow_Sensors.h"
#include "CanGrow_Version.h"
#include "CanGrow_HTML.h" #include "CanGrow_HTML.h"
#include "CanGrow_SysFunctions.h" #include "CanGrow_SysFunctions.h"
#include "CanGrow_WebFunctions.h" #include "CanGrow_WebFunctions.h"
@ -95,9 +93,9 @@ void setup() {
// whats get the cursor somewhere over the place // whats get the cursor somewhere over the place
Serial.println("420"); Serial.println("420");
Serial.print(".:: CanGrow firmware v"); Serial.print(".:: CanGrow firmware v");
Serial.print(CanGrowVer); Serial.print(CANGROW_VER);
Serial.print(" build "); Serial.print(" build ");
Serial.print(CanGrowBuild); Serial.print(CANGROW_BUILD);
Serial.println(" starting ::."); Serial.println(" starting ::.");
Serial.println(":: initialise I2C ::"); Serial.println(":: initialise I2C ::");

5
Arduino/CanGrow/CanGrow_Version.h
View file

@ -1,5 +0,0 @@
/* CanGrow_Version.h gets generated from cangrow.sh */
const char* CanGrowVer = "0.1-dev";
const char* CanGrowBuild = "5df2d0f-20241208233808";

6
Arduino/CanGrow/CanGrow_WebFunctions.h
View file

@ -87,7 +87,7 @@ String returnHTMLheader(String MenuEntry = "") {
// CanGrow Version // CanGrow Version
header += "<li><a href='https://git.la10cy.net/DeltaLima/CanGrow' target='_blank'>CanGrow v"; header += "<li><a href='https://git.la10cy.net/DeltaLima/CanGrow' target='_blank'>CanGrow v";
header += CanGrowVer; header += CANGROW_VER;
header += "</a></li>\n"; header += "</a></li>\n";
// close <ul> and start <div> // close <ul> and start <div>
@ -235,9 +235,9 @@ void SysUpdate() {
body += "<h2>&#x1F504; Firmware update</h2>"; body += "<h2>&#x1F504; Firmware update</h2>";
body += "<b>Version:</b> "; body += "<b>Version:</b> ";
body += CanGrowVer; body += CANGROW_VER;
body += "<br><b>Build:</b> "; body += "<br><b>Build:</b> ";
body += CanGrowBuild; body += CANGROW_BUILD;
body += FPSTR(HTMLupdate); body += FPSTR(HTMLupdate);

6
cangrow.sh
View file

@ -2,8 +2,8 @@
# #
test -z $TTY && TTY="/dev/ttyUSB0" test -z $TTY && TTY="/dev/ttyUSB0"
test -z $IP && IP="192.168.30.212" test -z $IP && IP="192.168.4.20"
test -z $VER && VER="0.1-dev" test -z $VER && VER="0.1.0"
BUILD="$(git rev-parse --short HEAD)-$(date '+%Y%m%d%H%M%S')" BUILD="$(git rev-parse --short HEAD)-$(date '+%Y%m%d%H%M%S')"
ACLI="$HOME/.local/bin/arduino-cli" ACLI="$HOME/.local/bin/arduino-cli"
@ -79,7 +79,7 @@ case $1 in
const char* CanGrowVer = \"${VER}\"; const char* CanGrowVer = \"${VER}\";
const char* CanGrowBuild = \"${BUILD}\"; const char* CanGrowBuild = \"${BUILD}\";
" > Arduino/CanGrow/CanGrow_Version.h " > 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 cp build/CanGrow.ino.bin build/CanGrow_v${VER}_${BUILD}.bin
;; ;;
u|upload) u|upload)