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

firmware wip - gauge labels now in center of div

Browse source
This commit is contained in:
Marcus 2024-06-15 04:34:32 +02:00
parent 1e9ab6e2e7
commit fc00f9267f
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Arduino/CanGrow/CanGrow_HTML.h
View file

@ -164,7 +164,7 @@ input[type=text], input[type=date], input[type=number], input[type=password], se
border-radius: 3px; border-radius: 3px;
} }
@media only screen and (min-width: 1856px) { @media only screen and (min-width: 1820px) {
.center, .nav { .center, .nav {
width: 60%; min-width: 420px; width: 60%; min-width: 420px;
} }
@ -334,6 +334,8 @@ const char CSSgauge[] PROGMEM = R"EOF(
.gauge__label--low { width: 24px; } .gauge__label--low { width: 24px; }
.gauge__label--spacer { width: 72px; text-align: center;} .gauge__label--spacer { width: 72px; text-align: center;}
.gauge__label--high { width: 24px; } .gauge__label--high { width: 24px; }
.gaugeLabel { text-align: center; }
@media only screen and (min-width: 720px) { @media only screen and (min-width: 720px) {
.gauge { height: calc(120px + 4.2em); } .gauge { height: calc(120px + 4.2em); }
@ -444,7 +446,7 @@ const char HTMLgauge[] PROGMEM = R"EOF(
<div class='gaugeWrapper'> <div class='gaugeWrapper'>
<div class='gauge gauge--liveupdate spacer' id='gaugeTemperature' style='float:left; margin-right: 10px;'> <div class='gauge gauge--liveupdate spacer' id='gaugeTemperature' style='float:left; margin-right: 10px;'>
<span class='gaugeLabel'>Temperature</span> <div class='gaugeLabel'>Temperature</div>
<div class='gauge__container'> <div class='gauge__container'>
<div class='gauge__background'></div> <div class='gauge__background'></div>
<div class='gauge__center'></div> <div class='gauge__center'></div>
@ -459,7 +461,7 @@ const char HTMLgauge[] PROGMEM = R"EOF(
</div> </div>
<div class='gauge gauge--liveupdate spacer' id='gaugeHumidity' style='float:left; margin-right: 10px;'> <div class='gauge gauge--liveupdate spacer' id='gaugeHumidity' style='float:left; margin-right: 10px;'>
<span class='gaugeLabel'>Humidity</span> <div class='gaugeLabel'>Humidity</div>
<div class='gauge__container'> <div class='gauge__container'>
<div class='gauge__background'></div> <div class='gauge__background'></div>
<div class='gauge__center'></div> <div class='gauge__center'></div>
@ -474,7 +476,7 @@ const char HTMLgauge[] PROGMEM = R"EOF(
</div> </div>
<div class='gauge gauge--liveupdate' id='gaugeSoilmoisture' style='float:left;'> <div class='gauge gauge--liveupdate' id='gaugeSoilmoisture' style='float:left;'>
<span class='gaugeLabel'>Soilmoisture</span> <div class='gaugeLabel'>Soilmoisture</div>
<div class='gauge__container'> <div class='gauge__container'>
<div class='gauge__background'></div> <div class='gauge__background'></div>
<div class='gauge__center'></div> <div class='gauge__center'></div>

2
Arduino/CanGrow/CanGrow_Version.h
View file

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

8
cangrow.sh
View file

@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
# #
TTY="/dev/ttyUSB0" test -z $TTY && TTY="/dev/ttyUSB0"
IP="192.168.30.212" test -z $IP && IP="192.168.30.212"
VER="0.1-dev" test -z $VER && VER="0.1-dev"
function help() { function help() {
echo "$0 [build|upload|webupload|monitor]" echo "$0 [build|upload|webupload|monitor]"
@ -29,7 +29,7 @@ const char* CanGrowBuild = \"$(git rev-parse --short HEAD)\";
;; ;;
w|webupload) w|webupload)
echo "uploading to $IP" 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 echo
;; ;;
m|mon|monitor) m|mon|monitor)