From f4e58f468512add3a82f3752ea3b92b980b47daf Mon Sep 17 00:00:00 2001 From: limpkin Date: Thu, 9 Apr 2015 14:20:05 +0200 Subject: [PATCH] get free addresses bug --- source_code/Mooltipass.atsuo | Bin 115712 -> 115712 bytes source_code/src/USB/README.md | 2 +- source_code/src/USB/usb_cmd_parser.c | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source_code/Mooltipass.atsuo b/source_code/Mooltipass.atsuo index 80ef4b9e4e6b8772c6bfbd9dbde35184ecb6e393..d6336956b1a63e33efdc33dbf2028d068b22764e 100644 GIT binary patch delta 3531 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 diff --git a/source_code/src/USB/README.md b/source_code/src/USB/README.md index 158af0381..f719804c6 100644 --- a/source_code/src/USB/README.md +++ b/source_code/src/USB/README.md @@ -281,7 +281,7 @@ From Mooltipass: One CPZ CTR LUT entry packet ----------------------------- From plugin/app: 2 bytes payload indicating the address to start scanning from (in doubt, set 0x00 0x00). -From Mooltipass: 0x00 if failure, 32 slot addresses max otherwise (see payload length field) +From Mooltipass: 0x00 if failure, 31 slot addresses max otherwise (see payload length field) 0xD1: Get Starting data parent Address -------------------------------------- diff --git a/source_code/src/USB/usb_cmd_parser.c b/source_code/src/USB/usb_cmd_parser.c index fe438a0c1..a29751f79 100644 --- a/source_code/src/USB/usb_cmd_parser.c +++ b/source_code/src/USB/usb_cmd_parser.c @@ -812,11 +812,11 @@ void usbProcessIncoming(uint8_t caller_id) { // Memory management mode check implemented before the switch uint16_t* temp_addr_ptr = (uint16_t*)msg->body.data; - uint16_t nodeAddresses[32]; + uint16_t nodeAddresses[31]; uint8_t nodesFound; // Call the dedicated function - nodesFound = findFreeNodes(32, nodeAddresses, pageNumberFromAddress(*temp_addr_ptr), nodeNumberFromAddress(*temp_addr_ptr)); + nodesFound = findFreeNodes(31, nodeAddresses, pageNumberFromAddress(*temp_addr_ptr), nodeNumberFromAddress(*temp_addr_ptr)); // Send addresses usbSendMessage(CMD_GET_FREE_SLOTS_ADDR, nodesFound*2, (uint8_t*)nodeAddresses);