Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-04-24 03:29:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'UNLEASHED' into 420

Browse Source
This commit is contained in:
RogueMaster
2022-11-28 17:05:56 -05:00
parent f73b5c104f 60cd7b8b32
commit a2bc900fd3
2 changed files with 0 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
applications/main/subghz/helpers/subghz_frequency_analyzer_log_item_array.h
View File

@@ -1,73 +0,0 @@
#pragma once
#include <m-tuple.h>
#include <m-array.h>
#include <m-algo.h>
#include <m-funcobj.h>
typedef enum {
SubGhzFrequencyAnalyzerLogOrderBySeqDesc,
SubGhzFrequencyAnalyzerLogOrderBySeqAsc,
SubGhzFrequencyAnalyzerLogOrderByCountDesc,
SubGhzFrequencyAnalyzerLogOrderByCountAsc,
SubGhzFrequencyAnalyzerLogOrderByRSSIDesc,
SubGhzFrequencyAnalyzerLogOrderByRSSIAsc,
SubGhzFrequencyAnalyzerLogOrderByFrequencyDesc,
SubGhzFrequencyAnalyzerLogOrderByFrequencyAsc,
} SubGhzFrequencyAnalyzerLogOrderBy;
const char*
subghz_frequency_analyzer_log_get_order_name(SubGhzFrequencyAnalyzerLogOrderBy order_by);
TUPLE_DEF2(
SubGhzFrequencyAnalyzerLogItem,
(seq, uint8_t),
(frequency, uint32_t),
(count, uint8_t),
(rssi_max, uint8_t))
/* Register globally the oplist */
#define M_OPL_SubGhzFrequencyAnalyzerLogItem_t() \
TUPLE_OPLIST(SubGhzFrequencyAnalyzerLogItem, M_POD_OPLIST, M_DEFAULT_OPLIST, M_DEFAULT_OPLIST)
/* Define the array, register the oplist and define further algorithms on it */
ARRAY_DEF(SubGhzFrequencyAnalyzerLogItemArray, SubGhzFrequencyAnalyzerLogItem_t)
#define M_OPL_SubGhzFrequencyAnalyzerLogItemArray_t() \
ARRAY_OPLIST(SubGhzFrequencyAnalyzerLogItemArray, M_OPL_SubGhzFrequencyAnalyzerLogItem_t())
ALGO_DEF(SubGhzFrequencyAnalyzerLogItemArray, SubGhzFrequencyAnalyzerLogItemArray_t)
FUNC_OBJ_INS_DEF(
SubGhzFrequencyAnalyzerLogItemArray_compare_by /* name of the instance */,
SubGhzFrequencyAnalyzerLogItemArray_cmp_obj /* name of the interface */,
(a,
b) /* name of the input parameters of the function like object. The type are inherited from the interface. */
,
{
/* code of the function object */
if(self->order_by == SubGhzFrequencyAnalyzerLogOrderByFrequencyAsc) {
return a->frequency < b->frequency ? -1 : a->frequency > b->frequency;
}
if(self->order_by == SubGhzFrequencyAnalyzerLogOrderByFrequencyDesc) {
return a->frequency > b->frequency ? -1 : a->frequency < b->frequency;
}
if(self->order_by == SubGhzFrequencyAnalyzerLogOrderByRSSIAsc) {
return a->rssi_max < b->rssi_max ? -1 : a->rssi_max > b->rssi_max;
}
if(self->order_by == SubGhzFrequencyAnalyzerLogOrderByRSSIDesc) {
return a->rssi_max > b->rssi_max ? -1 : a->rssi_max < b->rssi_max;
}
if(self->order_by == SubGhzFrequencyAnalyzerLogOrderByCountAsc) {
return a->count < b->count ? -1 : a->count > b->count;
}
if(self->order_by == SubGhzFrequencyAnalyzerLogOrderByCountDesc) {
return a->count > b->count ? -1 : a->count < b->count;
}
if(self->order_by == SubGhzFrequencyAnalyzerLogOrderBySeqAsc) {
return a->seq < b->seq ? -1 : a->seq > b->seq;
}
return a->seq > b->seq ? -1 : a->seq < b->seq;
},
/* Additional fields stored in the function object */
(order_by, SubGhzFrequencyAnalyzerLogOrderBy))
#define M_OPL_SubGhzFrequencyAnalyzerLogItemArray_compare_by_t() \
FUNC_OBJ_INS_OPLIST(SubGhzFrequencyAnalyzerLogItemArray_compare_by, M_DEFAULT_OPLIST)

1
applications/plugins/hid_app/views/hid_keyboard.c
View File

@@ -5,7 +5,6 @@
#include "../hid.h"
#include "hid_icons.h"
#include "hid_icons.h"
#define TAG "HidKeyboard"
struct HidKeyboard {