Merge remote-tracking branch 'upstream/master' into fix/t55xx-detect-pwd-guard

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Matthew Carroll committed 2026-10-07 09:11:55 -07:00
commit 3ba49c6a61
19 files changed
+467 -116

No files matched your search

+34 -20
View File
@@ -230,14 +230,14 @@ static int CmdBWMWifi(const char *Cmd) {
"Sub-actions (no dashes): 'status' shows state, 'stop' tears WiFi down.",
"hw bwm wifi status --> show connection state + IP\n"
"hw bwm wifi stop --> tear down WiFi, back to BLE-only\n"
"hw bwm wifi --ssid Home --pwd secret --> bring up, port 7777\n"
"hw bwm wifi --ssid Home --pwd secret --> bring up, port 18888\n"
"hw bwm wifi --ssid Home --pwd secret --port 9000");
void *argtable[] = {
arg_param_begin,
arg_str0(NULL, "ssid", "<ssid>", "WiFi SSID to join"),
arg_str0(NULL, "pwd", "<pwd>", "WiFi password (omit for open network)"),
arg_int0(NULL, "port", "<dec>", "TCP server listen port (default 7777)"),
arg_int0(NULL, "port", "<dec>", "TCP server listen port (default 18888)"),
arg_str0(NULL, "hostname", "<name>", "DHCP hostname (default Proxmark5)"),
arg_param_end
};
@@ -251,7 +251,7 @@ static int CmdBWMWifi(const char *Cmd) {
int pwd_len = 0;
CLIParamStrToBuf(arg_get_str(ctx, 2), pwd, sizeof(pwd) - 1, &pwd_len);
int port = arg_get_int_def(ctx, 3, 7777);
int port = arg_get_int_def(ctx, 3, 18888);
uint8_t host[33] = {0};
int host_len = 0;
@@ -328,9 +328,9 @@ static int CmdBwmCharge(const char *Cmd) {
"Enable or disable BWM battery charging by clearing/setting the\n"
"AW32001E charge-enable bit (CEB, REG01[3]). PM5 only.\n"
_RED_("One-shot:") " the charger watchdog reverts this after ~160 s unless\n"
"serviced, so charging may stop on its own. Use to nudge a top-up.",
"hw bwm charge off --> disable charging\n"
"hw bwm charge on --> enable charging");
"serviced, so charging may stop on its own. Use to nudge a top-up.",
"hw bwm charge off --> disable charging\n"
"hw bwm charge on --> enable charging");
void *argtable[] = {
arg_param_begin,
arg_param_end
@@ -787,12 +787,18 @@ static int bwm_setting_txn(uint16_t cmd, uint8_t action, uint8_t value, bool has
static const char *bwm_wifi_state_name(uint8_t state) {
switch (state) {
case 0: return "disconnected";
case 1: return "connecting";
case 2: return "connected";
case 3: return "reconnecting";
case 4: return "connect task stopped";
default: return "unknown state";
case 0:
return "disconnected";
case 1:
return "connecting";
case 2:
return "connected";
case 3:
return "reconnecting";
case 4:
return "connect task stopped";
default:
return "unknown state";
}
}
@@ -840,10 +846,14 @@ static int CmdBwmPowerSave(const char *Cmd) {
static const char *bwm_wifi_ps_name(uint8_t mode) {
switch (mode) {
case BWM_WIFI_PS_NONE: return "none";
case BWM_WIFI_PS_MIN: return "min";
case BWM_WIFI_PS_MAX: return "max";
default: return "?";
case BWM_WIFI_PS_NONE:
return "none";
case BWM_WIFI_PS_MIN:
return "min";
case BWM_WIFI_PS_MAX:
return "max";
default:
return "?";
}
}
@@ -912,10 +922,14 @@ static int CmdBwmWifiPower(const char *Cmd) {
static const char *ble_state_str(uint8_t state) {
switch (state) {
case 0: return "off";
case 1: return "advertising, no client";
case 2: return "client connected";
default: return "unknown";
case 0:
return "off";
case 1:
return "advertising, no client";
case 2:
return "client connected";
default:
return "unknown";
}
}