X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_cc115l.c;h=56afc3c75229c98aed314f1a92eca82ae4b6ed69;hp=6da1a6786a88e9af3285d529b3f28e790d909138;hb=d95a2c5d1ddce913dcb1d1ab5dc59f6a588ab599;hpb=bd32140df2a595ce66d603b98516bae519327c5d

diff --git a/src/drivers/ao_cc115l.c b/src/drivers/ao_cc115l.c
index 6da1a678..56afc3c7 100644
--- a/src/drivers/ao_cc115l.c
+++ b/src/drivers/ao_cc115l.c
@@ -23,7 +23,7 @@
 
 #define AO_RADIO_MAX_SEND	sizeof (struct ao_telemetry_generic)
 
-static uint8_t ao_radio_mutex;
+uint8_t ao_radio_mutex;
 
 static uint8_t ao_radio_fifo;		/* fifo drained interrupt received */
 static uint8_t ao_radio_done;		/* tx done interrupt received */
@@ -33,7 +33,7 @@ static uint8_t ao_radio_mcu_wake;	/* MARC status change */
 static uint8_t ao_radio_marcstate;	/* Last read MARC state value */
 
 /* Debugging commands */
-#define CC115L_DEBUG	1
+#define CC115L_DEBUG	0
 
 /* Runtime tracing */
 #define CC115L_TRACE	0
@@ -328,11 +328,13 @@ static const uint16_t rdf_setup[] = {
 };
 
 /*
- * APRS deviation is the same as RDF
+ * APRS deviation is 3kHz
+ *
+ * 26e6 / (2 ** 17) * (8 + 7) * (2 ** 0) = 2975
  */
 
-#define APRS_DEV_E	RDF_DEV_E
-#define APRS_DEV_M	RDF_DEV_M
+#define APRS_DEV_E	0
+#define APRS_DEV_M	7
 
 /*
  * For our APRS beacon, set the symbol rate to 9.6kBaud (8x oversampling for 1200 baud data rate)
@@ -442,15 +444,10 @@ static const uint16_t radio_setup[] = {
 	AO_CC115L_DONE_INT_GPIO_IOCFG,	    CC115L_IOCFG_GPIO_CFG_PA_PD | (1 << CC115L_IOCFG_GPIO_INV),
 
         CC115L_FIFOTHR,                     0x47,       /* TX FIFO Thresholds */
-        CC115L_FREQ2,                       0x10,       /* Frequency Control Word, High Byte */
-        CC115L_FREQ1,                       0xb6,       /* Frequency Control Word, Middle Byte */
-        CC115L_FREQ0,                       0xa5,       /* Frequency Control Word, Low Byte */
-        CC115L_MDMCFG2,                     0x13,       /* Modem Configuration */
 	CC115L_MDMCFG1,			    (0x00 |
 					     (CC115L_MDMCFG1_NUM_PREAMBLE_4 << CC115L_MDMCFG1_NUM_PREAMBLE) |
 					     (1 << CC115L_MDMCFG1_CHANSPC_E)),
 	CC115L_MDMCFG0,			    248,	/* Channel spacing M value (100kHz channels) */
-        CC115L_DEVIATN,                     0x35,       /* Modem Deviation Setting */
         CC115L_MCSM0,                       0x38,       /* Main Radio Control State Machine Configuration */
         CC115L_RESERVED_0X20,               0xfb,       /* Use setting from SmartRF Studio */
         CC115L_FSCAL3,                      0xe9,       /* Frequency Synthesizer Calibration */
@@ -460,7 +457,6 @@ static const uint16_t radio_setup[] = {
         CC115L_TEST2,                       0x81,       /* Various Test Settings */
         CC115L_TEST1,                       0x35,       /* Various Test Settings */
         CC115L_TEST0,                       0x09,       /* Various Test Settings */
-	CC115L_PA,		     	    0x00,	/* Power setting (as low as possible) */
 };
 
 static uint8_t	ao_radio_configured = 0;
@@ -516,7 +512,7 @@ ao_radio_get(void)
 }
 
 static void
-ao_radio_send_lots(ao_radio_fill_func fill, uint8_t mode);
+_ao_radio_send_lots(ao_radio_fill_func fill, uint8_t mode);
 
 #define ao_radio_put()	ao_mutex_put(&ao_radio_mutex)
 
@@ -569,10 +565,12 @@ ao_radio_tone_fill(uint8_t *buf, int16_t len)
 static void
 ao_radio_tone_run(struct ao_radio_tone *tones, int ntones)
 {
+	ao_radio_get();
 	ao_radio_tone = tones;
 	ao_radio_tone_current = 0;
 	ao_radio_tone_offset = 0;
-	ao_radio_send_lots(ao_radio_tone_fill, AO_RADIO_MODE_RDF);
+	_ao_radio_send_lots(ao_radio_tone_fill, AO_RADIO_MODE_RDF);
+	ao_radio_put();
 }
 
 void
@@ -636,7 +634,7 @@ ao_radio_test_cmd(void)
 #endif
 		ao_radio_get();
 		ao_radio_set_len(0xff);
-		ao_radio_set_mode(AO_RADIO_MODE_PACKET_TX | AO_RADIO_MODE_BITS_FIXED);
+		ao_radio_set_mode(AO_RADIO_MODE_RDF|AO_RADIO_MODE_BITS_FIXED);
 		ao_radio_strobe(CC115L_SFTX);
 		ao_radio_pa_on();
 		ao_radio_strobe(CC115L_STX);
@@ -657,12 +655,14 @@ ao_radio_test_cmd(void)
 	}
 }
 
+#if CC115L_TRACE
 static inline int16_t
 ao_radio_gpio_bits(void)
 {
 	return AO_CC115L_DONE_INT_PORT->idr & ((1 << AO_CC115L_FIFO_INT_PIN) |
 					       (1 << AO_CC115L_DONE_INT_PIN));
 }
+#endif
 
 static void
 ao_radio_wait_fifo(void)
@@ -718,15 +718,19 @@ ao_radio_send_fill(uint8_t *buf, int16_t len)
 void
 ao_radio_send(const void *d, uint8_t size)
 {
+	int i;
+
+	ao_radio_get();
 	ao_radio_send_len = ao_fec_encode(d, size, tx_data);
 	ao_radio_send_buf = tx_data;
-	ao_radio_send_lots(ao_radio_send_fill, AO_RADIO_MODE_PACKET_TX);
+	_ao_radio_send_lots(ao_radio_send_fill, AO_RADIO_MODE_PACKET_TX);
+	ao_radio_put();
 }
 
 #define AO_RADIO_LOTS	64
 
 static void
-ao_radio_send_lots(ao_radio_fill_func fill, uint8_t mode)
+_ao_radio_send_lots(ao_radio_fill_func fill, uint8_t mode)
 {
 	uint8_t	buf[AO_RADIO_LOTS], *b;
 	int	cnt;
@@ -735,7 +739,6 @@ ao_radio_send_lots(ao_radio_fill_func fill, uint8_t mode)
 	uint8_t	started = 0;
 	uint8_t	fifo_space;
 
-	ao_radio_get();
 	fifo_space = CC115L_FIFO_SIZE;
 	ao_radio_done = 0;
 	ao_radio_fifo = 0;
@@ -795,13 +798,14 @@ ao_radio_send_lots(ao_radio_fill_func fill, uint8_t mode)
 		ao_radio_idle();
 	ao_radio_wait_done();
 	ao_radio_pa_off();
-	ao_radio_put();
 }
 
 void
 ao_radio_send_aprs(ao_radio_fill_func fill)
 {
-	ao_radio_send_lots(fill, AO_RADIO_MODE_APRS);
+	ao_radio_get();
+	_ao_radio_send_lots(fill, AO_RADIO_MODE_APRS);
+	ao_radio_put();
 }
 
 #if CC115L_DEBUG