botchain/firmware
1
0
Fork 0
mirror of https://github.com/BotChain-Robots/firmware.git synced 2026-07-08 17:47:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of git.uwaterloo.ca:capstone-group2/firmware

Browse Source
This commit is contained in:
Johnathon Slightham
2026-01-07 11:38:26 -05:00
parent cd0c1d586f 8b48c6f414
commit 857057b1a8
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/rpc/include/wireless/WifiManager.h
View File

@@ -28,7 +28,7 @@ public:
[[noreturn]] void manage();
enum class wifi_state { connect, connecting, connected, disconnect, disconnected, broadcast, broadcasting };
enum class wifi_state { connect, connecting, connected, disconnect, disconnected, broadcast, broadcasting, shutdown, disabled };
private:
void update_state(wifi_state state);

1
components/rpc/wireless/UDPServer.cpp
View File

@@ -135,7 +135,6 @@ void UDPServer::shutdown() {
auto buffer = std::make_unique<std::vector<uint8_t>>();
buffer->resize(MAX_RX_BUFFER_SIZE + 4);
ESP_LOGI(TAG, "Before rx");
if (int len = recvfrom(that->m_rx_server_sock, buffer->data(),
MAX_RX_BUFFER_SIZE, 0, nullptr, nullptr);
len < 0) {

8
components/rpc/wireless/WifiManager.cpp
View File

@@ -21,7 +21,7 @@ int WifiManager::connect() {
}
int WifiManager::disconnect() {
this->update_state(wifi_state::disconnect);
this->update_state(wifi_state::shutdown);
vTaskResume(this->m_task);
return 0;
}
@@ -55,7 +55,7 @@ int WifiManager::disconnect() {
handle_broadcasting(); // scans for known networks
break;
case wifi_state::disconnect:
ESP_LOGI(TAG, "Shutting down wifi");
ESP_LOGI(TAG, "Shutting down wifi (will restart)");
handle_disconnect();
update_state(wifi_state::disconnected);
break;
@@ -63,6 +63,10 @@ int WifiManager::disconnect() {
ESP_LOGI(TAG, "Disconnected from wifi, starting back up");
update_state(wifi_state::connect);
break;
case wifi_state::shutdown:
ESP_LOGI(TAG, "Shutting down wifi (will not automatically restart)");
handle_disconnect();
update_state(wifi_state::disabled);
default:
vTaskSuspend(nullptr);
break;