fix compiler warning in cmdhflegic.c (and whitespace fixes) (#826)

[proxmark3-svn] / client / cmdlfnoralsy.c

diff --git a/client/cmdlfnoralsy.c b/client/cmdlfnoralsy.c
index db450a4491735e0ead609c0c1ea0fcfebc643f38..52c35081f42003aa81f9bf2f303a7541c75809f2 100644 (file)
--- a/client/cmdlfnoralsy.c
+++ b/client/cmdlfnoralsy.c
@@ -5,13 +5,15 @@
 // the license.
 //-----------------------------------------------------------------------------
 // Low frequency Noralsy tag commands
 // the license.
 //-----------------------------------------------------------------------------
 // Low frequency Noralsy tag commands

-// ASK/Manchester, STT, RF/32, 96 bits long
+// ASK/Manchester, STT, RF/32, 96 bits long (some bits unknown)

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

+

 #include "cmdlfnoralsy.h"
 #include "cmdlfnoralsy.h"

+

 #include <string.h>
 #include <inttypes.h>
 #include <math.h>
 #include <string.h>
 #include <inttypes.h>
 #include <math.h>

-#include "proxmark3.h"
+#include "comms.h"

 #include "ui.h"
 #include "util.h"
 #include "graph.h"
 #include "ui.h"
 #include "util.h"
 #include "graph.h"


@@ -98,20 +100,21 @@ int NoralsyDemod_AM(uint8_t *dest, size_t *size) {
 /*
 *
 * 2520116 | BB0214FF2529900116360000 | 10111011 00000011 00010100 11111111 00100101 00101001 10010000 00000001 00010110 00110110 00000000 00000000
 /*
 *
 * 2520116 | BB0214FF2529900116360000 | 10111011 00000011 00010100 11111111 00100101 00101001 10010000 00000001 00010110 00110110 00000000 00000000

-*           aaaaaaaaiii***iiiicc----                                       iiiiiiii iiiiYYYY YYYY**** iiiiiiii iiiiiiii cccccccc
+*           aaa*aaaaiiiYY*iiiicc----                ****                   iiiiiiii iiiiYYYY YYYY**** iiiiiiii iiiiiiii cccccccc

 *
 *

-* a = fixed value BB0314FF 
+* a = fixed value BB0*14FF 

 * i = printed id, BCD-format
 * Y = year
 * c = checksum
 * i = printed id, BCD-format
 * Y = year
 * c = checksum

-* 
+* * = unknown
+*

 **/
 
 //see ASKDemod for what args are accepted
 int CmdNoralsyDemod(const char *Cmd) {
 
        //ASK / Manchester
 **/
 
 //see ASKDemod for what args are accepted
 int CmdNoralsyDemod(const char *Cmd) {
 
        //ASK / Manchester

-       bool st = false;
+       bool st = true;

        if (!ASKDemod_ext("32 0 0", false, false, 1, &st)) {
                if (g_debugMode) PrintAndLog("DEBUG: Error - Noralsy: ASK/Manchester Demod failed");
                return 0;
        if (!ASKDemod_ext("32 0 0", false, false, 1, &st)) {
                if (g_debugMode) PrintAndLog("DEBUG: Error - Noralsy: ASK/Manchester Demod failed");
                return 0;


@@ -134,6 +137,7 @@ int CmdNoralsyDemod(const char *Cmd) {
                return 0;
        }
        setDemodBuf(DemodBuffer, 96, ans);
                return 0;
        }
        setDemodBuf(DemodBuffer, 96, ans);

+       setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));

        //setGrid_Clock(32);
 
        //got a good demod
        //setGrid_Clock(32);
 
        //got a good demod


@@ -171,8 +175,7 @@ int CmdNoralsyDemod(const char *Cmd) {
 }
 
 int CmdNoralsyRead(const char *Cmd) {
 }
 
 int CmdNoralsyRead(const char *Cmd) {

-       CmdLFRead("s");
-       getSamples("8000",true);
+       lf_read(true, 8000);

        return CmdNoralsyDemod(Cmd);
 }
 
        return CmdNoralsyDemod(Cmd);
 }