From fc00f9267f15cf8a7b292aa7e21a856f3c126982 Mon Sep 17 00:00:00 2001 From: Marcus Date: Sat, 15 Jun 2024 04:34:32 +0200 Subject: [PATCH] firmware wip - gauge labels now in center of div --- Arduino/CanGrow/CanGrow_HTML.h | 10 ++++++---- Arduino/CanGrow/CanGrow_Version.h | 2 +- cangrow.sh | 8 ++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Arduino/CanGrow/CanGrow_HTML.h b/Arduino/CanGrow/CanGrow_HTML.h index b39a3ad..bd442bf 100644 --- a/Arduino/CanGrow/CanGrow_HTML.h +++ b/Arduino/CanGrow/CanGrow_HTML.h @@ -164,7 +164,7 @@ input[type=text], input[type=date], input[type=number], input[type=password], se border-radius: 3px; } - @media only screen and (min-width: 1856px) { + @media only screen and (min-width: 1820px) { .center, .nav { width: 60%; min-width: 420px; } @@ -334,6 +334,8 @@ const char CSSgauge[] PROGMEM = R"EOF( .gauge__label--low { width: 24px; } .gauge__label--spacer { width: 72px; text-align: center;} .gauge__label--high { width: 24px; } +.gaugeLabel { text-align: center; } + @media only screen and (min-width: 720px) { .gauge { height: calc(120px + 4.2em); } @@ -444,7 +446,7 @@ const char HTMLgauge[] PROGMEM = R"EOF(
- Temperature +
Temperature
@@ -459,7 +461,7 @@ const char HTMLgauge[] PROGMEM = R"EOF(
- Humidity +
Humidity
@@ -474,7 +476,7 @@ const char HTMLgauge[] PROGMEM = R"EOF(
- Soilmoisture +
Soilmoisture
diff --git a/Arduino/CanGrow/CanGrow_Version.h b/Arduino/CanGrow/CanGrow_Version.h index 3f67416..bebc6f9 100644 --- a/Arduino/CanGrow/CanGrow_Version.h +++ b/Arduino/CanGrow/CanGrow_Version.h @@ -1,5 +1,5 @@ /* CanGrow_Version.h gets generated from cangrow.sh */ const char* CanGrowVer = "0.1-dev"; -const char* CanGrowBuild = "b1da645"; +const char* CanGrowBuild = "1e9ab6e"; diff --git a/cangrow.sh b/cangrow.sh index 2ce35c3..f529f60 100755 --- a/cangrow.sh +++ b/cangrow.sh @@ -1,9 +1,9 @@ #!/bin/bash # -TTY="/dev/ttyUSB0" -IP="192.168.30.212" -VER="0.1-dev" +test -z $TTY && TTY="/dev/ttyUSB0" +test -z $IP && IP="192.168.30.212" +test -z $VER && VER="0.1-dev" function help() { echo "$0 [build|upload|webupload|monitor]" @@ -29,7 +29,7 @@ const char* CanGrowBuild = \"$(git rev-parse --short HEAD)\"; ;; w|webupload) echo "uploading to $IP" - curl -v http://$IP/system/applyUpdate -X POST -H 'Content-Type: multipart/form-data;' -F "image=@$(pwd)/build/CanGrow.ino.bin" + curl -v http://$IP/system/applyUpdate -X POST -H 'Content-Type: multipart/form-data' -F "image=@$(pwd)/build/CanGrow.ino.bin" echo ;; m|mon|monitor)