github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

textual

Browse source
This commit is contained in:
iceman1001 2020-06-22 18:00:20 +02:00
commit f900b1078e
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/src/cmdlfpyramid.c
View file

@ -1,5 +1,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// by marshmellow
//
// This code is licensed to you under the terms of the GNU GPL, version 2 or, // This code is licensed to you under the terms of the GNU GPL, version 2 or,
// at your option, any later version. See the LICENSE.txt file for the text of // at your option, any later version. See the LICENSE.txt file for the text of
// the license. // the license.
@ -62,11 +64,14 @@ static int usage_lf_pyramid_sim(void) {
return PM3_SUCCESS; return PM3_SUCCESS;
} }
//by marshmellow
//Pyramid Prox demod - FSK RF/50 with preamble of 0000000000000001 (always a 128 bit data stream)
//print full Farpointe Data/Pyramid Prox ID and some bit format details if found
static int CmdPyramidDemod(const char *Cmd) { static int CmdPyramidDemod(const char *Cmd) {
(void)Cmd; // Cmd is not used so far (void)Cmd; // Cmd is not used so far
return demodPyramid();
}
//Pyramid Prox demod - FSK RF/50 with preamble of 0000000000000001 (always a 128 bit data stream)
//print full Farpointe Data/Pyramid Prox ID and some bit format details if found
int demodPyramid(void) {
//raw fsk demod no manchester decoding no start bit finding just get binary from wave //raw fsk demod no manchester decoding no start bit finding just get binary from wave
uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0}; uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0};
size_t size = getFromGraphBuf(bits); size_t size = getFromGraphBuf(bits);
@ -350,11 +355,6 @@ int getPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
return PM3_SUCCESS; return PM3_SUCCESS;
} }
int demodPyramid(void) {
return CmdPyramidDemod("");
}
// by marshmellow
// FSK Demod then try to locate a Farpointe Data (pyramid) ID // FSK Demod then try to locate a Farpointe Data (pyramid) ID
int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx) { int detectPyramid(uint8_t *dest, size_t *size, int *waveStartIdx) {
//make sure buffer has data //make sure buffer has data

12
client/src/cmdlfsecurakey.c
View file

@ -34,13 +34,17 @@ static int usage_lf_securakey_clone(void) {
PrintAndLogEx(NORMAL, " b <raw hex> : raw hex data. 12 bytes max"); PrintAndLogEx(NORMAL, " b <raw hex> : raw hex data. 12 bytes max");
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(NORMAL, "Examples:"); PrintAndLogEx(NORMAL, "Examples:");
PrintAndLogEx(NORMAL, " lf securakey clone 7FCB400001ADEA5344300000"); PrintAndLogEx(NORMAL, _YELLOW_(" lf securakey clone b 7FCB400001ADEA5344300000"));
return PM3_SUCCESS; return PM3_SUCCESS;
} }
//see ASKDemod for what args are accepted
static int CmdSecurakeyDemod(const char *Cmd) { static int CmdSecurakeyDemod(const char *Cmd) {
(void)Cmd; // Cmd is not used so far (void)Cmd; // Cmd is not used so far
return demodSecurakey();
}
//see ASKDemod for what args are accepted
int demodSecurakey(void) {
//ASK / Manchester //ASK / Manchester
bool st = false; bool st = false;
@ -212,7 +216,3 @@ int detectSecurakey(uint8_t *dest, size_t *size) {
return (int)startIdx; return (int)startIdx;
} }
int demodSecurakey(void) {
return CmdSecurakeyDemod("");
}