diff --git a/CHANGELOG.md b/CHANGELOG.md index 0906e8800..118c4b793 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file. This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... ## [unreleased][unreleased] + - Changed `usart btfactory` - handles the new BT board with version "BT SPP V3.0" (@iceman1001) - Changed `hf mf eview --sk` - now can extract keys and save to file (@iceman1001) - Changed `hf mf view --sk` - now can extract keys and save to file (@iceman1001) - Changed `hf mf sim` - reduce 6ms threshold to 4ms for reset to idle #1974 (@net147) diff --git a/client/src/cmdflashmemspiffs.c b/client/src/cmdflashmemspiffs.c index a1923d588..e84b3e597 100644 --- a/client/src/cmdflashmemspiffs.c +++ b/client/src/cmdflashmemspiffs.c @@ -531,7 +531,7 @@ static int CmdFlashMemSpiFFSView(const char *Cmd) { void *argtable[] = { arg_param_begin, arg_str1("f", "file", "", "SPIFFS file to view"), - arg_int0("c", "cols", "", "column breaks (def 32)"), + arg_int0("c", "cols", "", "column breaks (def 16)"), arg_param_end }; CLIExecWithReturn(ctx, Cmd, argtable, false); @@ -540,7 +540,7 @@ static int CmdFlashMemSpiFFSView(const char *Cmd) { char fn[32] = {0}; CLIParamStrToBuf(arg_get_str(ctx, 1), (uint8_t *)fn, 32, &fnlen); - int breaks = arg_get_int_def(ctx, 2, 32); + int breaks = arg_get_int_def(ctx, 2, 16); CLIParserFree(ctx); uint8_t *dump = NULL; diff --git a/client/src/cmdusart.c b/client/src/cmdusart.c index d67ae9bf1..2b98181d0 100644 --- a/client/src/cmdusart.c +++ b/client/src/cmdusart.c @@ -157,7 +157,7 @@ static int usart_bt_testcomm(uint32_t baudrate, uint8_t parity) { ret = usart_txrx((uint8_t *)string, strlen(string), data, &len, 1000); // such large timeout needed if (ret == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "RX (%3zu):%.*s", len, (int)len, data); - if (strcmp((char *)data, "hc01.comV2.0") == 0) { + if (strcmp((char *)data, "hc01.comV2.0") == 0 || strcmp((char *)data, "BT SPP V3.0") == 0) { PrintAndLogEx(SUCCESS, "Add-on " _GREEN_("found!")); return PM3_SUCCESS; } diff --git a/doc/uart_notes.md b/doc/uart_notes.md index 5c8cb65b6..eeee8a1d0 100644 --- a/doc/uart_notes.md +++ b/doc/uart_notes.md @@ -199,7 +199,7 @@ The ROLE command takes its parameter after an equal sign: |Command |Description |Reply | |-------------------|------------------------------------------------------|--------------| -|`AT+VERSION` |print firmware version |`hc01.comV2.0`| +|`AT+VERSION` |print firmware version |`hc01.comV2.0` or `BT SPP V3.0`| |`AT+BAUD8` |set baudrate to 115200 |`OK115200` | |`AT+PIN1234` |set PINCODE to 1234. (must be numbers) |`OKsetPIN` | |`AT+NAMEPM3_RDV4.0`|set device name (as shown to BT hosts) to `PM3_RDV4.0`|`OKsetname` | diff --git a/tools/btaddon/requirements.txt b/tools/btaddon/requirements.txt new file mode 100644 index 000000000..3452b96e3 --- /dev/null +++ b/tools/btaddon/requirements.txt @@ -0,0 +1 @@ +pyserial==3.5.0