new iButton app (#328)
* rename old ibutton app to ibutton-test
* more renames
* updated onewire library compilation condition
* add submenu_clean subroutine
* add index for submenu callback
* c++ guard for gui modules
* add released ibutton app
* fix the position of the submenu window if there are too few items
* iButton app basis
* negative icon position info
* fix submenu_clean subroutine
* add ibutton app to applications makefile
* add onewire key read routine to read mode
* rename mode to scene
* rename files and folder (mode to scene)
* rename ibutton view to view manager
* rename get_view to get_view_manager
* cpp guards
* key read, store and notify features
* syntax fix
* make iButtonScene functions pure virtual
* fix syntax
* add text store, add new scene (crc error)
* not a key scene
* syntax fix
* read success scene
* app, switching to the previous scene with the number of scenes to be skipped
* scene whith menu when key is readed
* fix font height calculation, fix offsets
* add key write scene
* view_dispatcher_remove_view subroutine
* generic pause/resume os methods
* fix furi_assert usage
* key store, worker
* fix pointer comparsion
* saved keys, saved key action scenes
* key delete/confirm delete scenes and routines
* use last input subsystem changes
* fix syntax
* fix new model usage in submenu
* fix includes
* use vibro pin
* use stored key name if valid
* emulate scene
* random name generator
* name and save readed key scenes, new icon
* fix icon position
* fix text scene exit
* fix naming, fix text placement, new info scene
* state-driven cyfral decoder
* better cyfral decoder
* better cyfral decoder
* one wire: search command set
* metakom decoder
* more key types
* add next scene to error scenes
* universal key reader
* use new key reader
* syntax fix
* warning fix
* byte input module template
* new thread and insomnia api usage
* New element: slightly rounded frame
* Use elements_slightly_rounded_frame in text input
* Gui test app: byte input usage
* Byte input module: data drawing and selection
* Byte input: comment currently unused fns
* remove volatile qualifier
* base byte input realisation
* App gui test: remove internal fns visibility
* Byne input, final version
* test install gcc-arm-none-eabi-10-2020-q4-major
* test install gcc-arm-none-eabi-10-2020-q4-major
* App iButton: byte input view managment
* App iButton: add key manually scenes
* App iButton: rename scenes, add popup timeout
* App iButton: use new scenes, new fn for rollback to specific prevous scene.
* App iButton: remove byte input view on app exit
* App iButton: edit key scene
* Module byte input: reduce swintch value to uint8_t
* Module byte input: switch from switch-case to if, unfortunately we need compile-time constants to use with switch
* Icons: new small arrows
* Module byte input: new arrangement of elements
* OneWire slave lib: fix deattach sequence
* App iButton: pulse sequencer
* App iButton: add more keys to store
* App iButton: split key worker to separate read/write/emulate entitys
* App iButton: use new read/emulate entities
* fix callback pointer saving
* App iButton: use KeyReader error enum instead of KeyWorker error list handling
* App iButton: do not use insomnia fns in pulse sequencer
* App iButton: use KeyReader error enum in read scene
* OneWire slave lib: more READ ROM command variants, call callback only if positive result
* GPIO resources: add external gpio
* App SD/NFC: removed application
* App iButton-test: update to new light api
* App iButton: update to new light-api
* Outdated apps: add api-light-usage
* Gpio: update SD card CS pin settings
* API-power: added fns to disable/enable external 3v3 dc-dc
* API-gpio: separated SD card detect routines
* Resources: removed sd cs pin
* SD card: low level init now resets card power supply
* App SD-filesystem: use new card detect fns
* SD card: fix low level init headers
* SD card: more realilable low level init, power reset, exit from command read cycle conditionally
* App SD-filesystem: led notifiers, init cycling
* SD card: backport to F4
* Api PWM: add c++ guards
* App iButton: yellow blink in emulate scene, vibro on
* App iButton: one wire keys command set
* App iButton: successful write scene
* App iButton: key writer
* App iButton: syntax fix
* App iButton: notify write success
* App iButton: fix double scene change
* SD card: handle eject in init sequence
* SD card: api to set level on detect gpio
* SPI: api to set state on bus pins
* SD card: set low state on bus pins while power reset
* File select: init
* File select: fix input consuming
* SD Card: fixed dir open api error
* SD-card: replace strncpy by strlcpy. Fix buffer overflow error.
* API HAL OS: replace CMP based ticks with ARR based one, hard reset lptimer on reconfiguration.
* GUI: More stack size for (temporary, wee need to implement sd card api in separate thread)
* GUI: File select module.
* App iButton-test: remove obsolete app
Co-authored-by: rusdacent <rusdacentx0x08@gmail.com>
Co-authored-by: coreglitch <mail@s3f.ru>
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2021-03-12 15:45:18 +03:00
|
|
|
#include "key-reader.h"
|
|
|
|
#include "key-commands.h"
|
|
|
|
#include <callback-connector.h>
|
|
|
|
#include <maxim_crc.h>
|
|
|
|
|
|
|
|
extern COMP_HandleTypeDef hcomp1;
|
|
|
|
|
|
|
|
KeyReader::Error KeyReader::read(iButtonKey* key) {
|
|
|
|
uint8_t tmp_key_data[8] = {0, 0, 0, 0, 0, 0, 0, 0};
|
|
|
|
iButtonKeyType key_type;
|
|
|
|
|
|
|
|
KeyReader::Error result = KeyReader::Error::EMPTY;
|
|
|
|
|
|
|
|
if(read_key(&key_type, tmp_key_data, 8)) {
|
|
|
|
switch(key_type) {
|
|
|
|
case iButtonKeyType::KeyDallas:
|
|
|
|
if(verify_key(key_type, tmp_key_data, 8)) {
|
|
|
|
if(maxim_crc8(tmp_key_data, 8) == 0) {
|
|
|
|
if(tmp_key_data[0] == 0x01) {
|
|
|
|
result = KeyReader::Error::OK;
|
|
|
|
} else {
|
|
|
|
result = KeyReader::Error::NOT_ARE_KEY;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
result = KeyReader::Error::CRC_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
case iButtonKeyType::KeyCyfral:
|
|
|
|
result = KeyReader::Error::OK;
|
|
|
|
break;
|
|
|
|
case iButtonKeyType::KeyMetakom:
|
|
|
|
result = KeyReader::Error::OK;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(result != KeyReader::Error::EMPTY) {
|
|
|
|
key->set_type(key_type);
|
|
|
|
key->set_data(tmp_key_data, 8);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
switch_mode_if_needed();
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
KeyReader::KeyReader(OneWireMaster* _onewire_master) {
|
|
|
|
onewire_master = _onewire_master;
|
|
|
|
read_mode_switch_time = 0;
|
|
|
|
read_mode = ReadMode::DALLAS;
|
|
|
|
}
|
|
|
|
|
|
|
|
KeyReader::~KeyReader() {
|
|
|
|
stop();
|
|
|
|
}
|
|
|
|
|
|
|
|
bool KeyReader::read_key(iButtonKeyType* key_type, uint8_t* data, uint8_t data_size) {
|
|
|
|
bool readed = false;
|
|
|
|
|
|
|
|
switch(read_mode) {
|
|
|
|
case ReadMode::DALLAS:
|
|
|
|
if(onewire_master->search(data)) {
|
|
|
|
onewire_master->reset_search();
|
|
|
|
readed = true;
|
|
|
|
*key_type = iButtonKeyType::KeyDallas;
|
|
|
|
} else {
|
|
|
|
onewire_master->reset_search();
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ReadMode::CYFRAL_METAKOM:
|
|
|
|
if(cyfral_decoder.read(data, 2)) {
|
|
|
|
readed = true;
|
|
|
|
*key_type = iButtonKeyType::KeyCyfral;
|
|
|
|
} else if(metakom_decoder.read(data, 4)) {
|
|
|
|
readed = true;
|
|
|
|
*key_type = iButtonKeyType::KeyMetakom;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return readed;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool KeyReader::verify_key(iButtonKeyType key_type, const uint8_t* const data, uint8_t data_size) {
|
|
|
|
bool result = true;
|
|
|
|
|
|
|
|
switch(key_type) {
|
|
|
|
case iButtonKeyType::KeyDallas:
|
|
|
|
switch_to(ReadMode::DALLAS);
|
|
|
|
|
|
|
|
if(onewire_master->reset()) {
|
|
|
|
onewire_master->write(DS1990::CMD_READ_ROM);
|
|
|
|
for(uint8_t i = 0; i < data_size; i++) {
|
|
|
|
if(onewire_master->read() != data[i]) {
|
|
|
|
result = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
result = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
result = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
void KeyReader::start_comaparator(void) {
|
|
|
|
// pulldown lf-rfid pins to prevent interference
|
|
|
|
// TODO open record
|
|
|
|
GpioPin rfid_pull_pin = {.port = RFID_PULL_GPIO_Port, .pin = RFID_PULL_Pin};
|
2021-04-29 11:51:48 +03:00
|
|
|
hal_gpio_init(&rfid_pull_pin, GpioModeOutputOpenDrain, GpioPullNo, GpioSpeedLow);
|
|
|
|
hal_gpio_write(&rfid_pull_pin, false);
|
new iButton app (#328)
* rename old ibutton app to ibutton-test
* more renames
* updated onewire library compilation condition
* add submenu_clean subroutine
* add index for submenu callback
* c++ guard for gui modules
* add released ibutton app
* fix the position of the submenu window if there are too few items
* iButton app basis
* negative icon position info
* fix submenu_clean subroutine
* add ibutton app to applications makefile
* add onewire key read routine to read mode
* rename mode to scene
* rename files and folder (mode to scene)
* rename ibutton view to view manager
* rename get_view to get_view_manager
* cpp guards
* key read, store and notify features
* syntax fix
* make iButtonScene functions pure virtual
* fix syntax
* add text store, add new scene (crc error)
* not a key scene
* syntax fix
* read success scene
* app, switching to the previous scene with the number of scenes to be skipped
* scene whith menu when key is readed
* fix font height calculation, fix offsets
* add key write scene
* view_dispatcher_remove_view subroutine
* generic pause/resume os methods
* fix furi_assert usage
* key store, worker
* fix pointer comparsion
* saved keys, saved key action scenes
* key delete/confirm delete scenes and routines
* use last input subsystem changes
* fix syntax
* fix new model usage in submenu
* fix includes
* use vibro pin
* use stored key name if valid
* emulate scene
* random name generator
* name and save readed key scenes, new icon
* fix icon position
* fix text scene exit
* fix naming, fix text placement, new info scene
* state-driven cyfral decoder
* better cyfral decoder
* better cyfral decoder
* one wire: search command set
* metakom decoder
* more key types
* add next scene to error scenes
* universal key reader
* use new key reader
* syntax fix
* warning fix
* byte input module template
* new thread and insomnia api usage
* New element: slightly rounded frame
* Use elements_slightly_rounded_frame in text input
* Gui test app: byte input usage
* Byte input module: data drawing and selection
* Byte input: comment currently unused fns
* remove volatile qualifier
* base byte input realisation
* App gui test: remove internal fns visibility
* Byne input, final version
* test install gcc-arm-none-eabi-10-2020-q4-major
* test install gcc-arm-none-eabi-10-2020-q4-major
* App iButton: byte input view managment
* App iButton: add key manually scenes
* App iButton: rename scenes, add popup timeout
* App iButton: use new scenes, new fn for rollback to specific prevous scene.
* App iButton: remove byte input view on app exit
* App iButton: edit key scene
* Module byte input: reduce swintch value to uint8_t
* Module byte input: switch from switch-case to if, unfortunately we need compile-time constants to use with switch
* Icons: new small arrows
* Module byte input: new arrangement of elements
* OneWire slave lib: fix deattach sequence
* App iButton: pulse sequencer
* App iButton: add more keys to store
* App iButton: split key worker to separate read/write/emulate entitys
* App iButton: use new read/emulate entities
* fix callback pointer saving
* App iButton: use KeyReader error enum instead of KeyWorker error list handling
* App iButton: do not use insomnia fns in pulse sequencer
* App iButton: use KeyReader error enum in read scene
* OneWire slave lib: more READ ROM command variants, call callback only if positive result
* GPIO resources: add external gpio
* App SD/NFC: removed application
* App iButton-test: update to new light api
* App iButton: update to new light-api
* Outdated apps: add api-light-usage
* Gpio: update SD card CS pin settings
* API-power: added fns to disable/enable external 3v3 dc-dc
* API-gpio: separated SD card detect routines
* Resources: removed sd cs pin
* SD card: low level init now resets card power supply
* App SD-filesystem: use new card detect fns
* SD card: fix low level init headers
* SD card: more realilable low level init, power reset, exit from command read cycle conditionally
* App SD-filesystem: led notifiers, init cycling
* SD card: backport to F4
* Api PWM: add c++ guards
* App iButton: yellow blink in emulate scene, vibro on
* App iButton: one wire keys command set
* App iButton: successful write scene
* App iButton: key writer
* App iButton: syntax fix
* App iButton: notify write success
* App iButton: fix double scene change
* SD card: handle eject in init sequence
* SD card: api to set level on detect gpio
* SPI: api to set state on bus pins
* SD card: set low state on bus pins while power reset
* File select: init
* File select: fix input consuming
* SD Card: fixed dir open api error
* SD-card: replace strncpy by strlcpy. Fix buffer overflow error.
* API HAL OS: replace CMP based ticks with ARR based one, hard reset lptimer on reconfiguration.
* GUI: More stack size for (temporary, wee need to implement sd card api in separate thread)
* GUI: File select module.
* App iButton-test: remove obsolete app
Co-authored-by: rusdacent <rusdacentx0x08@gmail.com>
Co-authored-by: coreglitch <mail@s3f.ru>
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2021-03-12 15:45:18 +03:00
|
|
|
|
|
|
|
// TODO open record
|
|
|
|
GpioPin rfid_out_pin = {.port = RFID_OUT_GPIO_Port, .pin = RFID_OUT_Pin};
|
2021-04-29 11:51:48 +03:00
|
|
|
hal_gpio_init(&rfid_out_pin, GpioModeOutputOpenDrain, GpioPullNo, GpioSpeedLow);
|
|
|
|
hal_gpio_write(&rfid_out_pin, false);
|
new iButton app (#328)
* rename old ibutton app to ibutton-test
* more renames
* updated onewire library compilation condition
* add submenu_clean subroutine
* add index for submenu callback
* c++ guard for gui modules
* add released ibutton app
* fix the position of the submenu window if there are too few items
* iButton app basis
* negative icon position info
* fix submenu_clean subroutine
* add ibutton app to applications makefile
* add onewire key read routine to read mode
* rename mode to scene
* rename files and folder (mode to scene)
* rename ibutton view to view manager
* rename get_view to get_view_manager
* cpp guards
* key read, store and notify features
* syntax fix
* make iButtonScene functions pure virtual
* fix syntax
* add text store, add new scene (crc error)
* not a key scene
* syntax fix
* read success scene
* app, switching to the previous scene with the number of scenes to be skipped
* scene whith menu when key is readed
* fix font height calculation, fix offsets
* add key write scene
* view_dispatcher_remove_view subroutine
* generic pause/resume os methods
* fix furi_assert usage
* key store, worker
* fix pointer comparsion
* saved keys, saved key action scenes
* key delete/confirm delete scenes and routines
* use last input subsystem changes
* fix syntax
* fix new model usage in submenu
* fix includes
* use vibro pin
* use stored key name if valid
* emulate scene
* random name generator
* name and save readed key scenes, new icon
* fix icon position
* fix text scene exit
* fix naming, fix text placement, new info scene
* state-driven cyfral decoder
* better cyfral decoder
* better cyfral decoder
* one wire: search command set
* metakom decoder
* more key types
* add next scene to error scenes
* universal key reader
* use new key reader
* syntax fix
* warning fix
* byte input module template
* new thread and insomnia api usage
* New element: slightly rounded frame
* Use elements_slightly_rounded_frame in text input
* Gui test app: byte input usage
* Byte input module: data drawing and selection
* Byte input: comment currently unused fns
* remove volatile qualifier
* base byte input realisation
* App gui test: remove internal fns visibility
* Byne input, final version
* test install gcc-arm-none-eabi-10-2020-q4-major
* test install gcc-arm-none-eabi-10-2020-q4-major
* App iButton: byte input view managment
* App iButton: add key manually scenes
* App iButton: rename scenes, add popup timeout
* App iButton: use new scenes, new fn for rollback to specific prevous scene.
* App iButton: remove byte input view on app exit
* App iButton: edit key scene
* Module byte input: reduce swintch value to uint8_t
* Module byte input: switch from switch-case to if, unfortunately we need compile-time constants to use with switch
* Icons: new small arrows
* Module byte input: new arrangement of elements
* OneWire slave lib: fix deattach sequence
* App iButton: pulse sequencer
* App iButton: add more keys to store
* App iButton: split key worker to separate read/write/emulate entitys
* App iButton: use new read/emulate entities
* fix callback pointer saving
* App iButton: use KeyReader error enum instead of KeyWorker error list handling
* App iButton: do not use insomnia fns in pulse sequencer
* App iButton: use KeyReader error enum in read scene
* OneWire slave lib: more READ ROM command variants, call callback only if positive result
* GPIO resources: add external gpio
* App SD/NFC: removed application
* App iButton-test: update to new light api
* App iButton: update to new light-api
* Outdated apps: add api-light-usage
* Gpio: update SD card CS pin settings
* API-power: added fns to disable/enable external 3v3 dc-dc
* API-gpio: separated SD card detect routines
* Resources: removed sd cs pin
* SD card: low level init now resets card power supply
* App SD-filesystem: use new card detect fns
* SD card: fix low level init headers
* SD card: more realilable low level init, power reset, exit from command read cycle conditionally
* App SD-filesystem: led notifiers, init cycling
* SD card: backport to F4
* Api PWM: add c++ guards
* App iButton: yellow blink in emulate scene, vibro on
* App iButton: one wire keys command set
* App iButton: successful write scene
* App iButton: key writer
* App iButton: syntax fix
* App iButton: notify write success
* App iButton: fix double scene change
* SD card: handle eject in init sequence
* SD card: api to set level on detect gpio
* SPI: api to set state on bus pins
* SD card: set low state on bus pins while power reset
* File select: init
* File select: fix input consuming
* SD Card: fixed dir open api error
* SD-card: replace strncpy by strlcpy. Fix buffer overflow error.
* API HAL OS: replace CMP based ticks with ARR based one, hard reset lptimer on reconfiguration.
* GUI: More stack size for (temporary, wee need to implement sd card api in separate thread)
* GUI: File select module.
* App iButton-test: remove obsolete app
Co-authored-by: rusdacent <rusdacentx0x08@gmail.com>
Co-authored-by: coreglitch <mail@s3f.ru>
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2021-03-12 15:45:18 +03:00
|
|
|
|
|
|
|
comparator_callback_pointer =
|
|
|
|
cbc::obtain_connector(this, &KeyReader::comparator_trigger_callback);
|
|
|
|
api_interrupt_add(comparator_callback_pointer, InterruptTypeComparatorTrigger, this);
|
|
|
|
last_dwt_value = DWT->CYCCNT;
|
|
|
|
HAL_COMP_Start(&hcomp1);
|
|
|
|
}
|
|
|
|
|
|
|
|
void KeyReader::stop_comaparator(void) {
|
|
|
|
HAL_COMP_Stop(&hcomp1);
|
|
|
|
api_interrupt_remove(comparator_callback_pointer, InterruptTypeComparatorTrigger);
|
|
|
|
}
|
|
|
|
|
|
|
|
void KeyReader::comparator_trigger_callback(void* hcomp, void* comp_ctx) {
|
|
|
|
KeyReader* _this = static_cast<KeyReader*>(comp_ctx);
|
|
|
|
|
|
|
|
if(hcomp == &hcomp1) {
|
2021-04-29 11:51:48 +03:00
|
|
|
_this->cyfral_decoder.process_front(
|
|
|
|
hal_gpio_get_rfid_in_level(), DWT->CYCCNT - last_dwt_value);
|
new iButton app (#328)
* rename old ibutton app to ibutton-test
* more renames
* updated onewire library compilation condition
* add submenu_clean subroutine
* add index for submenu callback
* c++ guard for gui modules
* add released ibutton app
* fix the position of the submenu window if there are too few items
* iButton app basis
* negative icon position info
* fix submenu_clean subroutine
* add ibutton app to applications makefile
* add onewire key read routine to read mode
* rename mode to scene
* rename files and folder (mode to scene)
* rename ibutton view to view manager
* rename get_view to get_view_manager
* cpp guards
* key read, store and notify features
* syntax fix
* make iButtonScene functions pure virtual
* fix syntax
* add text store, add new scene (crc error)
* not a key scene
* syntax fix
* read success scene
* app, switching to the previous scene with the number of scenes to be skipped
* scene whith menu when key is readed
* fix font height calculation, fix offsets
* add key write scene
* view_dispatcher_remove_view subroutine
* generic pause/resume os methods
* fix furi_assert usage
* key store, worker
* fix pointer comparsion
* saved keys, saved key action scenes
* key delete/confirm delete scenes and routines
* use last input subsystem changes
* fix syntax
* fix new model usage in submenu
* fix includes
* use vibro pin
* use stored key name if valid
* emulate scene
* random name generator
* name and save readed key scenes, new icon
* fix icon position
* fix text scene exit
* fix naming, fix text placement, new info scene
* state-driven cyfral decoder
* better cyfral decoder
* better cyfral decoder
* one wire: search command set
* metakom decoder
* more key types
* add next scene to error scenes
* universal key reader
* use new key reader
* syntax fix
* warning fix
* byte input module template
* new thread and insomnia api usage
* New element: slightly rounded frame
* Use elements_slightly_rounded_frame in text input
* Gui test app: byte input usage
* Byte input module: data drawing and selection
* Byte input: comment currently unused fns
* remove volatile qualifier
* base byte input realisation
* App gui test: remove internal fns visibility
* Byne input, final version
* test install gcc-arm-none-eabi-10-2020-q4-major
* test install gcc-arm-none-eabi-10-2020-q4-major
* App iButton: byte input view managment
* App iButton: add key manually scenes
* App iButton: rename scenes, add popup timeout
* App iButton: use new scenes, new fn for rollback to specific prevous scene.
* App iButton: remove byte input view on app exit
* App iButton: edit key scene
* Module byte input: reduce swintch value to uint8_t
* Module byte input: switch from switch-case to if, unfortunately we need compile-time constants to use with switch
* Icons: new small arrows
* Module byte input: new arrangement of elements
* OneWire slave lib: fix deattach sequence
* App iButton: pulse sequencer
* App iButton: add more keys to store
* App iButton: split key worker to separate read/write/emulate entitys
* App iButton: use new read/emulate entities
* fix callback pointer saving
* App iButton: use KeyReader error enum instead of KeyWorker error list handling
* App iButton: do not use insomnia fns in pulse sequencer
* App iButton: use KeyReader error enum in read scene
* OneWire slave lib: more READ ROM command variants, call callback only if positive result
* GPIO resources: add external gpio
* App SD/NFC: removed application
* App iButton-test: update to new light api
* App iButton: update to new light-api
* Outdated apps: add api-light-usage
* Gpio: update SD card CS pin settings
* API-power: added fns to disable/enable external 3v3 dc-dc
* API-gpio: separated SD card detect routines
* Resources: removed sd cs pin
* SD card: low level init now resets card power supply
* App SD-filesystem: use new card detect fns
* SD card: fix low level init headers
* SD card: more realilable low level init, power reset, exit from command read cycle conditionally
* App SD-filesystem: led notifiers, init cycling
* SD card: backport to F4
* Api PWM: add c++ guards
* App iButton: yellow blink in emulate scene, vibro on
* App iButton: one wire keys command set
* App iButton: successful write scene
* App iButton: key writer
* App iButton: syntax fix
* App iButton: notify write success
* App iButton: fix double scene change
* SD card: handle eject in init sequence
* SD card: api to set level on detect gpio
* SPI: api to set state on bus pins
* SD card: set low state on bus pins while power reset
* File select: init
* File select: fix input consuming
* SD Card: fixed dir open api error
* SD-card: replace strncpy by strlcpy. Fix buffer overflow error.
* API HAL OS: replace CMP based ticks with ARR based one, hard reset lptimer on reconfiguration.
* GUI: More stack size for (temporary, wee need to implement sd card api in separate thread)
* GUI: File select module.
* App iButton-test: remove obsolete app
Co-authored-by: rusdacent <rusdacentx0x08@gmail.com>
Co-authored-by: coreglitch <mail@s3f.ru>
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2021-03-12 15:45:18 +03:00
|
|
|
|
2021-04-29 11:51:48 +03:00
|
|
|
_this->metakom_decoder.process_front(
|
|
|
|
hal_gpio_get_rfid_in_level(), DWT->CYCCNT - last_dwt_value);
|
new iButton app (#328)
* rename old ibutton app to ibutton-test
* more renames
* updated onewire library compilation condition
* add submenu_clean subroutine
* add index for submenu callback
* c++ guard for gui modules
* add released ibutton app
* fix the position of the submenu window if there are too few items
* iButton app basis
* negative icon position info
* fix submenu_clean subroutine
* add ibutton app to applications makefile
* add onewire key read routine to read mode
* rename mode to scene
* rename files and folder (mode to scene)
* rename ibutton view to view manager
* rename get_view to get_view_manager
* cpp guards
* key read, store and notify features
* syntax fix
* make iButtonScene functions pure virtual
* fix syntax
* add text store, add new scene (crc error)
* not a key scene
* syntax fix
* read success scene
* app, switching to the previous scene with the number of scenes to be skipped
* scene whith menu when key is readed
* fix font height calculation, fix offsets
* add key write scene
* view_dispatcher_remove_view subroutine
* generic pause/resume os methods
* fix furi_assert usage
* key store, worker
* fix pointer comparsion
* saved keys, saved key action scenes
* key delete/confirm delete scenes and routines
* use last input subsystem changes
* fix syntax
* fix new model usage in submenu
* fix includes
* use vibro pin
* use stored key name if valid
* emulate scene
* random name generator
* name and save readed key scenes, new icon
* fix icon position
* fix text scene exit
* fix naming, fix text placement, new info scene
* state-driven cyfral decoder
* better cyfral decoder
* better cyfral decoder
* one wire: search command set
* metakom decoder
* more key types
* add next scene to error scenes
* universal key reader
* use new key reader
* syntax fix
* warning fix
* byte input module template
* new thread and insomnia api usage
* New element: slightly rounded frame
* Use elements_slightly_rounded_frame in text input
* Gui test app: byte input usage
* Byte input module: data drawing and selection
* Byte input: comment currently unused fns
* remove volatile qualifier
* base byte input realisation
* App gui test: remove internal fns visibility
* Byne input, final version
* test install gcc-arm-none-eabi-10-2020-q4-major
* test install gcc-arm-none-eabi-10-2020-q4-major
* App iButton: byte input view managment
* App iButton: add key manually scenes
* App iButton: rename scenes, add popup timeout
* App iButton: use new scenes, new fn for rollback to specific prevous scene.
* App iButton: remove byte input view on app exit
* App iButton: edit key scene
* Module byte input: reduce swintch value to uint8_t
* Module byte input: switch from switch-case to if, unfortunately we need compile-time constants to use with switch
* Icons: new small arrows
* Module byte input: new arrangement of elements
* OneWire slave lib: fix deattach sequence
* App iButton: pulse sequencer
* App iButton: add more keys to store
* App iButton: split key worker to separate read/write/emulate entitys
* App iButton: use new read/emulate entities
* fix callback pointer saving
* App iButton: use KeyReader error enum instead of KeyWorker error list handling
* App iButton: do not use insomnia fns in pulse sequencer
* App iButton: use KeyReader error enum in read scene
* OneWire slave lib: more READ ROM command variants, call callback only if positive result
* GPIO resources: add external gpio
* App SD/NFC: removed application
* App iButton-test: update to new light api
* App iButton: update to new light-api
* Outdated apps: add api-light-usage
* Gpio: update SD card CS pin settings
* API-power: added fns to disable/enable external 3v3 dc-dc
* API-gpio: separated SD card detect routines
* Resources: removed sd cs pin
* SD card: low level init now resets card power supply
* App SD-filesystem: use new card detect fns
* SD card: fix low level init headers
* SD card: more realilable low level init, power reset, exit from command read cycle conditionally
* App SD-filesystem: led notifiers, init cycling
* SD card: backport to F4
* Api PWM: add c++ guards
* App iButton: yellow blink in emulate scene, vibro on
* App iButton: one wire keys command set
* App iButton: successful write scene
* App iButton: key writer
* App iButton: syntax fix
* App iButton: notify write success
* App iButton: fix double scene change
* SD card: handle eject in init sequence
* SD card: api to set level on detect gpio
* SPI: api to set state on bus pins
* SD card: set low state on bus pins while power reset
* File select: init
* File select: fix input consuming
* SD Card: fixed dir open api error
* SD-card: replace strncpy by strlcpy. Fix buffer overflow error.
* API HAL OS: replace CMP based ticks with ARR based one, hard reset lptimer on reconfiguration.
* GUI: More stack size for (temporary, wee need to implement sd card api in separate thread)
* GUI: File select module.
* App iButton-test: remove obsolete app
Co-authored-by: rusdacent <rusdacentx0x08@gmail.com>
Co-authored-by: coreglitch <mail@s3f.ru>
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2021-03-12 15:45:18 +03:00
|
|
|
|
|
|
|
last_dwt_value = DWT->CYCCNT;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void KeyReader::switch_to(ReadMode mode) {
|
|
|
|
switch(mode) {
|
|
|
|
case ReadMode::DALLAS:
|
|
|
|
onewire_master->start();
|
|
|
|
stop_comaparator();
|
|
|
|
break;
|
|
|
|
case ReadMode::CYFRAL_METAKOM:
|
|
|
|
onewire_master->stop();
|
|
|
|
start_comaparator();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
read_mode = mode;
|
|
|
|
}
|
|
|
|
|
|
|
|
void KeyReader::switch_mode_if_needed() {
|
|
|
|
if(osKernelGetTickCount() - read_mode_switch_time > (osKernelGetTickFreq() / 5)) {
|
|
|
|
read_mode_switch_time = osKernelGetTickCount();
|
|
|
|
switch(read_mode) {
|
|
|
|
case ReadMode::DALLAS:
|
|
|
|
switch_to(ReadMode::CYFRAL_METAKOM);
|
|
|
|
break;
|
|
|
|
case ReadMode::CYFRAL_METAKOM:
|
|
|
|
switch_to(ReadMode::DALLAS);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void KeyReader::start() {
|
2021-04-24 01:23:16 +03:00
|
|
|
api_hal_power_enable_otg();
|
new iButton app (#328)
* rename old ibutton app to ibutton-test
* more renames
* updated onewire library compilation condition
* add submenu_clean subroutine
* add index for submenu callback
* c++ guard for gui modules
* add released ibutton app
* fix the position of the submenu window if there are too few items
* iButton app basis
* negative icon position info
* fix submenu_clean subroutine
* add ibutton app to applications makefile
* add onewire key read routine to read mode
* rename mode to scene
* rename files and folder (mode to scene)
* rename ibutton view to view manager
* rename get_view to get_view_manager
* cpp guards
* key read, store and notify features
* syntax fix
* make iButtonScene functions pure virtual
* fix syntax
* add text store, add new scene (crc error)
* not a key scene
* syntax fix
* read success scene
* app, switching to the previous scene with the number of scenes to be skipped
* scene whith menu when key is readed
* fix font height calculation, fix offsets
* add key write scene
* view_dispatcher_remove_view subroutine
* generic pause/resume os methods
* fix furi_assert usage
* key store, worker
* fix pointer comparsion
* saved keys, saved key action scenes
* key delete/confirm delete scenes and routines
* use last input subsystem changes
* fix syntax
* fix new model usage in submenu
* fix includes
* use vibro pin
* use stored key name if valid
* emulate scene
* random name generator
* name and save readed key scenes, new icon
* fix icon position
* fix text scene exit
* fix naming, fix text placement, new info scene
* state-driven cyfral decoder
* better cyfral decoder
* better cyfral decoder
* one wire: search command set
* metakom decoder
* more key types
* add next scene to error scenes
* universal key reader
* use new key reader
* syntax fix
* warning fix
* byte input module template
* new thread and insomnia api usage
* New element: slightly rounded frame
* Use elements_slightly_rounded_frame in text input
* Gui test app: byte input usage
* Byte input module: data drawing and selection
* Byte input: comment currently unused fns
* remove volatile qualifier
* base byte input realisation
* App gui test: remove internal fns visibility
* Byne input, final version
* test install gcc-arm-none-eabi-10-2020-q4-major
* test install gcc-arm-none-eabi-10-2020-q4-major
* App iButton: byte input view managment
* App iButton: add key manually scenes
* App iButton: rename scenes, add popup timeout
* App iButton: use new scenes, new fn for rollback to specific prevous scene.
* App iButton: remove byte input view on app exit
* App iButton: edit key scene
* Module byte input: reduce swintch value to uint8_t
* Module byte input: switch from switch-case to if, unfortunately we need compile-time constants to use with switch
* Icons: new small arrows
* Module byte input: new arrangement of elements
* OneWire slave lib: fix deattach sequence
* App iButton: pulse sequencer
* App iButton: add more keys to store
* App iButton: split key worker to separate read/write/emulate entitys
* App iButton: use new read/emulate entities
* fix callback pointer saving
* App iButton: use KeyReader error enum instead of KeyWorker error list handling
* App iButton: do not use insomnia fns in pulse sequencer
* App iButton: use KeyReader error enum in read scene
* OneWire slave lib: more READ ROM command variants, call callback only if positive result
* GPIO resources: add external gpio
* App SD/NFC: removed application
* App iButton-test: update to new light api
* App iButton: update to new light-api
* Outdated apps: add api-light-usage
* Gpio: update SD card CS pin settings
* API-power: added fns to disable/enable external 3v3 dc-dc
* API-gpio: separated SD card detect routines
* Resources: removed sd cs pin
* SD card: low level init now resets card power supply
* App SD-filesystem: use new card detect fns
* SD card: fix low level init headers
* SD card: more realilable low level init, power reset, exit from command read cycle conditionally
* App SD-filesystem: led notifiers, init cycling
* SD card: backport to F4
* Api PWM: add c++ guards
* App iButton: yellow blink in emulate scene, vibro on
* App iButton: one wire keys command set
* App iButton: successful write scene
* App iButton: key writer
* App iButton: syntax fix
* App iButton: notify write success
* App iButton: fix double scene change
* SD card: handle eject in init sequence
* SD card: api to set level on detect gpio
* SPI: api to set state on bus pins
* SD card: set low state on bus pins while power reset
* File select: init
* File select: fix input consuming
* SD Card: fixed dir open api error
* SD-card: replace strncpy by strlcpy. Fix buffer overflow error.
* API HAL OS: replace CMP based ticks with ARR based one, hard reset lptimer on reconfiguration.
* GUI: More stack size for (temporary, wee need to implement sd card api in separate thread)
* GUI: File select module.
* App iButton-test: remove obsolete app
Co-authored-by: rusdacent <rusdacentx0x08@gmail.com>
Co-authored-by: coreglitch <mail@s3f.ru>
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2021-03-12 15:45:18 +03:00
|
|
|
switch_to(ReadMode::CYFRAL_METAKOM);
|
|
|
|
}
|
|
|
|
|
|
|
|
void KeyReader::stop() {
|
2021-04-24 01:23:16 +03:00
|
|
|
api_hal_power_disable_otg();
|
new iButton app (#328)
* rename old ibutton app to ibutton-test
* more renames
* updated onewire library compilation condition
* add submenu_clean subroutine
* add index for submenu callback
* c++ guard for gui modules
* add released ibutton app
* fix the position of the submenu window if there are too few items
* iButton app basis
* negative icon position info
* fix submenu_clean subroutine
* add ibutton app to applications makefile
* add onewire key read routine to read mode
* rename mode to scene
* rename files and folder (mode to scene)
* rename ibutton view to view manager
* rename get_view to get_view_manager
* cpp guards
* key read, store and notify features
* syntax fix
* make iButtonScene functions pure virtual
* fix syntax
* add text store, add new scene (crc error)
* not a key scene
* syntax fix
* read success scene
* app, switching to the previous scene with the number of scenes to be skipped
* scene whith menu when key is readed
* fix font height calculation, fix offsets
* add key write scene
* view_dispatcher_remove_view subroutine
* generic pause/resume os methods
* fix furi_assert usage
* key store, worker
* fix pointer comparsion
* saved keys, saved key action scenes
* key delete/confirm delete scenes and routines
* use last input subsystem changes
* fix syntax
* fix new model usage in submenu
* fix includes
* use vibro pin
* use stored key name if valid
* emulate scene
* random name generator
* name and save readed key scenes, new icon
* fix icon position
* fix text scene exit
* fix naming, fix text placement, new info scene
* state-driven cyfral decoder
* better cyfral decoder
* better cyfral decoder
* one wire: search command set
* metakom decoder
* more key types
* add next scene to error scenes
* universal key reader
* use new key reader
* syntax fix
* warning fix
* byte input module template
* new thread and insomnia api usage
* New element: slightly rounded frame
* Use elements_slightly_rounded_frame in text input
* Gui test app: byte input usage
* Byte input module: data drawing and selection
* Byte input: comment currently unused fns
* remove volatile qualifier
* base byte input realisation
* App gui test: remove internal fns visibility
* Byne input, final version
* test install gcc-arm-none-eabi-10-2020-q4-major
* test install gcc-arm-none-eabi-10-2020-q4-major
* App iButton: byte input view managment
* App iButton: add key manually scenes
* App iButton: rename scenes, add popup timeout
* App iButton: use new scenes, new fn for rollback to specific prevous scene.
* App iButton: remove byte input view on app exit
* App iButton: edit key scene
* Module byte input: reduce swintch value to uint8_t
* Module byte input: switch from switch-case to if, unfortunately we need compile-time constants to use with switch
* Icons: new small arrows
* Module byte input: new arrangement of elements
* OneWire slave lib: fix deattach sequence
* App iButton: pulse sequencer
* App iButton: add more keys to store
* App iButton: split key worker to separate read/write/emulate entitys
* App iButton: use new read/emulate entities
* fix callback pointer saving
* App iButton: use KeyReader error enum instead of KeyWorker error list handling
* App iButton: do not use insomnia fns in pulse sequencer
* App iButton: use KeyReader error enum in read scene
* OneWire slave lib: more READ ROM command variants, call callback only if positive result
* GPIO resources: add external gpio
* App SD/NFC: removed application
* App iButton-test: update to new light api
* App iButton: update to new light-api
* Outdated apps: add api-light-usage
* Gpio: update SD card CS pin settings
* API-power: added fns to disable/enable external 3v3 dc-dc
* API-gpio: separated SD card detect routines
* Resources: removed sd cs pin
* SD card: low level init now resets card power supply
* App SD-filesystem: use new card detect fns
* SD card: fix low level init headers
* SD card: more realilable low level init, power reset, exit from command read cycle conditionally
* App SD-filesystem: led notifiers, init cycling
* SD card: backport to F4
* Api PWM: add c++ guards
* App iButton: yellow blink in emulate scene, vibro on
* App iButton: one wire keys command set
* App iButton: successful write scene
* App iButton: key writer
* App iButton: syntax fix
* App iButton: notify write success
* App iButton: fix double scene change
* SD card: handle eject in init sequence
* SD card: api to set level on detect gpio
* SPI: api to set state on bus pins
* SD card: set low state on bus pins while power reset
* File select: init
* File select: fix input consuming
* SD Card: fixed dir open api error
* SD-card: replace strncpy by strlcpy. Fix buffer overflow error.
* API HAL OS: replace CMP based ticks with ARR based one, hard reset lptimer on reconfiguration.
* GUI: More stack size for (temporary, wee need to implement sd card api in separate thread)
* GUI: File select module.
* App iButton-test: remove obsolete app
Co-authored-by: rusdacent <rusdacentx0x08@gmail.com>
Co-authored-by: coreglitch <mail@s3f.ru>
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2021-03-12 15:45:18 +03:00
|
|
|
onewire_master->stop();
|
|
|
|
stop_comaparator();
|
|
|
|
}
|