diff options
author | あく <alleteam@gmail.com> | 2021-04-11 16:47:36 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-11 16:47:36 +0300 |
commit | 5d08b35b5427335c27d2ddd1fd55ce78f5fad568 (patch) | |
tree | 89ab15bfffad3acd7570092e2663d927a0404c9e /applications/ibutton | |
parent | 2fe44e1b11d70577671be9f57ff7c4f33ba4b79a (diff) |
[FL-1009, FL-1118] Better initialization sequence and V8 hardware support (#406)
* Interrupt manager: add memory barriers.
* ISRs: remove TIM17 dead code.
* API HAL Delay: rename initialization routine and move to API-HAL
* Main: move FURI initialization to the start.
* API HAL GPIO: drop CC1101 shenanigans, COMP inversion for new boards.
* IButton: migrate Cyfral and Metakom to RFID comp routine, make it compatible with new boards.
* RFID: Better keyboard handling and shutdown routines
Diffstat (limited to 'applications/ibutton')
-rw-r--r-- | applications/ibutton/helpers/key-reader.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/applications/ibutton/helpers/key-reader.cpp b/applications/ibutton/helpers/key-reader.cpp index 1d868b8d..0afd5f4b 100644 --- a/applications/ibutton/helpers/key-reader.cpp +++ b/applications/ibutton/helpers/key-reader.cpp @@ -137,17 +137,12 @@ void KeyReader::stop_comaparator(void) { } void KeyReader::comparator_trigger_callback(void* hcomp, void* comp_ctx) { - COMP_HandleTypeDef* _hcomp = static_cast<COMP_HandleTypeDef*>(hcomp); KeyReader* _this = static_cast<KeyReader*>(comp_ctx); if(hcomp == &hcomp1) { - _this->cyfral_decoder.process_front( - (HAL_COMP_GetOutputLevel(_hcomp) == COMP_OUTPUT_LEVEL_HIGH), - DWT->CYCCNT - last_dwt_value); + _this->cyfral_decoder.process_front(get_rfid_in_level(), DWT->CYCCNT - last_dwt_value); - _this->metakom_decoder.process_front( - (HAL_COMP_GetOutputLevel(_hcomp) == COMP_OUTPUT_LEVEL_HIGH), - DWT->CYCCNT - last_dwt_value); + _this->metakom_decoder.process_front(get_rfid_in_level(), DWT->CYCCNT - last_dwt_value); last_dwt_value = DWT->CYCCNT; } |