rfidrig/ChameleonMini
0
0
Fork 0
mirror of https://github.com/RfidResearchGroup/ChameleonMini.git synced 2026-05-12 11:20:37 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24 from nieldk/proxgrind

Browse Source 
L- and R- button long press options added
This commit is contained in:
Iceman
2020-05-20 18:39:56 +02:00
committed by GitHub
parent ba1c451e10 2192178dd4
commit 7c8f7dd08f
3 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/Chameleon-Mini/Button.h
+1 -1
View File
@@ -11,7 +11,7 @@
#include "Common.h"
typedef enum {
BUTTON_R_PRESS_SHORT = 0,
BUTTON_R_PRESS_SHORT =0,
BUTTON_R_PRESS_LONG,
BUTTON_L_PRESS_SHORT,
BUTTON_L_PRESS_LONG,
Firmware/Chameleon-Mini/Makefile
+23 -19
View File
@@ -15,22 +15,22 @@ SETTINGS += -DCONFIG_MF_CLASSIC_1K_7B_SUPPORT
SETTINGS += -DCONFIG_MF_CLASSIC_4K_SUPPORT
SETTINGS += -DCONFIG_MF_CLASSIC_4K_7B_SUPPORT
SETTINGS += -DCONFIG_MF_ULTRALIGHT_SUPPORT
SETTINGS += -DCONFIG_ISO14443A_SNIFF_SUPPORT
SETTINGS += -DCONFIG_ISO14443A_READER_SUPPORT
SETTINGS += -DCONFIG_VICINITY_SUPPORT
SETTINGS += -DCONFIG_SL2S2002_SUPPORT
SETTINGS += -DCONFIG_TITAGITSTANDARD_SUPPORT
SETTINGS += -DCONFIG_ISO15693_SNIFF_SUPPORT
SETTINGS += -DCONFIG_EM4233_SUPPORT
SETTINGS += -DCONFIG_ISO14443A_SNIFF_SUPPORT
SETTINGS += -DCONFIG_ISO14443A_READER_SUPPORT
SETTINGS += -DCONFIG_VICINITY_SUPPORT
SETTINGS += -DCONFIG_SL2S2002_SUPPORT
SETTINGS += -DCONFIG_TITAGITSTANDARD_SUPPORT
SETTINGS += -DCONFIG_ISO15693_SNIFF_SUPPORT
SETTINGS += -DCONFIG_EM4233_SUPPORT
#Support magic mode on mifare classic configuration
SETTINGS += -DSUPPORT_MF_CLASSIC_MAGIC_MODE
SETTINGS += -DSUPPORT_MF_CLASSIC_MAGIC_MODE
#Don't touch manufacturer byte with BUTTON_ACTION_UID_LEFT_(DE/IN)CREMENT
SETTINGS += -DSUPPORT_UID7_FIX_MANUFACTURER_BYTE
SETTINGS += -DSUPPORT_UID7_FIX_MANUFACTURER_BYTE
#Support activating firmware upgrade mode through command-line
SETTINGS += -DSUPPORT_FIRMWARE_UPGRADE
SETTINGS += -DSUPPORT_FIRMWARE_UPGRADE
#Default configuration
#SETTINGS += -DDEFAULT_CONFIGURATION=CONFIG_MF_CLASSIC_MINI_4B
@@ -46,13 +46,17 @@ SETTINGS += -DDEFAULT_CONFIGURATION=CONFIG_MF_CLASSIC_1K
#SETTINGS += -DDEFAULT_RBUTTON_ACTION=BUTTON_ACTION_UID_RIGHT_INCREMENT
#SETTINGS += -DDEFAULT_RBUTTON_ACTION=BUTTON_ACTION_UID_LEFT_DECREMENT
#SETTINGS += -DDEFAULT_RBUTTON_ACTION=BUTTON_ACTION_UID_RIGHT_DECREMENT
SETTINGS += -DDEFAULT_RBUTTON_ACTION=BUTTON_ACTION_CYCLE_SETTINGS
SETTINGS += -DDEFAULT_RBUTTON_ACTION=BUTTON_ACTION_CYCLE_SETTINGS
#SETTINGS += -DDEFAULT_RBUTTON_ACTION=BUTTON_ACTION_STORE_MEM
SETTINGS += -DDEFAULT_LBUTTON_ACTION=BUTTON_ACTION_CYCLE_SETTINGS_DEC
#SETTINGS += -DDEFAULT_LBUTTON_ACTION=BUTTON_ACTION_RECALL_MEM
SETTINGS += -DDEFAULT_LBUTTON_ACTION_LONG=BUTTON_ACTION_CLONE
SETTINGS += -DDEFAULT_RBUTTON_ACTION_LONG=BUTTON_ACTION_CLONE
#Define if button action setting should be independent of active setting
SETTINGS += -DBUTTON_SETTING_GLOBAL
SETTINGS += -DBUTTON_SETTING_GLOBAL
#Default LED functions
#SETTINGS += -DDEFAULT_RED_LED_ACTION=LED_SETTING_CHANGE
@@ -61,27 +65,27 @@ SETTINGS += -DDEFAULT_RED_LED_ACTION=LED_POWERED
SETTINGS += -DDEFAULT_GREEN_LED_ACTION=LED_SETTING_CHANGE
#Define if LED function setting should be independent of active setting
SETTINGS += -DLED_SETTING_GLOBAL
SETTINGS += -DLED_SETTING_GLOBAL
#Default logging mode
SETTINGS += -DDEFAULT_LOG_MODE=LOG_MODE_OFF
SETTINGS += -DDEFAULT_LOG_MODE=LOG_MODE_OFF
#SETTINGS += -DDEFAULT_LOG_MODE=LOG_MODE_MEMORY
#SETTINGS += -DDEFAULT_LOG_MODE=LOG_MODE_TERMINAL
#Define if log settings should be global
SETTINGS += -DLOG_SETTING_GLOBAL
SETTINGS += -DLOG_SETTING_GLOBAL
#Default setting
SETTINGS += -DDEFAULT_SETTING=SETTINGS_FIRST
SETTINGS += -DDEFAULT_SETTING=SETTINGS_FIRST
#Default pending task timeout
SETTINGS += -DDEFAULT_PENDING_TASK_TIMEOUT=50 #* 100ms
SETTINGS += -DDEFAULT_PENDING_TASK_TIMEOUT=50 #* 100ms
#Default reader threshold
SETTINGS += -DDEFAULT_READER_THRESHOLD=400
SETTINGS += -DDEFAULT_READER_THRESHOLD=400
#Use EEPROM to store settings
SETTINGS += -DENABLE_EEPROM_SETTINGS
SETTINGS += -DENABLE_EEPROM_SETTINGS
#Memory definitions and objcopy flags to include sections in binaries
FLASH_DATA_ADDR = 0x10000 #Start of data section in flash
Firmware/Chameleon-Mini/Settings.c
+7 -5
View File
@@ -28,8 +28,10 @@ SettingsType EEMEM StoredSettings = {
[0 ...(SETTINGS_COUNT - 1)] = {
.Configuration = DEFAULT_CONFIGURATION,
.ButtonActions = {
[BUTTON_L_PRESS_SHORT] = DEFAULT_LBUTTON_ACTION, [BUTTON_R_PRESS_SHORT] = DEFAULT_RBUTTON_ACTION,
[BUTTON_L_PRESS_LONG] = DEFAULT_LBUTTON_ACTION, [BUTTON_R_PRESS_LONG] = DEFAULT_RBUTTON_ACTION
[BUTTON_L_PRESS_SHORT] = DEFAULT_LBUTTON_ACTION, [BUTTON_L_PRESS_SHORT] = DEFAULT_LBUTTON_ACTION,
[BUTTON_L_PRESS_LONG] = DEFAULT_LBUTTON_ACTION_LONG, [BUTTON_L_PRESS_LONG] = DEFAULT_LBUTTON_ACTION_LONG,
[BUTTON_R_PRESS_SHORT] = DEFAULT_RBUTTON_ACTION, [BUTTON_R_PRESS_SHORT] = DEFAULT_RBUTTON_ACTION,
[BUTTON_R_PRESS_LONG] = DEFAULT_RBUTTON_ACTION_LONG, [BUTTON_R_PRESS_LONG] = DEFAULT_RBUTTON_ACTION_LONG
},
.LogMode = DEFAULT_LOG_MODE,
.LEDRedFunction = DEFAULT_RED_LED_ACTION,
@@ -44,7 +46,7 @@ SettingsType EEMEM StoredSettings = {
.Configuration = CONFIG_ISO14443A_READER,
.ButtonActions = {
[BUTTON_L_PRESS_SHORT] = DEFAULT_LBUTTON_ACTION, [BUTTON_R_PRESS_SHORT] = DEFAULT_RBUTTON_ACTION,
[BUTTON_L_PRESS_LONG] = DEFAULT_LBUTTON_ACTION, [BUTTON_R_PRESS_LONG] = DEFAULT_RBUTTON_ACTION
[BUTTON_L_PRESS_LONG] = DEFAULT_LBUTTON_ACTION_LONG, [BUTTON_R_PRESS_LONG] = DEFAULT_RBUTTON_ACTION_LONG
},
.LogMode = DEFAULT_LOG_MODE,
.LEDRedFunction = DEFAULT_RED_LED_ACTION,
@@ -67,8 +69,8 @@ void SettingsLoad(void) {
GlobalSettings.Settings[i].Configuration = CONFIG_NONE;
GlobalSettings.Settings[i].ButtonActions[BUTTON_L_PRESS_SHORT] = DEFAULT_LBUTTON_ACTION;
GlobalSettings.Settings[i].ButtonActions[BUTTON_R_PRESS_SHORT] = DEFAULT_RBUTTON_ACTION;
GlobalSettings.Settings[i].ButtonActions[BUTTON_L_PRESS_LONG] = DEFAULT_LBUTTON_ACTION;
GlobalSettings.Settings[i].ButtonActions[BUTTON_R_PRESS_LONG] = DEFAULT_RBUTTON_ACTION;
GlobalSettings.Settings[i].ButtonActions[BUTTON_L_PRESS_LONG] = DEFAULT_LBUTTON_ACTION_LONG;
GlobalSettings.Settings[i].ButtonActions[BUTTON_R_PRESS_LONG] = DEFAULT_RBUTTON_ACTION_LONG;
GlobalSettings.Settings[i].LogMode = DEFAULT_LOG_MODE;
GlobalSettings.Settings[i].LEDRedFunction = DEFAULT_RED_LED_ACTION;
GlobalSettings.Settings[i].LEDGreenFunction = DEFAULT_GREEN_LED_ACTION;