Skip to content

Commit

Permalink
Merge pull request #252 from merlokk/style
Browse files Browse the repository at this point in the history
make style
  • Loading branch information
merlokk authored Jul 16, 2019
2 parents ed4289d + bd8824a commit cd307cc
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions armsrc/Standalone/hf_colin.c
Original file line number Diff line number Diff line change
Expand Up @@ -792,13 +792,13 @@ void RunMod() {
flags = FLAG_4B_UID_IN_DATA;
break;
default:
flags = FLAG_UID_IN_EMUL;
break;
flags = FLAG_UID_IN_EMUL;
break;
}

// Use UID, SAK, ATQA from EMUL, if uid not defined
//if ((flags & (FLAG_4B_UID_IN_DATA | FLAG_7B_UID_IN_DATA | FLAG_10B_UID_IN_DATA)) == 0) {
flags |= FLAG_UID_IN_EMUL;
flags |= FLAG_UID_IN_EMUL;
//}
Mifare1ksim(flags | FLAG_MF_1K, 0, cjuid);
LED_C_OFF();
Expand Down
4 changes: 2 additions & 2 deletions client/scripts/read_pwd_mem.lua
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ local function main(args)
if o == 'o' then offset = tonumber(a) end

-- num of bytes to read
if o == 'l' then
length = tonumber(a)
if o == 'l' then
length = tonumber(a)
if length < 0 or length > 256 then
return oops('Error: Length is not valid. Must be less than 256')
end
Expand Down
2 changes: 1 addition & 1 deletion include/pmflash.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,4 @@ typedef struct {
}
#endif

#endif // __PMFLASH_H
#endif // __PMFLASH_H

0 comments on commit cd307cc

Please sign in to comment.