DeltaLima/CanGrow
DeltaLima/CanGrow
0
0
Fork 0
Code Issues 14 Pull requests Projects 1 Releases 3 Packages Wiki Activity

get rid of CanGrow_Version.h

Browse source
This commit is contained in:
Marcus 2024-10-19 01:29:45 +02:00
parent f7224a1588
commit 16074669c3
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -3,5 +3,4 @@ KiCad/CanGrow/CanGrow.kicad_sch-bak
KiCad/CanGrow/fp-info-cache KiCad/CanGrow/fp-info-cache
KiCad/CanGrow/gerber/*.zip KiCad/CanGrow/gerber/*.zip
Arduino/CanGrow/CanGrow.geany Arduino/CanGrow/CanGrow.geany
Arduino/CanGrow/include/CanGrow_Version.h
build/ build/

2
Arduino/CanGrow/CanGrow.ino
View file

@ -91,7 +91,7 @@ void setup() {
// Write a line before doing serious output, because before there is some garbage in serial // Write a line before doing serious output, because before there is some garbage in serial
// whats get the cursor somewhere over the place // whats get the cursor somewhere over the place
Serial.println("420"); 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("II To format LittleFS, pull GPIO ");
Serial.print(PinWIPE); Serial.print(PinWIPE);

8
Arduino/CanGrow/cangrow.sh
View file

@ -99,16 +99,16 @@ case $1 in
b|build) b|build)
check_acli check_acli
echo ":: Building firmware $VER $BUILD, target dir: $(pwd)/build/" echo ":: Building firmware $VER $BUILD, target dir: $(pwd)/build/"
version_header #version_header
test -d build || mkdir build 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 cp build/CanGrow.ino.bin build/CanGrow_v${VER}_${BUILD}.bin
;; ;;
u|upload) u|upload)
check_acli check_acli
echo ":: Build and upload firmware $VER $BUILD to $TTY" echo ":: Build and upload firmware $VER $BUILD to $TTY"
version_header #version_header
${ACLI_CMD} --no-color compile -b ${BOARD} -u -p $TTY "CanGrow.ino" ${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) w|webupload)
echo ":: Uploading to $IP" echo ":: Uploading to $IP"

2
Arduino/CanGrow/include/CanGrow.h
View file

@ -27,7 +27,7 @@
* *
*/ */
#include "CanGrow_Version.h" //#include "CanGrow_Version.h"
struct Config_WiFi { struct Config_WiFi {
char ssid[32]; char ssid[32];