From 7c2379ac9f441b8e95f73a8cee3b751149760580 Mon Sep 17 00:00:00 2001 From: merlokk <807634+merlokk@users.noreply.github.com> Date: Wed, 6 Jul 2022 19:03:17 +0300 Subject: [PATCH] rename and read parameters via struct --- armsrc/appmain.c | 10 +++++++--- armsrc/hfops.c | 2 +- armsrc/hfops.h | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/armsrc/appmain.c b/armsrc/appmain.c index 5e84aec4e..106fe3903 100644 --- a/armsrc/appmain.c +++ b/armsrc/appmain.c @@ -1393,9 +1393,13 @@ static void PacketReceived(PacketCommandNG *packet) { break; } case CMD_HF_TEXKOM_SIMULATE: { - uint32_t timeout = 0; - memcpy(&timeout, &packet->data.asBytes[9], 4); - HfWriteTkm(packet->data.asBytes, packet->data.asBytes[8], timeout); + struct p { + uint8_t data[8]; + uint8_t modulation; + uint32_t timeout; + } PACKED; + struct p *payload = (struct p *) packet->data.asBytes; + HfSimulateTkm(payload->data, payload->modulation, payload->timeout); break; } diff --git a/armsrc/hfops.c b/armsrc/hfops.c index cdc9aab8e..ab7e5c9c4 100644 --- a/armsrc/hfops.c +++ b/armsrc/hfops.c @@ -200,7 +200,7 @@ static uint32_t HfEncodeTkm(const uint8_t *uid, uint8_t modulation, uint8_t *dat return len; } -int HfWriteTkm(uint8_t *uid, uint8_t modulation, uint32_t timeout) { +int HfSimulateTkm(uint8_t *uid, uint8_t modulation, uint32_t timeout) { // free eventually allocated BigBuf memory BigBuf_free_keep_EM(); diff --git a/armsrc/hfops.h b/armsrc/hfops.h index 91f1de539..352f9d2bc 100644 --- a/armsrc/hfops.h +++ b/armsrc/hfops.h @@ -22,6 +22,6 @@ #include "common.h" int HfReadADC(uint32_t samplesCount, bool ledcontrol); -int HfWriteTkm(uint8_t *uid, uint8_t modulation, uint32_t timeout); +int HfSimulateTkm(uint8_t *uid, uint8_t modulation, uint32_t timeout); #endif