mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-07-24 01:28:11 -07:00
Merge branch 'ofw-dev' into dev
This commit is contained in:
@@ -17,13 +17,13 @@ bool lfrfid_dict_file_save(ProtocolDict* dict, ProtocolId protocol, const char*
|
||||
if(!flipper_format_file_open_always(file, filename)) break;
|
||||
if(!flipper_format_write_header_cstr(file, LFRFID_DICT_FILETYPE, 1)) break;
|
||||
|
||||
// TODO: write comment about protocol types into file
|
||||
// TODO FL-3517: write comment about protocol types into file
|
||||
|
||||
if(!flipper_format_write_string_cstr(
|
||||
file, "Key type", protocol_dict_get_name(dict, protocol)))
|
||||
break;
|
||||
|
||||
// TODO: write comment about protocol sizes into file
|
||||
// TODO FL-3517: write comment about protocol sizes into file
|
||||
|
||||
protocol_dict_get_data(dict, protocol, data, data_size);
|
||||
|
||||
|
||||
@@ -26,8 +26,8 @@ typedef enum {
|
||||
} LFRFIDWorkerReadType;
|
||||
|
||||
typedef enum {
|
||||
LFRFIDWorkerReadSenseStart, // TODO: not implemented
|
||||
LFRFIDWorkerReadSenseEnd, // TODO: not implemented
|
||||
LFRFIDWorkerReadSenseStart, // TODO FL-3516: not implemented
|
||||
LFRFIDWorkerReadSenseEnd, // TODO FL-3516: not implemented
|
||||
LFRFIDWorkerReadSenseCardStart,
|
||||
LFRFIDWorkerReadSenseCardEnd,
|
||||
LFRFIDWorkerReadStartASK,
|
||||
|
||||
@@ -193,7 +193,7 @@ bool protocol_hid_ex_generic_write_data(ProtocolHIDEx* protocol, void* data) {
|
||||
};
|
||||
|
||||
void protocol_hid_ex_generic_render_data(ProtocolHIDEx* protocol, FuriString* result) {
|
||||
// TODO: parser and render functions
|
||||
// TODO FL-3518: parser and render functions
|
||||
UNUSED(protocol);
|
||||
furi_string_printf(result, "Generic HID Extended\r\nData: Unknown");
|
||||
};
|
||||
|
||||
@@ -38,7 +38,7 @@ uint8_t bit_lib_get_bits(const uint8_t* data, size_t position, uint8_t length) {
|
||||
if(shift == 0) {
|
||||
return data[position / 8] >> (8 - length);
|
||||
} else {
|
||||
// TODO fix read out of bounds
|
||||
// TODO FL-3534: fix read out of bounds
|
||||
uint8_t value = (data[position / 8] << (shift));
|
||||
value |= data[position / 8 + 1] >> (8 - shift);
|
||||
value = value >> (8 - length);
|
||||
|
||||
Reference in New Issue
Block a user