Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-28 01:58:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'DarkFlippers:dev' into 420

Browse Source
This commit is contained in:
RogueMaster
2022-11-24 09:05:13 -05:00
committed by GitHub
parent ca59aea6a2 bf62f66dc8
commit db3676ee8a
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/subghz/protocols/keeloq.c
+5 -1
View File
@@ -137,7 +137,11 @@ void subghz_protocol_encoder_keeloq_free(void* context) {
* @param btn Button number, 4 bit * @param btn Button number, 4 bit
*/ */
static bool subghz_protocol_keeloq_gen_data(SubGhzProtocolEncoderKeeloq* instance, uint8_t btn) { static bool subghz_protocol_keeloq_gen_data(SubGhzProtocolEncoderKeeloq* instance, uint8_t btn) {
instance->generic.cnt++; if(instance->generic.cnt < 0xFFFF) {
instance->generic.cnt++;
} else if(instance->generic.cnt >= 0xFFFF) {
instance->generic.cnt = 0;
}
uint32_t fix = btn << 28 | instance->generic.serial; uint32_t fix = btn << 28 | instance->generic.serial;
uint32_t decrypt = btn << 28 | uint32_t decrypt = btn << 28 |
(instance->generic.serial & 0x3FF) (instance->generic.serial & 0x3FF)
lib/subghz/protocols/star_line.c
+5 -1
View File
@@ -138,7 +138,11 @@ void subghz_protocol_encoder_star_line_free(void* context) {
*/ */
static bool static bool
subghz_protocol_star_line_gen_data(SubGhzProtocolEncoderStarLine* instance, uint8_t btn) { subghz_protocol_star_line_gen_data(SubGhzProtocolEncoderStarLine* instance, uint8_t btn) {
instance->generic.cnt++; if(instance->generic.cnt < 0xFFFF) {
instance->generic.cnt++;
} else if(instance->generic.cnt >= 0xFFFF) {
instance->generic.cnt = 0;
}
uint32_t fix = btn << 24 | instance->generic.serial; uint32_t fix = btn << 24 | instance->generic.serial;
uint32_t decrypt = btn << 24 | (instance->generic.serial & 0xFF) << 16 | instance->generic.cnt; uint32_t decrypt = btn << 24 | (instance->generic.serial & 0xFF) << 16 | instance->generic.cnt;
uint32_t hop = 0; uint32_t hop = 0;