DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2024-12-25 22:32:29 +03:00
Code Issues Projects Releases Wiki Activity

Fix auriol protocol naming

Browse Source
This commit is contained in:
MX 2022-11-27 17:07:51 +03:00
parent 7ed56fca54
commit 43d35b42e5
No known key found for this signature in database
GPG Key ID: 6C4C311DFD4B4AB5
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
applications/plugins/weather_station/protocols/auriol_hg0601a.c
View File

@ -1,6 +1,6 @@
#include "auriol_hg0601a.h" #include "auriol_hg0601a.h"
#define TAG "WSProtocolauriol_TH" #define TAG "WSProtocolAuriol_TH"
/* /*
* *
@ -34,14 +34,14 @@ static const SubGhzBlockConst ws_protocol_auriol_th_const = {
.min_count_bit_for_found = 37, .min_count_bit_for_found = 37,
}; };
struct WSProtocolDecoderauriol_TH { struct WSProtocolDecoderAuriol_TH {
SubGhzProtocolDecoderBase base; SubGhzProtocolDecoderBase base;
SubGhzBlockDecoder decoder; SubGhzBlockDecoder decoder;
WSBlockGeneric generic; WSBlockGeneric generic;
}; };
struct WSProtocolEncoderauriol_TH { struct WSProtocolEncoderAuriol_TH {
SubGhzProtocolEncoderBase base; SubGhzProtocolEncoderBase base;
SubGhzProtocolBlockEncoder encoder; SubGhzProtocolBlockEncoder encoder;
@ -77,7 +77,7 @@ const SubGhzProtocolEncoder ws_protocol_auriol_th_encoder = {
}; };
const SubGhzProtocol ws_protocol_auriol_th = { const SubGhzProtocol ws_protocol_auriol_th = {
.name = WS_PROTOCOL_auriol_TH_NAME, .name = WS_PROTOCOL_AURIOL_TH_NAME,
.type = SubGhzProtocolWeatherStation, .type = SubGhzProtocolWeatherStation,
.flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 | .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable, SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable,
@ -88,7 +88,7 @@ const SubGhzProtocol ws_protocol_auriol_th = {
void* ws_protocol_decoder_auriol_th_alloc(SubGhzEnvironment* environment) { void* ws_protocol_decoder_auriol_th_alloc(SubGhzEnvironment* environment) {
UNUSED(environment); UNUSED(environment);
WSProtocolDecoderauriol_TH* instance = malloc(sizeof(WSProtocolDecoderauriol_TH)); WSProtocolDecoderAuriol_TH* instance = malloc(sizeof(WSProtocolDecoderAuriol_TH));
instance->base.protocol = &ws_protocol_auriol_th; instance->base.protocol = &ws_protocol_auriol_th;
instance->generic.protocol_name = instance->base.protocol->name; instance->generic.protocol_name = instance->base.protocol->name;
return instance; return instance;
@ -96,17 +96,17 @@ void* ws_protocol_decoder_auriol_th_alloc(SubGhzEnvironment* environment) {
void ws_protocol_decoder_auriol_th_free(void* context) { void ws_protocol_decoder_auriol_th_free(void* context) {
furi_assert(context); furi_assert(context);
WSProtocolDecoderauriol_TH* instance = context; WSProtocolDecoderAuriol_TH* instance = context;
free(instance); free(instance);
} }
void ws_protocol_decoder_auriol_th_reset(void* context) { void ws_protocol_decoder_auriol_th_reset(void* context) {
furi_assert(context); furi_assert(context);
WSProtocolDecoderauriol_TH* instance = context; WSProtocolDecoderAuriol_TH* instance = context;
instance->decoder.parser_step = auriol_THDecoderStepReset; instance->decoder.parser_step = auriol_THDecoderStepReset;
} }
static bool ws_protocol_auriol_th_check(WSProtocolDecoderauriol_TH* instance) { static bool ws_protocol_auriol_th_check(WSProtocolDecoderAuriol_TH* instance) {
uint8_t type = (instance->decoder.decode_data >> 8) & 0x0F; uint8_t type = (instance->decoder.decode_data >> 8) & 0x0F;
if((type == AURIOL_TH_CONST_DATA) && ((instance->decoder.decode_data >> 4) != 0xffffffff)) { if((type == AURIOL_TH_CONST_DATA) && ((instance->decoder.decode_data >> 4) != 0xffffffff)) {
@ -137,7 +137,7 @@ static void ws_protocol_auriol_th_remote_controller(WSBlockGeneric* instance) {
void ws_protocol_decoder_auriol_th_feed(void* context, bool level, uint32_t duration) { void ws_protocol_decoder_auriol_th_feed(void* context, bool level, uint32_t duration) {
furi_assert(context); furi_assert(context);
WSProtocolDecoderauriol_TH* instance = context; WSProtocolDecoderAuriol_TH* instance = context;
switch(instance->decoder.parser_step) { switch(instance->decoder.parser_step) {
case auriol_THDecoderStepReset: case auriol_THDecoderStepReset:
@ -205,7 +205,7 @@ void ws_protocol_decoder_auriol_th_feed(void* context, bool level, uint32_t dura
uint8_t ws_protocol_decoder_auriol_th_get_hash_data(void* context) { uint8_t ws_protocol_decoder_auriol_th_get_hash_data(void* context) {
furi_assert(context); furi_assert(context);
WSProtocolDecoderauriol_TH* instance = context; WSProtocolDecoderAuriol_TH* instance = context;
return subghz_protocol_blocks_get_hash_data( return subghz_protocol_blocks_get_hash_data(
&instance->decoder, (instance->decoder.decode_count_bit / 8) + 1); &instance->decoder, (instance->decoder.decode_count_bit / 8) + 1);
} }
@ -215,13 +215,13 @@ bool ws_protocol_decoder_auriol_th_serialize(
FlipperFormat* flipper_format, FlipperFormat* flipper_format,
SubGhzRadioPreset* preset) { SubGhzRadioPreset* preset) {
furi_assert(context); furi_assert(context);
WSProtocolDecoderauriol_TH* instance = context; WSProtocolDecoderAuriol_TH* instance = context;
return ws_block_generic_serialize(&instance->generic, flipper_format, preset); return ws_block_generic_serialize(&instance->generic, flipper_format, preset);
} }
bool ws_protocol_decoder_auriol_th_deserialize(void* context, FlipperFormat* flipper_format) { bool ws_protocol_decoder_auriol_th_deserialize(void* context, FlipperFormat* flipper_format) {
furi_assert(context); furi_assert(context);
WSProtocolDecoderauriol_TH* instance = context; WSProtocolDecoderAuriol_TH* instance = context;
bool ret = false; bool ret = false;
do { do {
if(!ws_block_generic_deserialize(&instance->generic, flipper_format)) { if(!ws_block_generic_deserialize(&instance->generic, flipper_format)) {
@ -239,7 +239,7 @@ bool ws_protocol_decoder_auriol_th_deserialize(void* context, FlipperFormat* fli
void ws_protocol_decoder_auriol_th_get_string(void* context, FuriString* output) { void ws_protocol_decoder_auriol_th_get_string(void* context, FuriString* output) {
furi_assert(context); furi_assert(context);
WSProtocolDecoderauriol_TH* instance = context; WSProtocolDecoderAuriol_TH* instance = context;
furi_string_printf( furi_string_printf(
output, output,
"%s %dbit\r\n" "%s %dbit\r\n"

32
applications/plugins/weather_station/protocols/auriol_hg0601a.h
View File

@ -8,37 +8,37 @@
#include "ws_generic.h" #include "ws_generic.h"
#include <lib/subghz/blocks/math.h> #include <lib/subghz/blocks/math.h>
#define WS_PROTOCOL_auriol_TH_NAME "Auriol HG06061" //HG06061A-DCF-TX #define WS_PROTOCOL_AURIOL_TH_NAME "Auriol HG06061" //HG06061A-DCF-TX
typedef struct WSProtocolDecoderauriol_TH WSProtocolDecoderauriol_TH; typedef struct WSProtocolDecoderAuriol_TH WSProtocolDecoderAuriol_TH;
typedef struct WSProtocolEncoderauriol_TH WSProtocolEncoderauriol_TH; typedef struct WSProtocolEncoderAuriol_TH WSProtocolEncoderAuriol_TH;
extern const SubGhzProtocolDecoder ws_protocol_auriol_th_decoder; extern const SubGhzProtocolDecoder ws_protocol_auriol_th_decoder;
extern const SubGhzProtocolEncoder ws_protocol_auriol_th_encoder; extern const SubGhzProtocolEncoder ws_protocol_auriol_th_encoder;
extern const SubGhzProtocol ws_protocol_auriol_th; extern const SubGhzProtocol ws_protocol_auriol_th;
/** /**
* Allocate WSProtocolDecoderauriol_TH. * Allocate WSProtocolDecoderAuriol_TH.
* @param environment Pointer to a SubGhzEnvironment instance * @param environment Pointer to a SubGhzEnvironment instance
* @return WSProtocolDecoderauriol_TH* pointer to a WSProtocolDecoderauriol_TH instance * @return WSProtocolDecoderAuriol_TH* pointer to a WSProtocolDecoderAuriol_TH instance
*/ */
void* ws_protocol_decoder_auriol_th_alloc(SubGhzEnvironment* environment); void* ws_protocol_decoder_auriol_th_alloc(SubGhzEnvironment* environment);
/** /**
* Free WSProtocolDecoderauriol_TH. * Free WSProtocolDecoderAuriol_TH.
* @param context Pointer to a WSProtocolDecoderauriol_TH instance * @param context Pointer to a WSProtocolDecoderAuriol_TH instance
*/ */
void ws_protocol_decoder_auriol_th_free(void* context); void ws_protocol_decoder_auriol_th_free(void* context);
/** /**
* Reset decoder WSProtocolDecoderauriol_TH. * Reset decoder WSProtocolDecoderAuriol_TH.
* @param context Pointer to a WSProtocolDecoderauriol_TH instance * @param context Pointer to a WSProtocolDecoderAuriol_TH instance
*/ */
void ws_protocol_decoder_auriol_th_reset(void* context); void ws_protocol_decoder_auriol_th_reset(void* context);
/** /**
* Parse a raw sequence of levels and durations received from the air. * Parse a raw sequence of levels and durations received from the air.
* @param context Pointer to a WSProtocolDecoderauriol_TH instance * @param context Pointer to a WSProtocolDecoderAuriol_TH instance
* @param level Signal level true-high false-low * @param level Signal level true-high false-low
* @param duration Duration of this level in, us * @param duration Duration of this level in, us
*/ */
@ -46,14 +46,14 @@ void ws_protocol_decoder_auriol_th_feed(void* context, bool level, uint32_t dura
/** /**
* Getting the hash sum of the last randomly received parcel. * Getting the hash sum of the last randomly received parcel.
* @param context Pointer to a WSProtocolDecoderauriol_TH instance * @param context Pointer to a WSProtocolDecoderAuriol_TH instance
* @return hash Hash sum * @return hash Hash sum
*/ */
uint8_t ws_protocol_decoder_auriol_th_get_hash_data(void* context); uint8_t ws_protocol_decoder_auriol_th_get_hash_data(void* context);
/** /**
* Serialize data WSProtocolDecoderauriol_TH. * Serialize data WSProtocolDecoderAuriol_TH.
* @param context Pointer to a WSProtocolDecoderauriol_TH instance * @param context Pointer to a WSProtocolDecoderAuriol_TH instance
* @param flipper_format Pointer to a FlipperFormat instance * @param flipper_format Pointer to a FlipperFormat instance
* @param preset The modulation on which the signal was received, SubGhzRadioPreset * @param preset The modulation on which the signal was received, SubGhzRadioPreset
* @return true On success * @return true On success
@ -64,8 +64,8 @@ bool ws_protocol_decoder_auriol_th_serialize(
SubGhzRadioPreset* preset); SubGhzRadioPreset* preset);
/** /**
* Deserialize data WSProtocolDecoderauriol_TH. * Deserialize data WSProtocolDecoderAuriol_TH.
* @param context Pointer to a WSProtocolDecoderauriol_TH instance * @param context Pointer to a WSProtocolDecoderAuriol_TH instance
* @param flipper_format Pointer to a FlipperFormat instance * @param flipper_format Pointer to a FlipperFormat instance
* @return true On success * @return true On success
*/ */
@ -73,7 +73,7 @@ bool ws_protocol_decoder_auriol_th_deserialize(void* context, FlipperFormat* fli
/** /**
* Getting a textual representation of the received data. * Getting a textual representation of the received data.
* @param context Pointer to a WSProtocolDecoderauriol_TH instance * @param context Pointer to a WSProtocolDecoderAuriol_TH instance
* @param output Resulting text * @param output Resulting text
*/ */
void ws_protocol_decoder_auriol_th_get_string(void* context, FuriString* output); void ws_protocol_decoder_auriol_th_get_string(void* context, FuriString* output);