Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-13 00:38:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

32bit subghz hashes (less false duplicates)

Browse Source
This commit is contained in:
Willy-JL
2023-12-14 04:46:53 +00:00
parent c40755f700
commit 02ec1f0867
135 changed files with 258 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/main/subghz/scenes/subghz_scene_decode_raw.c
View File

@@ -65,7 +65,7 @@ static void subghz_scene_add_to_history_callback(
if(subghz->remove_duplicates) {
// Look in history for signal hash
uint8_t hash_data = subghz_protocol_decoder_base_get_hash_data(decoder_base);
uint32_t hash_data = subghz_protocol_decoder_base_get_hash_data_long(decoder_base);
subghz_view_receiver_disable_draw_callback(subghz->subghz_receiver);
for(uint16_t i = idx; i > 0; i--) {
i--; // Iterating in reverse with off by one

3
applications/main/subghz/scenes/subghz_scene_receiver.c
View File

@@ -147,7 +147,8 @@ static void subghz_scene_add_to_history_callback(
if(subghz->remove_duplicates) {
// Look in history for signal hash
uint8_t hash_data = subghz_protocol_decoder_base_get_hash_data(decoder_base);
uint32_t hash_data =
subghz_protocol_decoder_base_get_hash_data_long(decoder_base);
subghz_view_receiver_disable_draw_callback(subghz->subghz_receiver);
for(uint16_t i = idx; i > 0; i--) {
i--; // Iterating in reverse with off by one

8
applications/main/subghz/subghz_history.c
View File

@@ -13,7 +13,7 @@ typedef struct {
uint8_t type;
SubGhzRadioPreset* preset;
FuriHalRtcDateTime datetime;
uint8_t hash_data;
uint32_t hash_data;
uint16_t repeats;
float latitude;
float longitude;
@@ -30,7 +30,7 @@ typedef struct {
struct SubGhzHistory {
uint32_t last_update_timestamp;
uint16_t last_index_write;
uint8_t code_last_hash_data;
uint32_t code_last_hash_data;
FuriString* tmp_string;
SubGhzHistoryStruct* history;
};
@@ -59,7 +59,7 @@ void subghz_history_free(SubGhzHistory* instance) {
free(instance);
}
uint8_t subghz_history_get_hash_data(SubGhzHistory* instance, uint16_t idx) {
uint32_t subghz_history_get_hash_data(SubGhzHistory* instance, uint16_t idx) {
furi_assert(instance);
SubGhzHistoryItem* item = SubGhzHistoryItemArray_get(instance->history->data, idx);
return item->hash_data;
@@ -221,7 +221,7 @@ bool subghz_history_add_to_history(
if(instance->last_index_write >= SUBGHZ_HISTORY_MAX) return false;
SubGhzProtocolDecoderBase* decoder_base = context;
uint8_t hash_data = subghz_protocol_decoder_base_get_hash_data(decoder_base);
uint32_t hash_data = subghz_protocol_decoder_base_get_hash_data_long(decoder_base);
if((instance->code_last_hash_data == hash_data) &&
((furi_get_tick() - instance->last_update_timestamp) < 500)) {
instance->last_update_timestamp = furi_get_tick();

4
applications/main/subghz/subghz_history.h
View File

@@ -33,9 +33,9 @@ void subghz_history_delete_item(SubGhzHistory* instance, uint16_t idx);
*
* @param instance - SubGhzHistory instance
* @param idx - record index
* @return hash - hash data byte
* @return hash - hash data
*/
uint8_t subghz_history_get_hash_data(SubGhzHistory* instance, uint16_t idx);
uint32_t subghz_history_get_hash_data(SubGhzHistory* instance, uint16_t idx);
/** Get repeat count to history[idx]
*