Skip to content

Commit 4fd8ce6

Browse files
author
Greg Smith
committed
Last few bugs before beta testing:
- implemented tap temp display for GP5 - fixed web syntax error that got rid of the Misc page
1 parent 3b72f0d commit 4fd8ce6

File tree

4 files changed

+25
-11
lines changed

4 files changed

+25
-11
lines changed

source/main/display_valeton.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3011,7 +3011,18 @@ uint8_t valeton_update_ui_parameters(void)
30113011

30123012
case VALETON_GLOBAL_BPM:
30133013
{
3014-
//todo
3014+
// show value and units
3015+
// todo
3016+
// sprintf(value_string, "%1.1f", param_entry->Value);
3017+
//lv_label_set_text(objects.ui_val_bpm_value, value_string);
3018+
3019+
char buf[128];
3020+
sprintf(buf, "%.1f", param_entry->Value);
3021+
lv_label_set_text(objects.ui_bpm_value_label, buf);
3022+
3023+
#if CONFIG_TONEX_CONTROLLER_SHOW_BPM_INDICATOR
3024+
ui_BPMAnimate(objects.ui_bpm_indicator, 1000 * 60 / param_entry->Value);
3025+
#endif
30153026
} break;
30163027

30173028
case VALETON_GLOBAL_INPUT_TRIM:

source/main/web/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2035,11 +2035,11 @@ <h5 class="selected_text">WiFi</h5>
20352035
<div class="container">
20362036
<button type="button" onclick="SaveWifi()" class="btn btn-success">Save and Reboot</button>
20372037
</div>
2038-
</p
2038+
</p>
20392039
</div>
20402040
</div>
20412041

2042-
<div id="Miscellaneous" class="content-section">
2042+
<div id="Misc" class="content-section">
20432043
<div class="col py-3 text-white">
20442044
<h5 class="selected_text">Miscellaneous</h5>
20452045
<p class="lead">

source/main/web/script.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,7 @@ const DEVICE_MENUS = {
839839
<li><a class="dropdown-item menu-link" data-target="Internal" href="#">Direct FS</a></li>
840840
<li><a class="dropdown-item menu-link" data-target="External" href="#">External FS</a></li>
841841
<li><a class="dropdown-item menu-link" data-target="WiFi" href="#">WiFi</a></li>
842-
<li><a class="dropdown-item menu-link" data-target="Miscellaneous" href="#">Misc</a></li>
842+
<li><a class="dropdown-item menu-link" data-target="Misc" href="#">Misc</a></li>
843843
</ul>
844844
</li>
845845
`,
@@ -878,7 +878,7 @@ const DEVICE_MENUS = {
878878
<li><a class="dropdown-item menu-link" data-target="Internal" href="#">Direct FS</a></li>
879879
<li><a class="dropdown-item menu-link" data-target="External" href="#">External FS</a></li>
880880
<li><a class="dropdown-item menu-link" data-target="WiFi" href="#">WiFi</a></li>
881-
<li><a class="dropdown-item menu-link" data-target="Miscellaneous" href="#">Miscellaneous</a></li>
881+
<li><a class="dropdown-item menu-link" data-target="Misc" href="#">Misc</a></li>
882882
</ul>
883883
</li>
884884
`

ui_design_800x480land/Tonex_Controller_800_480land.eez-project-ui-state

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"navigation": {
3-
"selectedUserPageObject": "[Tonex_Controller_800_480land.eez-project]:/userPages/2",
3+
"selectedUserPageObject": "[Tonex_Controller_800_480land.eez-project]:/userPages/0",
44
"selectedBitmapObject": "[Tonex_Controller_800_480land.eez-project]:/bitmaps/113",
55
"subnavigationSelectedItems": {}
66
},
@@ -197,10 +197,10 @@
197197
{
198198
"type": "tab",
199199
"id": "#76314634-65e1-4225-b990-af9c26f38d4f",
200-
"name": "ValSettings",
200+
"name": "Screen1",
201201
"component": "editor",
202202
"config": {
203-
"objectPath": "[Tonex_Controller_800_480land.eez-project]:/userPages/2",
203+
"objectPath": "[Tonex_Controller_800_480land.eez-project]:/userPages/0",
204204
"permanent": false
205205
},
206206
"icon": "svg:page"
@@ -975,9 +975,12 @@
975975
"selection": {
976976
"0": {
977977
"0": {
978-
"11": {
979-
"$selected": true
980-
}
978+
"5": {
979+
"1": {
980+
"$selected": true
981+
}
982+
},
983+
"11": {}
981984
}
982985
}
983986
},

0 commit comments

Comments
 (0)