Merge branch 'RfidResearchGroup:master' into master

This commit is contained in:
bthedorff authored and GitHub committed 2022-01-17 17:45:23 -05:00
commit 661cebf6ea
2 files changed
+17 -2

No files matched your search

+15
View File
@@ -1475,3 +1475,18 @@ D3F3B958B8A3
2196FAD8115B
7C469FE86855
CE99FBC8BD26
# keys from Eurothermes group (Switzerland)
d66d91829013
75b691829013
83e391829013
a23c91829013
e46a91829013
d9e091829013
fed791829013
155f91829013
06cc91829013
8ddc91829013
54af91829013
29a791829013
668091829013
00008627c10a
+2 -2
View File
@@ -37,6 +37,8 @@
#include "flash.h"
#include "preferences.h"
static int mainret = PM3_ESOFT;
#ifndef LIBPM3
#define BANNERMSG1 ""
#define BANNERMSG2 " [ Iceman :snowflake: ]"
@@ -44,8 +46,6 @@
typedef enum LogoMode { UTF8, ANSI, ASCII } LogoMode;
static int mainret = PM3_ESOFT;
static void showBanner_logo(LogoMode mode) {
switch (mode) {
case UTF8: {