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 remote-tracking branch 'ul/dev' into mntm-dev

Browse Source
This commit is contained in:
Willy-JL
2025-02-28 02:29:29 +00:00
parent 262572bcfd edd42d34c6
commit 2f376edd7d
105 changed files with 1676 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lib/subghz/protocols/came_atomo.c
View File

@@ -220,8 +220,10 @@ static void subghz_protocol_encoder_came_atomo_get_upload(
instance->encoder.upload[index++] =
level_duration_make(false, (uint32_t)subghz_protocol_came_atomo_const.te_long * 60);
// Btn counter 0x0 - 0x7F
pack[0] = 0;
for(uint8_t i = 0; i < 8; i++) {
pack[0] = (instance->generic.data_2 >> 56);
//pack[0] = (instance->generic.data_2 >> 56);
pack[1] = (instance->generic.cnt >> 8);
pack[2] = (instance->generic.cnt & 0xFF);
pack[3] = ((instance->generic.data_2 >> 32) & 0xFF);
@@ -230,11 +232,42 @@ static void subghz_protocol_encoder_came_atomo_get_upload(
pack[6] = ((instance->generic.data_2 >> 8) & 0xFF);
pack[7] = (btn << 4);
if(pack[0] == 0x7F) {
/* if(pack[0] == 0x7F) {
pack[0] = 0;
} else {
pack[0] += (i + 1);
}
*/
switch(i) {
case 0:
pack[0] = 10; // 0A
break;
case 1:
pack[0] = 30;
break;
case 2:
pack[0] = 125; // 7D
break;
case 3:
pack[0] = 126; // 7E
break;
case 4:
pack[0] = 127; // 7F
break;
case 5:
pack[0] = 0; // 00
break;
case 6:
pack[0] = 1; // 01
break;
case 7:
pack[0] = 3;
break;
default:
break;
}
// 10 50 125 126 127 0 1 2
atomo_encrypt(pack);
uint32_t hi = pack[0] << 24 | pack[1] << 16 | pack[2] << 8 | pack[3];
@@ -523,7 +556,8 @@ static void subghz_protocol_came_atomo_remote_controller(SubGhzBlockGeneric* ins
* 0x931dfb16c0b1 ^ 0xXXXXXXXXXXXXXXXX = 0xEF3ED0F7D9EF
* 0xEF3 ED0F7D9E F => 0xEF3 - CNT, 0xED0F7D9E - SN, 0xF - key
*
* ***Eng1n33r ver. (actual)***
* ***Actual***
* Button hold-cycle counter (8-bit, from 0 to 0x7F) should DO full cycle or half cycle keeping values like zero
* 0x1FF08D9924984115 - received data
* 0x00F7266DB67BEEA0 - inverted data
* 0x0501FD0000A08300 - decrypted data,
@@ -722,7 +756,7 @@ void subghz_protocol_decoder_came_atomo_get_string(void* context, FuriString* ou
"%s %db\r\n"
"Key:%08lX%08lX\r\n"
"Sn:0x%08lX Btn:%01X\r\n"
"Pcl_Cnt:0x%04lX\r\n"
"Cnt:0x%04lX\r\n"
"Btn_Cnt:0x%02X",
instance->generic.protocol_name,