diff --git a/main/actions/switchprofileaction.h b/main/actions/switchprofileaction.h index 735bf06..e321ca4 100644 --- a/main/actions/switchprofileaction.h +++ b/main/actions/switchprofileaction.h @@ -12,7 +12,7 @@ class SwitchProfileAction : public virtual ActionInterface public: void triggered() override { - switchProfile(index); + settingsutils::switchProfile(index); } }; } diff --git a/main/buttons.cpp b/main/buttons.cpp index 5879359..0d45dbf 100644 --- a/main/buttons.cpp +++ b/main/buttons.cpp @@ -1,6 +1,8 @@ #include "buttons.h" #include "modes/defaultmode.h" +using namespace std::chrono_literals; + int rotated{}; bool requestFullRedraw{}; @@ -118,7 +120,7 @@ void InputDispatcher::profileButton(uint8_t index, bool pressed) if (profileButtonDisabled) return; - switchProfile(index); + settingsutils::switchProfile(index); } #ifdef SWITCH_BLINK diff --git a/main/can.cpp b/main/can.cpp index 09d955e..aa9cb82 100644 --- a/main/can.cpp +++ b/main/can.cpp @@ -19,6 +19,8 @@ #include "globals.h" #include "buttons.h" +using namespace std::chrono_literals; + namespace can { namespace { constexpr const char * const TAG = "BOBBYCAN"; diff --git a/main/settingsutils.cpp b/main/settingsutils.cpp index 1960411..87b64bb 100644 --- a/main/settingsutils.cpp +++ b/main/settingsutils.cpp @@ -7,7 +7,7 @@ #include "globals.h" #include "presets.h" -namespace { +namespace settingsutils { void switchProfile(uint8_t index) { #ifdef SIMPLIFIED_TRIGGER_TRIGGERONPRESET diff --git a/main/settingsutils.h b/main/settingsutils.h index 84c5b79..54dba3d 100644 --- a/main/settingsutils.h +++ b/main/settingsutils.h @@ -2,6 +2,6 @@ #include -namespace { +namespace settingsutils { void switchProfile(uint8_t index); } diff --git a/main/webserver_dumpnvs.cpp b/main/webserver_dumpnvs.cpp index 506a5af..0e75496 100644 --- a/main/webserver_dumpnvs.cpp +++ b/main/webserver_dumpnvs.cpp @@ -148,7 +148,7 @@ esp_err_t webserver_dump_nvs_handler(httpd_req_t *req) continue; } #endif - switchProfile(profile_num); + settingsutils::switchProfile(profile_num); const auto cur_profile = settingsPersister.currentlyOpenProfileIndex(); const auto profile_str = cur_profile ? std::to_string(*cur_profile) : "-"; @@ -166,7 +166,7 @@ esp_err_t webserver_dump_nvs_handler(httpd_req_t *req) }); } - switchProfile(switchBackProfile); + settingsutils::switchProfile(switchBackProfile); std::string body; serializeJson(doc, body);