From f7dfd2a1f2f12328e9210da60d6ac1d2ec72008e Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Fri, 7 Jun 2019 21:26:03 +0200 Subject: [PATCH] Fix arg names mismatches between decl & def --- armsrc/apps.h | 4 ++-- client/cmdlfviking.h | 2 +- common/lfdemod.c | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/armsrc/apps.h b/armsrc/apps.h index 59832d6b4..41a1f0271 100644 --- a/armsrc/apps.h +++ b/armsrc/apps.h @@ -45,9 +45,9 @@ void ReadMem(int addr); void __attribute__((noreturn)) AppMain(void); //void DbpIntegers(int a, int b, int c); void DbpString(char *str); -void DbpStringEx(uint32_t cmd, char *str); +void DbpStringEx(uint32_t flags, char *str); void Dbprintf(const char *fmt, ...); -void DbprintfEx(uint32_t cmd, const char *fmt, ...); +void DbprintfEx(uint32_t flags, const char *fmt, ...); void Dbhexdump(int len, uint8_t *d, bool bAsci); // ADC Vref = 3300mV, and an (10M+1M):1M voltage divider on the HF input can measure voltages up to 36300 mV diff --git a/client/cmdlfviking.h b/client/cmdlfviking.h index 2baea6364..8789515d6 100644 --- a/client/cmdlfviking.h +++ b/client/cmdlfviking.h @@ -24,7 +24,7 @@ int CmdLFViking(const char *Cmd); int demodViking(void); -int detectViking(uint8_t *dest, size_t *size); +int detectViking(uint8_t *src, size_t *size); uint64_t getVikingBits(uint32_t id); #endif diff --git a/common/lfdemod.c b/common/lfdemod.c index a3aaf3f26..7bdd27580 100644 --- a/common/lfdemod.c +++ b/common/lfdemod.c @@ -479,14 +479,14 @@ bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) { // by marshmellow // to help detect clocks on heavily clipped samples // based on count of low to low -int DetectStrongAskClock(uint8_t *src, size_t size, int high, int low, int *clock) { +int DetectStrongAskClock(uint8_t *dest, size_t size, int high, int low, int *clock) { size_t i = 100; size_t minClk = 512; uint16_t shortestWaveIdx = 0; // get to first full low to prime loop and skip incomplete first pulse - getNextHigh(src, size, high, &i); - getNextLow(src, size, low, &i); + getNextHigh(dest, size, high, &i); + getNextLow(dest, size, low, &i); if (i == size) return -1; @@ -512,8 +512,8 @@ int DetectStrongAskClock(uint8_t *src, size_t size, int high, int low, int *cloc // measure from low to low size_t startwave = i; - getNextHigh(src, size, high, &i); - getNextLow(src, size, low, &i); + getNextHigh(dest, size, high, &i); + getNextLow(dest, size, low, &i); //get minimum measured distance if (i - startwave < minClk && i < size) {