CLI command for WiFi country code

Author: martin-ger

CMakeLists.txt

@@ -2,7 +2,7 @@
 # in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-set(PROJECT_VER "2.4.11")
+set(PROJECT_VER "2.4.12")
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(esp32_nat_router)
 

components/cmd_router/cmd_router.c

@@ -91,6 +91,7 @@ static void register_set_watchdog(void);
 static void register_client_stats_cmd(void);
 static void register_set_ap_nat(void);
 static void register_set_tx_power(void);
+static void register_set_wifi_country(void);
 #if defined(CONFIG_IDF_TARGET_ESP32C6)
 static void register_set_rf_switch(void);
 #endif
@@ -311,6 +312,7 @@ void register_router(void)
     register_client_stats_cmd();
     register_set_ap_nat();
     register_set_tx_power();
+    register_set_wifi_country();
     register_set_ap_hidden();
     register_set_ap_auth();
     register_ap();
@@ -1551,6 +1553,7 @@ static int show(int argc, char **argv)
         if (esp_wifi_get_max_tx_power(&tx_power) == ESP_OK) {
             printf("TX Power: %.1f dBm\n", tx_power * 0.25);
         }
+        printf("Country Code: %s\n", wifi_country_code);
 
         // Cleanup
         if (static_ip != NULL) free(static_ip);
@@ -2374,6 +2377,59 @@ static void register_set_tx_power(void)
     ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
 }
 
+/* 'set_wifi_country' command - set WiFi regulatory country code */
+static int set_wifi_country_cmd(int argc, char **argv)
+{
+    if (argc < 2) {
+        printf("Current country code: %s\n", wifi_country_code);
+        printf("Usage: set_wifi_country <CC>\n");
+        printf("  CC: 2-char ISO 3166 code (e.g. US, DE, GB) or 01 for world-safe\n");
+        printf("  Default: 01 (world-safe, all standard channels allowed)\n");
+        return 0;
+    }
+
+    const char *cc = argv[1];
+    if (strlen(cc) != 2) {
+        printf("Country code must be exactly 2 characters (e.g. US, DE, 01).\n");
+        return 1;
+    }
+
+    char upper[3];
+    upper[0] = toupper((unsigned char)cc[0]);
+    upper[1] = toupper((unsigned char)cc[1]);
+    upper[2] = '\0';
+
+    esp_err_t err = set_config_param_str("wifi_cc", upper);
+    if (err != ESP_OK) {
+        printf("Failed to save country code: %s\n", esp_err_to_name(err));
+        return err;
+    }
+
+    wifi_country_code[0] = upper[0];
+    wifi_country_code[1] = upper[1];
+    wifi_country_code[2] = '\0';
+
+    esp_err_t ret = esp_wifi_set_country_code(wifi_country_code, true);
+    if (ret == ESP_OK) {
+        printf("Country code set to %s (applied immediately, saved for reboot).\n", wifi_country_code);
+    } else {
+        printf("Country code %s saved. Could not apply now: %s\n", wifi_country_code, esp_err_to_name(ret));
+    }
+
+    return 0;
+}
+
+static void register_set_wifi_country(void)
+{
+    const esp_console_cmd_t cmd = {
+        .command = "set_wifi_country",
+        .help = "Set WiFi regulatory country code (2-char ISO 3166, e.g. US, DE; or 01 for world-safe)",
+        .hint = NULL,
+        .func = &set_wifi_country_cmd,
+    };
+    ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
+}
+
 #if defined(CONFIG_IDF_TARGET_ESP32C6)
 /* 'set_rf_switch_XIAO' command - XIAO ESP32-C6 antenna selection */
 static int set_rf_switch_cmd(int argc, char **argv)

firmware_esp32/bootloader.bin

@@ -1,7 +1,7 @@
 ESP32 NAT Router Build Information
 =================================
 Target: ESP32 (Original) (esp32)
-Build Time: 2026-05-20 15:48:30
-Git Hash: 3a98b06
+Build Time: 2026-05-27 11:26:43
+Git Hash: f0d5a14
 Binary Files: 4
 Build Directory: build

firmware_esp32/build_info.txt

@@ -1,7 +1,7 @@
 ESP32 NAT Router Build Information
 =================================
 Target: ESP32-C3 (esp32c3)
-Build Time: 2026-05-20 16:02:53
-Git Hash: 3a98b06
+Build Time: 2026-05-27 11:41:15
+Git Hash: f0d5a14
 Binary Files: 4
 Build Directory: build

firmware_esp32/esp32_nat_router.bin

@@ -1,7 +1,7 @@
 ESP32 NAT Router Build Information
 =================================
 Target: ESP32-C5 (esp32c5)
-Build Time: 2026-05-20 15:57:10
-Git Hash: 3a98b06
+Build Time: 2026-05-27 11:35:32
+Git Hash: f0d5a14
 Binary Files: 4
 Build Directory: build