liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-85][FL-446][FL-720] Dallas key blanks and OneWire lib rework (#313)

Browse Source 
* sepate one wire class
* TM2004 writer
* app mode write ds1990
* test another blanks protocol
* new ibutton slave
* one wire states
* tim1 capture compare and update interrupts
* interrupt mgr, new timers IRQ
* discard HAL_TIM_PeriodElapsedCallback from main
* add exti_14 line
* add external interrupt callback
* use int mgr in input
* better interrupt managment
* add interrupt callback enable and disable fns
* properly init app
* changed timings
* rename one wire classes
* use new owb classes
* properly remove interrupts
* new blanks writer
* remove unused tests
* new core includes
* extern c guard
* fix api_interrupt_remove usage
* remove debug info, new way to detect blanks writing
* remove copy constructor
* change keys template
* fix app sources recipe
This commit is contained in:
DrZlo13
2021-01-28 22:30:31 +10:00
committed by GitHub
parent a7951ade69
commit cf1c8fb223
31 changed files with 1099 additions and 869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
core/api-hal/api-interrupt-mgr.c
View File

@@ -1,23 +1,36 @@
#include "api-interrupt-mgr.h"
#include "mlib/m-dict.h"
#include <m-list.h>
#include <cmsis_os2.h>
LIST_DEF(list_interrupt, InterruptCallbackItem, M_POD_OPLIST);
list_interrupt_t interrupts;
osMutexId_t interrupt_list_mutex;
DICT_DEF2(dict_interrupt, uint32_t, M_DEFAULT_OPLIST, list_interrupt_t, M_A1_OPLIST);
dict_interrupt_t interrupts_dict;
osMutexId_t interrupt_mutex;
bool api_interrupt_init() {
interrupt_list_mutex = osMutexNew(NULL);
return (interrupt_list_mutex != NULL);
dict_interrupt_init(interrupts_dict);
interrupt_mutex = osMutexNew(NULL);
return (interrupt_mutex != NULL);
}
void api_interrupt_add(InterruptCallback callback, InterruptType type, void* context) {
if(osMutexAcquire(interrupt_list_mutex, osWaitForever) == osOK) {
if(osMutexAcquire(interrupt_mutex, osWaitForever) == osOK) {
list_interrupt_t* list = dict_interrupt_get(interrupts_dict, (uint32_t)type);
if(list == NULL) {
list_interrupt_t new_list;
list_interrupt_init(new_list);
dict_interrupt_set_at(interrupts_dict, (uint32_t)type, new_list);
list = dict_interrupt_get(interrupts_dict, (uint32_t)type);
}
// put uninitialized item to the list
// M_POD_OPLIST provide memset(&(a), 0, sizeof (a)) constructor
// so item will not be ready until we set ready flag
InterruptCallbackItem* item = list_interrupt_push_new(interrupts);
InterruptCallbackItem* item = list_interrupt_push_new(*list);
// initialize item
item->callback = callback;
@@ -28,26 +41,66 @@ void api_interrupt_add(InterruptCallback callback, InterruptType type, void* con
// TODO remove on app exit
//flapp_on_exit(api_interrupt_remove, callback);
osMutexRelease(interrupt_list_mutex);
osMutexRelease(interrupt_mutex);
}
}
void api_interrupt_remove(InterruptCallback callback) {
if(osMutexAcquire(interrupt_list_mutex, osWaitForever) == osOK) {
// iterate over items
list_interrupt_it_t it;
for(list_interrupt_it(it, interrupts); !list_interrupt_end_p(it);
list_interrupt_next(it)) {
const InterruptCallbackItem* item = list_interrupt_cref(it);
void api_interrupt_remove(InterruptCallback callback, InterruptType type) {
if(osMutexAcquire(interrupt_mutex, osWaitForever) == osOK) {
list_interrupt_t* list = dict_interrupt_get(interrupts_dict, (uint32_t)type);
// if the iterator is equal to our element
if(item->callback == callback) {
list_interrupt_remove(interrupts, it);
break;
if(list != NULL) {
// iterate over items
list_interrupt_it_t it;
list_interrupt_it(it, *list);
while(!list_interrupt_end_p(it)) {
if(it->current->data.callback == callback) {
list_interrupt_remove(*list, it);
} else {
list_interrupt_next(it);
}
}
}
osMutexRelease(interrupt_list_mutex);
osMutexRelease(interrupt_mutex);
}
}
void api_interrupt_enable(InterruptCallback callback, InterruptType type) {
if(osMutexAcquire(interrupt_mutex, osWaitForever) == osOK) {
list_interrupt_t* list = dict_interrupt_get(interrupts_dict, (uint32_t)type);
if(list != NULL) {
// iterate over items
list_interrupt_it_t it;
for(list_interrupt_it(it, *list); !list_interrupt_end_p(it); list_interrupt_next(it)) {
// if the iterator is equal to our element
if(it->current->data.callback == callback) {
it->current->data.ready = true;
}
}
}
osMutexRelease(interrupt_mutex);
}
}
void api_interrupt_disable(InterruptCallback callback, InterruptType type) {
if(osMutexAcquire(interrupt_mutex, osWaitForever) == osOK) {
list_interrupt_t* list = dict_interrupt_get(interrupts_dict, (uint32_t)type);
if(list != NULL) {
// iterate over items
list_interrupt_it_t it;
for(list_interrupt_it(it, *list); !list_interrupt_end_p(it); list_interrupt_next(it)) {
// if the iterator is equal to our element
if(it->current->data.callback == callback) {
it->current->data.ready = false;
}
}
}
osMutexRelease(interrupt_mutex);
}
}
@@ -55,14 +108,16 @@ void api_interrupt_call(InterruptType type, void* hw) {
// that executed in interrupt ctx so mutex don't needed
// but we need to check ready flag
// iterate over items
list_interrupt_it_t it;
for(list_interrupt_it(it, interrupts); !list_interrupt_end_p(it); list_interrupt_next(it)) {
const InterruptCallbackItem* item = list_interrupt_cref(it);
list_interrupt_t* list = dict_interrupt_get(interrupts_dict, (uint32_t)type);
// if the iterator is equal to our element
if(item->type == type && item->ready) {
item->callback(hw, item->context);
if(list != NULL) {
// iterate over items
list_interrupt_it_t it;
for(list_interrupt_it(it, *list); !list_interrupt_end_p(it); list_interrupt_next(it)) {
// if the iterator is equal to our element
if(it->current->data.ready) {
it->current->data.callback(hw, it->current->data.context);
}
}
}
}

7
core/api-hal/api-interrupt-mgr.h
View File

@@ -11,6 +11,9 @@ typedef void (*InterruptCallback)(void*, void*);
typedef enum {
InterruptTypeComparatorTrigger,
InterruptTypeTimerCapture,
InterruptTypeTimerOutputCompare,
InterruptTypeTimerUpdate,
InterruptTypeExternalInterrupt,
} InterruptType;
typedef struct {
@@ -22,7 +25,9 @@ typedef struct {
bool api_interrupt_init();
void api_interrupt_add(InterruptCallback callback, InterruptType type, void* context);
void api_interrupt_remove(InterruptCallback callback);
void api_interrupt_remove(InterruptCallback callback, InterruptType type);
void api_interrupt_enable(InterruptCallback callback, InterruptType type);
void api_interrupt_disable(InterruptCallback callback, InterruptType type);
void api_interrupt_call(InterruptType type, void* hw);
#ifdef __cplusplus