Skip to content

Commit

Permalink
Merge branch 'melkati:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Coscolin authored Feb 4, 2024
2 parents d2313f4 + 78186d3 commit f7c42d1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CO2_Gadget_Menu.h
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ TOGGLE(showFahrenheit, showFahrenheitMenu, "Units: ", doNothing,noEvent, wrapSty

MENU(temperatureConfigMenu, "Temp Config", doNothing, noEvent, wrapStyle
,FIELD(temp, "Temp", " deg C", 0, 9, 0, 0, doNothing, noEvent, noStyle)
,altFIELD(decPlaces<1>::menuField,tempOffset,"Offset"," deg C",-50,50,1,0.1,doSetTempOffset,(eventMask)(enterEvent | exitEvent | updateEvent),wrapStyle)
,altFIELD(decPlaces<1>::menuField,tempOffset,"Offset"," deg C",0,30,1,0.1,doSetTempOffset,(eventMask)(enterEvent | exitEvent | updateEvent),wrapStyle)
,SUBMENU(showFahrenheitMenu)
,EXIT("<Back"));

Expand Down
4 changes: 2 additions & 2 deletions data/preferences.html
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ <h1>CO2 Gadget Preferences</h1>
<legend>Temperature Sensor</legend>

<div>
<label for="tempOffset">Temperature Offset:</label>
<input type="number" step="0.1" id="tempOffset" name="tempOffset" value="">
<label for="tempOffset">Temperature Offset (Cº):</label>
<input type="number" step="0.1" id="tempOffset" name="tempOffset" value="" min="0" max="30">
</div>

<div>
Expand Down
3 changes: 1 addition & 2 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ build_flags =

-D MQTT_BROKER_SERVER="\"192.168.1.145"\"
-D CO2_GADGET_VERSION="\"0.9."\"

-D CO2_GADGET_REV="\"001"\"
-D CO2_GADGET_REV="\"003"\"
-D CORE_DEBUG_LEVEL=0
-DNEOPIXEL_PIN=26 ; Pinnumber for button for down/next and back / exit actions
-DNEOPIXEL_COUNT=16 ; How many neopixels to control
Expand Down

0 comments on commit f7c42d1

Please sign in to comment.