github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 22:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2230 from unknown10777/patch-1

Browse source 
Renamed bool to follow guideline, and a typo
This commit is contained in:
Iceman 2024-01-03 21:42:20 +01:00 • committed by GitHub
commit bc2a906d37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/src/cmdusart.c
View file

@ -149,8 +149,8 @@ static int CmdUsartConfig(const char *Cmd) {
} }
// module command not universal so specific commands needed if anyone DIY'd their own Blueshark. // module command not universal so specific commands needed if anyone DIY'd their own Blueshark.
bool isBluetoothExtensionHC04 = false; bool BT_EXTENSION_HC04 = false;
bool isBluetoothExtensionHC05Blueshark = false; bool BT_EXTENSION_HC05_BLUESHARK = false;
static int usart_bt_testcomm(uint32_t baudrate, uint8_t parity) { static int usart_bt_testcomm(uint32_t baudrate, uint8_t parity) {
int ret = set_usart_config(baudrate, parity); int ret = set_usart_config(baudrate, parity);
@ -175,13 +175,13 @@ static int usart_bt_testcomm(uint32_t baudrate, uint8_t parity) {
// if it fully match HC-04's attribute // if it fully match HC-04's attribute
if (str_startswith((char *)data, "www.hc01.com V2.5, 2022-04-26")) { if (str_startswith((char *)data, "www.hc01.com V2.5, 2022-04-26")) {
isBluetoothExtensionHC04 = true; BT_EXTENSION_HC04 = true;
PrintAndLogEx(INFO, "Bluetooth module identified as HC-04."); PrintAndLogEx(INFO, "Bluetooth module identified as HC-04.");
} }
// if it fully match Blueshark HC-05's attribute // if it fully match Blueshark HC-05's attribute
if (str_startswith((char *)data, "hc01.comV2.0")) { if (str_startswith((char *)data, "hc01.comV2.0")) {
isBluetoothExtensionHC05Blueshark = true; BT_EXTENSION_HC05_BLUESHARK = true;
PrintAndLogEx(INFO, "Bluetooth module identified as Blueshark HC-05."); PrintAndLogEx(INFO, "Bluetooth module identified as Blueshark HC-05.");
} }
return PM3_SUCCESS; return PM3_SUCCESS;
@ -265,7 +265,7 @@ static int CmdUsartBtFactory(const char *Cmd) {
size_t len = 0; size_t len = 0;
memset(data, 0, sizeof(data)); memset(data, 0, sizeof(data));
if (isBluetoothExtensionHC04 == true) { if (BT_EXTENSION_HC04 == true) {
string = "AT+NAME=PM3_RDV4.0"; string = "AT+NAME=PM3_RDV4.0";
} else { } else {
string = "AT+NAMEPM3_RDV4.0"; string = "AT+NAMEPM3_RDV4.0";
@ -311,7 +311,7 @@ static int CmdUsartBtFactory(const char *Cmd) {
memset(data, 0, sizeof(data)); memset(data, 0, sizeof(data));
len = 0; len = 0;
if (isBluetoothExtensionHC04 == true) { if (BT_EXTENSION_HC04 == true) {
string = "AT+PIN=1234"; string = "AT+PIN=1234";
} else { } else {
string = "AT+PIN1234"; string = "AT+PIN1234";
@ -322,7 +322,7 @@ static int CmdUsartBtFactory(const char *Cmd) {
ret = usart_txrx((uint8_t *)string, strlen(string), data, &len, 1000); ret = usart_txrx((uint8_t *)string, strlen(string), data, &len, 1000);
if (ret == PM3_SUCCESS) { if (ret == PM3_SUCCESS) {
PrintAndLogEx(SUCCESS, "RX (%3zu):%.*s", len, (int)len, data); PrintAndLogEx(SUCCESS, "RX (%3zu):%.*s", len, (int)len, data);
if (strstr((char *)data, "OK") != NULL) { if (strstr((char *)data, "OK")) {
PrintAndLogEx(SUCCESS, "PIN set to " _GREEN_("1234")); PrintAndLogEx(SUCCESS, "PIN set to " _GREEN_("1234"));
} else { } else {
PrintAndLogEx(WARNING, "Unexpected response to AT+PIN: " _YELLOW_("%.*s"), (int)len, data); PrintAndLogEx(WARNING, "Unexpected response to AT+PIN: " _YELLOW_("%.*s"), (int)len, data);
@ -334,7 +334,7 @@ static int CmdUsartBtFactory(const char *Cmd) {
msleep(500); msleep(500);
if (isBluetoothExtensionHC04 != true) { if (BT_EXTENSION_HC04 != true) {
// parity must be changed before baudrate // parity must be changed before baudrate
if (parity != USART_PARITY) { if (parity != USART_PARITY) {
memset(data, 0, sizeof(data)); memset(data, 0, sizeof(data));