From 1d6690a23496270c86ffb73ea63b9b9e0d0de9a0 Mon Sep 17 00:00:00 2001 From: Allen Hill Date: Sat, 16 Sep 2023 16:31:08 -0400 Subject: [PATCH] Fix printBinary flag --- src/avclandrv.c | 1 + src/sniffer.c | 22 +++++++--------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/avclandrv.c b/src/avclandrv.c index 39fc22c..9560e17 100644 --- a/src/avclandrv.c +++ b/src/avclandrv.c @@ -130,6 +130,7 @@ uint16_t HU_ID; uint8_t printAllFrames; uint8_t verbose; +uint8_t printBinary; uint8_t playMode; diff --git a/src/sniffer.c b/src/sniffer.c index 2ca28eb..6bbaf6c 100644 --- a/src/sniffer.c +++ b/src/sniffer.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "avclandrv.h" #include "com232.h" @@ -48,7 +49,7 @@ int main() { uint8_t s_dig = 0; uint8_t s_c[2]; uint8_t i; - uint8_t data_tmp[32]; + uint8_t data_tmp[MAXMSGLEN]; AVCLAN_frame_t msg = { .broadcast = UNICAST, .controller_addr = CD_ID, @@ -155,26 +156,16 @@ int main() { break; case 'b': case 'B': // Beep - data_tmp[0] = 0x00; - data_tmp[1] = 0x5E; - data_tmp[2] = 0x29; - data_tmp[3] = 0x60; - data_tmp[4] = 0x01; - s_len = 5; - msg.length = s_len; - msg.broadcast = UNICAST; - msg.controller_addr = 0x110; - msg.peripheral_addr = 0x440; - AVCLAN_sendframe(&msg); + answerReq = cm_Beep; + AVCLan_SendAnswer(); break; case 'e': // Beep data_tmp[0] = 0x00; data_tmp[1] = 0x01; data_tmp[2] = 0x11; - data_tmp[3] = 0x45; + data_tmp[3] = 0x50; data_tmp[4] = 0x63; - s_len = 5; - msg.length = s_len; + msg.length = 5; msg.broadcast = UNICAST; msg.controller_addr = CD_ID; msg.peripheral_addr = HU_ID; @@ -253,6 +244,7 @@ void Setup() { printAllFrames = 1; echoCharacters = 1; readBinary = 0; + printBinary = 0; _PROTECTED_WRITE(CLKCTRL.MCLKCTRLB, (CLK_PRESCALE | CLK_PRESCALE_DIV));