From 1d3ed7862283c30561b735ab3d8458b3edbb1698 Mon Sep 17 00:00:00 2001 From: pascallanger Date: Sat, 4 May 2024 11:34:59 +0200 Subject: [PATCH] J6Pro update --- Multiprotocol/CYRF6936_SPI.ino | 4 +--- Multiprotocol/J6Pro_cyrf6936.ino | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Multiprotocol/CYRF6936_SPI.ino b/Multiprotocol/CYRF6936_SPI.ino index 37b39ee..cbb6d52 100644 --- a/Multiprotocol/CYRF6936_SPI.ino +++ b/Multiprotocol/CYRF6936_SPI.ino @@ -326,9 +326,7 @@ const uint8_t PROGMEM DEVO_j6pro_sopcodes[][8] = { {0xB6, 0x31, 0xAE, 0x46, 0x5A, 0xCC, 0xAE, 0x46}, {0x9E, 0x82, 0xDC, 0x3C, 0xA1, 0x78, 0xDC, 0x3C}, {0x6F, 0x65, 0x18, 0x74, 0xB9, 0x8E, 0x19, 0x74}, -#endif -#if defined(TRAXXAS_CYRF6936_INO) - {0x62, 0xDF, 0xC1, 0x49, 0xDF, 0xB1, 0xC0, 0x49}, + {0x62, 0xDF, 0xC1, 0x49, 0xDF, 0xB1, 0xC0, 0x49}, //j6pro bind #endif }; #endif diff --git a/Multiprotocol/J6Pro_cyrf6936.ino b/Multiprotocol/J6Pro_cyrf6936.ino index 11caa0c..582b2e5 100644 --- a/Multiprotocol/J6Pro_cyrf6936.ino +++ b/Multiprotocol/J6Pro_cyrf6936.ino @@ -35,7 +35,6 @@ enum PktState { J6PRO_CHAN_4, }; -const uint8_t PROGMEM j6pro_bind_sop_code[] = {0x62, 0xdf, 0xc1, 0x49, 0xdf, 0xb1, 0xc0, 0x49}; const uint8_t j6pro_data_code[] = {0x02, 0xf9, 0x93, 0x97, 0x02, 0xfa, 0x5c, 0xe3, 0x01, 0x2b, 0xf1, 0xdb, 0x01, 0x32, 0xbe, 0x6f}; // unneeded since this is the default table after a reset static void __attribute__((unused)) j6pro_build_bind_packet() @@ -99,7 +98,7 @@ static void __attribute__((unused)) cyrf_bindinit() /* Use when binding */ CYRF_SetPower(0x28); //Deviation using max power, replaced by bind power... //CYRF_ConfigRFChannel(0x52); - CYRF_PROGMEM_ConfigSOPCode(j6pro_bind_sop_code); + CYRF_PROGMEM_ConfigSOPCode(DEVO_j6pro_sopcodes[19]); CYRF_ConfigCRCSeed(0x0000); //CYRF_WriteRegister(CYRF_06_RX_CFG, 0x4a); //CYRF_WriteRegister(CYRF_05_RX_CTRL, 0x80);