X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_cc1120_CC1120.h;h=c0f35a23cc6e2c046c358db28e61258ff549046c;hp=1799c2748ffc5023de7c1d3513f0479f33ea132d;hb=e6d236fdc615625fbbf28377453f920729e49b0f;hpb=6a973f788563ccc66b01cc7557a004dabef18d09

diff --git a/src/drivers/ao_cc1120_CC1120.h b/src/drivers/ao_cc1120_CC1120.h
index 1799c274..c0f35a23 100644
--- a/src/drivers/ao_cc1120_CC1120.h
+++ b/src/drivers/ao_cc1120_CC1120.h
@@ -21,29 +21,27 @@
  *
  ***************************************************************/
 
-        CC1120_SYNC3,                          0x93,       /* Sync Word Configuration [31:24] */
-        CC1120_SYNC2,                          0x0b,       /* Sync Word Configuration [23:16] */
-        CC1120_SYNC1,                          0x51,       /* Sync Word Configuration [15:8] */
-        CC1120_SYNC0,                          0xde,       /* Sync Word Configuration [7:0] */
+        CC1120_SYNC3,                          0xD3,       /* Sync Word Configuration [31:24] */
+        CC1120_SYNC2,                          0x91,       /* Sync Word Configuration [23:16] */
+        CC1120_SYNC1,                          0xD3,       /* Sync Word Configuration [15:8] */
+        CC1120_SYNC0,                          0x91,       /* Sync Word Configuration [7:0] */
+
         CC1120_SYNC_CFG1,                      0x08,       /* Sync Word Detection Configuration */
-        CC1120_SYNC_CFG0,                      0x17,       /* Sync Word Length Configuration */
-#if 0
-        CC1120_DEVIATION_M,                    0x50,       /* Frequency Deviation Configuration */
-        CC1120_MODCFG_DEV_E,                   0x0d,       /* Modulation Format and Frequency Deviation Configuration */
-#endif
+        CC1120_SYNC_CFG0,
+		(CC1120_SYNC_CFG0_SYNC_MODE_16_BITS << CC1120_SYNC_CFG0_SYNC_MODE) |
+		(CC1120_SYNC_CFG0_SYNC_NUM_ERROR_2 << CC1120_SYNC_CFG0_SYNC_NUM_ERROR),
         CC1120_DCFILT_CFG,                     0x1c,       /* Digital DC Removal Configuration */
-        CC1120_PREAMBLE_CFG1,                  0x18,       /* Preamble Length Configuration */
+        CC1120_PREAMBLE_CFG1,                         	   /* Preamble Length Configuration */
+		(CC1120_PREAMBLE_CFG1_NUM_PREAMBLE_4_BYTES << CC1120_PREAMBLE_CFG1_NUM_PREAMBLE) |
+		(CC1120_PREAMBLE_CFG1_PREAMBLE_WORD_AA << CC1120_PREAMBLE_CFG1_PREAMBLE_WORD),
         CC1120_PREAMBLE_CFG0,                  0x2a,       /*  */
         CC1120_FREQ_IF_CFG,                    0x40,       /* RX Mixer Frequency Configuration */
         CC1120_IQIC,                           0x46,       /* Digital Image Channel Compensation Configuration */
         CC1120_CHAN_BW,                        0x02,       /* Channel Filter Configuration */
+
         CC1120_MDMCFG1,                        0x46,       /* General Modem Parameter Configuration */
         CC1120_MDMCFG0,                        0x05,       /* General Modem Parameter Configuration */
-#if 0
-        CC1120_DRATE2,                         0x93,       /* Data Rate Configuration Exponent and Mantissa [19:16] */
-        CC1120_DRATE1,                         0xa4,       /* Data Rate Configuration Mantissa [15:8] */
-        CC1120_DRATE0,                         0x00,       /* Data Rate Configuration Mantissa [7:0] */
-#endif
+
         CC1120_AGC_REF,                        0x20,       /* AGC Reference Level Configuration */
         CC1120_AGC_CS_THR,                     0x19,       /* Carrier Sense Threshold Configuration */
         CC1120_AGC_GAIN_ADJUST,                0x00,       /* RSSI Offset Configuration */
@@ -68,10 +66,11 @@
         CC1120_PKT_CFG2,                       0x04,       /* Packet Configuration, Reg 2 */
         CC1120_PKT_CFG1,                       0x45,       /* Packet Configuration, Reg 1 */
 #endif
-        CC1120_PKT_CFG0,                       0x20,       /* Packet Configuration, Reg 0 */
+        CC1120_PKT_CFG0,                       0x00,       /* Packet Configuration, Reg 0 */
         CC1120_RFEND_CFG1,                     0x0f,       /* RFEND Configuration, Reg 1 */
         CC1120_RFEND_CFG0,                     0x00,       /* RFEND Configuration, Reg 0 */
-        CC1120_PA_CFG2,                        0x3f,       /* Power Amplifier Configuration, Reg 2 */
+	//        CC1120_PA_CFG2,                        0x3f,       /* Power Amplifier Configuration, Reg 2 */
+	CC1120_PA_CFG2,                        0x23,       /* Power Amplifier Configuration, Reg 2 */
         CC1120_PA_CFG1,                        0x56,       /* Power Amplifier Configuration, Reg 1 */
         CC1120_PA_CFG0,                        0x7b,       /* Power Amplifier Configuration, Reg 0 */
         CC1120_PKT_LEN,                        0xff,       /* Packet Length Configuration */
@@ -87,9 +86,6 @@
         CC1120_RCCAL_OFFSET,                   0x00,       /* RC Oscillator Calibration Clock Offset */
         CC1120_FREQOFF1,                       0x00,       /* Frequency Offset (MSB) */
         CC1120_FREQOFF0,                       0x00,       /* Frequency Offset (LSB) */
-        CC1120_FREQ2,                          0x6c,       /* Frequency Configuration [23:16] */
-        CC1120_FREQ1,                          0xa3,       /* Frequency Configuration [15:8] */
-        CC1120_FREQ0,                          0x33,       /* Frequency Configuration [7:0] */
         CC1120_IF_ADC2,                        0x02,       /* Analog to Digital Converter Configuration, Reg 2 */
         CC1120_IF_ADC1,                        0xa6,       /* Analog to Digital Converter Configuration, Reg 1 */
         CC1120_IF_ADC0,                        0x04,       /* Analog to Digital Converter Configuration, Reg 0 */