Oopsie woopsie in the admin panel melody selector

vladkorotnev · Sep 27, 2024 · dc598e6 · dc598e6
1 parent 1ec5992
commit dc598e6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/src/app/menu.cpp b/src/app/menu.cpp
@@ -40,7 +40,7 @@ class DiskSpaceView: public MenuInfoItemView {
     }
 
 private:
-    char buf[24] = { 0 };
+    char buf[32] = { 0 };
 };
 
 AppShimMenu::AppShimMenu(Beeper *b, NewSequencer *s, Yukkuri *y): ProtoShimNavMenu::ProtoShimNavMenu() {

diff --git a/src/main.cpp b/src/main.cpp
@@ -203,26 +203,26 @@ void boot_task(void*) {
 
     con->clear();
 
-    con->print("WiFi init");
+    // con->print("WiFi init");
     NetworkManager::startup();
     while(!NetworkManager::is_up()) {
-        delay(1000);
-        con->write('.');
+        delay(100);
+        // con->write('.');
     }
 
     con->clear();
 
     screenshooter = new Screenshooter(fb->manipulate());
     if(prefs_get_bool(PREFS_KEY_REMOTE_SERVER)) {
         screenshooter->start_server(3939);
-        con->print("RC server up!");
-        delay(1000);
+        // con->print("RC server up!");
+        // delay(1000);
     }
-    con->print(NetworkManager::network_name());
-    con->print("%i dBm", NetworkManager::rssi());
-    delay(2000);
-    con->print(NetworkManager::current_ip().c_str());
-    delay(2000);
+    // con->print(NetworkManager::network_name());
+    // con->print("%i dBm", NetworkManager::rssi());
+    // delay(2000);
+    // con->print(NetworkManager::current_ip().c_str());
+    // delay(2000);
 
     ota = new OTAFVUManager(con, seq);
 
@@ -350,8 +350,6 @@ void loop() {
             appHost->switch_to(_actual_current_state, _next_transition);
         }
         print_memory();
-
-        if(_actual_current_state == STATE_BOOT) taskYIELD();
     } else {
         if(_actual_current_state != current_state && current_state == STATE_RESTART) {
             _actual_current_state = current_state;

diff --git a/src/network/admin_panel.cpp b/src/network/admin_panel.cpp
@@ -660,7 +660,10 @@ void admin_panel_prepare(SensorPool* s, Beeper* b) {
     all_chime_names_csv.reserve(all_chime_list.size() * 32);
     for(int i = 0; i < all_chime_list.size(); i++) {
         if(i > 0) all_chime_names_csv += ",";
-        all_chime_names_csv += all_chime_list[i]->get_long_title();
+        size_t loc = std::string::npos;
+        std::string tmp = std::string(all_chime_list[i]->get_long_title());
+        std::replace(tmp.begin(), tmp.end(), ',', '/');
+        all_chime_names_csv += tmp;
     }
 
     // Due to a bug in GyverPortal, handle uploads on our own