X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_cc115l.c;h=cf61acfe9c4ae45a6def0d88caf05c8d3d0dac96;hp=30c56442093a5671f20ca088d2c569403f08ef2e;hb=b4eba3f3a58a9c35e3699ff14405b997c1318d91;hpb=2f7015afcca7c6042365d2124d3a5b7219e8e588

diff --git a/src/drivers/ao_cc115l.c b/src/drivers/ao_cc115l.c
index 30c56442..cf61acfe 100644
--- a/src/drivers/ao_cc115l.c
+++ b/src/drivers/ao_cc115l.c
@@ -29,8 +29,6 @@ static uint8_t ao_radio_fifo;		/* fifo drained interrupt received */
 static uint8_t ao_radio_done;		/* tx done interrupt received */
 static uint8_t ao_radio_wake;		/* sleep address for radio interrupts */
 static uint8_t ao_radio_abort;		/* radio operation should abort */
-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	0
@@ -54,8 +52,8 @@ struct ao_cc115l_reg {
 
 #if CC115L_TRACE
 
-const static struct ao_cc115l_reg ao_cc115l_reg[];
-const static char *cc115l_state_name[];
+static const struct ao_cc115l_reg ao_cc115l_reg[];
+static const char *cc115l_state_name[];
 
 enum ao_cc115l_trace_type {
 	trace_strobe,
@@ -90,6 +88,8 @@ static void trace_add(enum ao_cc115l_trace_type type, int16_t addr, int16_t valu
 	case trace_strobe:
 		comment = cc115l_state_name[(value >> 4) & 0x7];
 		break;
+	default:
+		break;
 	}
 	trace[trace_i].type = type;
 	trace[trace_i].addr = addr;
@@ -106,7 +106,6 @@ static uint8_t
 ao_radio_reg_read(uint8_t addr)
 {
 	uint8_t	data[1];
-	uint8_t	d;
 
 	data[0] = ((1 << CC115L_READ)  |
 		   (0 << CC115L_BURST) |
@@ -123,7 +122,6 @@ static void
 ao_radio_reg_write(uint8_t addr, uint8_t value)
 {
 	uint8_t	data[2];
-	uint8_t	d;
 
 	trace_add(trace_write, addr, value, NULL);
 	data[0] = ((0 << CC115L_READ)  |
@@ -135,11 +133,11 @@ ao_radio_reg_write(uint8_t addr, uint8_t value)
 	ao_radio_deselect();
 }
 
+#if UNUSED
 static void
 ao_radio_burst_read_start (uint16_t addr)
 {
 	uint8_t data[1];
-	uint8_t d;
 
 	data[0] = ((1 << CC115L_READ)  |
 		   (1 << CC115L_BURST) |
@@ -153,6 +151,7 @@ ao_radio_burst_read_stop (void)
 {
 	ao_radio_deselect();
 }
+#endif
 
 
 static uint8_t
@@ -200,20 +199,22 @@ ao_radio_tx_fifo_space(void)
 	return CC115L_FIFO_SIZE - (ao_radio_reg_read(CC115L_TXBYTES) & CC115L_TXBYTES_NUM_TX_BYTES_MASK);
 }
 
+#if CC115L_DEBUG
 static uint8_t
 ao_radio_status(void)
 {
 	return ao_radio_strobe (CC115L_SNOP);
 }
 
-#define ao_radio_rdf_value 0x55
-
 static uint8_t
 ao_radio_get_marcstate(void)
 {
 	return ao_radio_reg_read(CC115L_MARCSTATE) & CC115L_MARCSTATE_MASK;
 }
-	  
+#endif
+
+#define ao_radio_rdf_value 0x55
+
 static void
 ao_radio_done_isr(void)
 {
@@ -232,11 +233,6 @@ ao_radio_fifo_isr(void)
 	ao_wakeup(&ao_radio_wake);
 }
 
-static void
-ao_radio_start_tx(void)
-{
-}
-
 static void
 ao_radio_idle(void)
 {
@@ -245,42 +241,89 @@ ao_radio_idle(void)
 		uint8_t	state = ao_radio_strobe(CC115L_SIDLE);
 		if ((state >> CC115L_STATUS_STATE) == CC115L_STATUS_STATE_IDLE)
 			break;
+		if ((state >> CC115L_STATUS_STATE) == CC115L_STATUS_STATE_TX_FIFO_UNDERFLOW)
+			ao_radio_strobe(CC115L_SFTX);
 	}
 	/* Flush any pending TX bytes */
 	ao_radio_strobe(CC115L_SFTX);
 }
 
 /*
- * Packet deviation is 20.5kHz
+ * Packet deviation
  *
  *	fdev = fosc >> 17 * (8 + dev_m) << dev_e
  *
+ * For 38400 baud, use 20.5kHz:
+ *
  *     	26e6 / (2 ** 17) * (8 + 5) * (2 ** 3) = 20630Hz
+ *
+ * For 9600 baud, use 5.125kHz:
+ *
+ *     	26e6 / (2 ** 17) * (8 + 5) * (2 ** 1) = 5157Hz
+ *
+ * For 2400 baud, use 1.5kHz:
+ *
+ *     	26e6 / (2 ** 17) * (8 + 0) * (2 ** 0) = 1587Hz
  */
 
-#define PACKET_DEV_E	3
-#define PACKET_DEV_M	5
+#define PACKET_DEV_E_384	3
+#define PACKET_DEV_M_384	5
+
+#define PACKET_DEV_E_96		1
+#define PACKET_DEV_M_96		5
+
+#define PACKET_DEV_E_24		0
+#define PACKET_DEV_M_24		0
 
 /*
- * For our packet data, set the symbol rate to 38400 Baud
+ * For our packet data:
  *
  *              (256 + DATARATE_M) * 2 ** DATARATE_E
  *	Rdata = -------------------------------------- * fosc
  *		             2 ** 28
  *
+ * For 38400 baud:
+ *
  *		(256 + 131) * (2 ** 10) / (2**28) * 26e6 = 38383
  *
  *	DATARATE_M = 131
- *	DATARATE_E = 10
+ *	DATARATE_E_384 = 10
+ *	DATARATE_E_96 = 8
+ *	DATARATE_E_24 = 6
  */
-#define PACKET_DRATE_E	10
-#define PACKET_DRATE_M	131
+#define PACKET_DRATE_M		131
+
+#define PACKET_DRATE_E_384	10
+#define PACKET_DRATE_E_96	8
+#define PACKET_DRATE_E_24	6
+
+static const struct {
+	uint8_t		mdmcfg4;
+	uint8_t		deviatn;
+} packet_rate_setup[] = {
+	[AO_RADIO_RATE_38400] = {
+		.mdmcfg4 = ((0xf << 4) |
+			    (PACKET_DRATE_E_384 << CC115L_MDMCFG4_DRATE_E)),
+		.deviatn = ((PACKET_DEV_E_384 << CC115L_DEVIATN_DEVIATION_E) |
+			    (PACKET_DEV_M_384 << CC115L_DEVIATN_DEVIATION_M)),
+	},
+
+	[AO_RADIO_RATE_9600] = {
+		.mdmcfg4 = ((0xf << 4) |
+			    (PACKET_DRATE_E_96 << CC115L_MDMCFG4_DRATE_E)),
+		.deviatn = ((PACKET_DEV_E_96 << CC115L_DEVIATN_DEVIATION_E) |
+			    (PACKET_DEV_M_96 << CC115L_DEVIATN_DEVIATION_M)),
+	},
+
+	[AO_RADIO_RATE_2400] = {
+		.mdmcfg4 = ((0xf << 4) |
+			    (PACKET_DRATE_E_24 << CC115L_MDMCFG4_DRATE_E)),
+		.deviatn = ((PACKET_DEV_E_24 << CC115L_DEVIATN_DEVIATION_E) |
+			    (PACKET_DEV_M_24 << CC115L_DEVIATN_DEVIATION_M)),
+	},
+};
 
 static const uint16_t packet_setup[] = {
-	CC115L_DEVIATN,		((PACKET_DEV_E << CC115L_DEVIATN_DEVIATION_E) |
-				 (PACKET_DEV_M << CC115L_DEVIATN_DEVIATION_M)),
-	CC115L_MDMCFG4,		((0xf << 4) |
-				 (PACKET_DRATE_E << CC115L_MDMCFG4_DRATE_E)),
 	CC115L_MDMCFG3,		(PACKET_DRATE_M),
 	CC115L_MDMCFG2,		(0x00 |
 				 (CC115L_MDMCFG2_MOD_FORMAT_GFSK << CC115L_MDMCFG2_MOD_FORMAT) |
@@ -328,11 +371,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)
@@ -397,15 +442,19 @@ static void
 ao_radio_set_mode(uint16_t new_mode)
 {
 	uint16_t changes;
-	int i;
+	unsigned int i;
 
 	if (new_mode == ao_radio_mode)
 		return;
 
 	changes = new_mode & (~ao_radio_mode);
-	if (changes & AO_RADIO_MODE_BITS_PACKET_TX)
+	if (changes & AO_RADIO_MODE_BITS_PACKET_TX) {
+		ao_radio_reg_write(CC115L_MDMCFG4, packet_rate_setup[ao_config.radio_rate].mdmcfg4);
+		ao_radio_reg_write(CC115L_DEVIATN, packet_rate_setup[ao_config.radio_rate].deviatn);
+
 		for (i = 0; i < sizeof (packet_setup) / sizeof (packet_setup[0]); i += 2)
 			ao_radio_reg_write(packet_setup[i], packet_setup[i+1]);
+	}
 
 	if (changes & AO_RADIO_MODE_BITS_RDF)
 		for (i = 0; i < sizeof (rdf_setup) / sizeof (rdf_setup[0]); i += 2)
@@ -462,7 +511,7 @@ static uint8_t	ao_radio_configured = 0;
 static void
 ao_radio_setup(void)
 {
-	int	i;
+	unsigned int	i;
 
 	ao_radio_strobe(CC115L_SRES);
 	ao_delay(AO_MS_TO_TICKS(10));
@@ -474,6 +523,8 @@ ao_radio_setup(void)
 
 	ao_config_get();
 
+	ao_radio_strobe(CC115L_SCAL);
+
 	ao_radio_configured = 1;
 }
 
@@ -492,7 +543,7 @@ static void
 ao_radio_get(void)
 {
 	static uint32_t	last_radio_setting;
-	static uint8_t	last_power_setting;
+	static uint8_t	last_radio_rate;
 
 	ao_mutex_get(&ao_radio_mutex);
 	if (!ao_radio_configured)
@@ -503,9 +554,9 @@ ao_radio_get(void)
 		ao_radio_reg_write(CC115L_FREQ0, ao_config.radio_setting);
 		last_radio_setting = ao_config.radio_setting;
 	}
-	if (ao_config.radio_power != last_power_setting) {
-		ao_radio_reg_write(CC115L_PA, ao_config.radio_power);
-		last_power_setting = ao_config.radio_power;
+	if (ao_config.radio_rate != last_radio_rate) {
+		ao_radio_mode &= ~AO_RADIO_MODE_BITS_PACKET_TX;
+		last_radio_rate = ao_config.radio_rate;
 	}
 }
 
@@ -567,6 +618,7 @@ ao_radio_tone_run(struct ao_radio_tone *tones, int ntones)
 	ao_radio_tone = tones;
 	ao_radio_tone_current = 0;
 	ao_radio_tone_offset = 0;
+	ao_radio_tone_count = ntones;
 	_ao_radio_send_lots(ao_radio_tone_fill, AO_RADIO_MODE_RDF);
 	ao_radio_put();
 }
@@ -612,6 +664,27 @@ ao_radio_rdf_abort(void)
 	ao_wakeup(&ao_radio_wake);
 }
 
+#define POWER_STEP	0x08
+
+#if HAS_RADIO_POWER
+#define RADIO_POWER	ao_config.radio_power
+#else
+#define RADIO_POWER	0xc0
+#endif
+
+static void
+ao_radio_stx(void)
+{
+	uint8_t	power;
+	ao_radio_pa_on();
+	ao_radio_reg_write(CC115L_PA, 0);
+	ao_radio_strobe(CC115L_STX);
+	for (power = POWER_STEP; power < RADIO_POWER; power += POWER_STEP)
+		ao_radio_reg_write(CC115L_PA, power);
+	if (power != RADIO_POWER)
+		ao_radio_reg_write(CC115L_PA, RADIO_POWER);
+}
+
 static void
 ao_radio_test_cmd(void)
 {
@@ -631,11 +704,10 @@ ao_radio_test_cmd(void)
 		ao_packet_slave_stop();
 #endif
 		ao_radio_get();
-		ao_radio_set_len(0xff);
-		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);
+		ao_radio_set_len(0xff);
+		ao_radio_set_mode(AO_RADIO_MODE_RDF);
+		ao_radio_stx();
 		radio_on = 1;
 	}
 	if (mode == 3) {
@@ -653,12 +725,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));
+	return ((ao_gpio_get(AO_CC115L_DONE_INT_PORT, AO_CC115L_DONE_INT_PIN, AO_CC115L_DONE_INT) << 1) |
+		ao_gpio_get(AO_CC115L_FIFO_INT_PORT, AO_CC115L_FIFO_INT_PIN, AO_CC115L_FIFO_INT));
 }
+#endif
 
 static void
 ao_radio_wait_fifo(void)
@@ -714,8 +788,6 @@ 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;
@@ -736,6 +808,10 @@ _ao_radio_send_lots(ao_radio_fill_func fill, uint8_t mode)
 	uint8_t	fifo_space;
 
 	fifo_space = CC115L_FIFO_SIZE;
+	ao_radio_abort = 0;
+
+	ao_radio_strobe(CC115L_SFTX);
+
 	ao_radio_done = 0;
 	ao_radio_fifo = 0;
 	while (!done) {
@@ -782,8 +858,7 @@ _ao_radio_send_lots(ao_radio_fill_func fill, uint8_t mode)
 			ao_exti_enable(AO_CC115L_DONE_INT_PORT, AO_CC115L_DONE_INT_PIN);
 
 			if (!started) {
-				ao_radio_pa_on();
-				ao_radio_strobe(CC115L_STX);
+				ao_radio_stx();
 				started = 1;
 			}
 		}
@@ -805,7 +880,7 @@ ao_radio_send_aprs(ao_radio_fill_func fill)
 }
 
 #if CC115L_DEBUG
-const static char *cc115l_state_name[] = {
+static const char *cc115l_state_name[] = {
 	[CC115L_STATUS_STATE_IDLE] = "IDLE",
 	[CC115L_STATUS_STATE_TX] = "TX",
 	[CC115L_STATUS_STATE_FSTXON] = "FSTXON",
@@ -814,7 +889,7 @@ const static char *cc115l_state_name[] = {
 	[CC115L_STATUS_STATE_TX_FIFO_UNDERFLOW] = "TX_FIFO_UNDERFLOW",
 };
 
-const static struct ao_cc115l_reg ao_cc115l_reg[] = {
+static const struct ao_cc115l_reg ao_cc115l_reg[] = {
 	{ .addr = CC115L_IOCFG2, .name = "IOCFG2" },
 	{ .addr = CC115L_IOCFG1, .name = "IOCFG1" },
 	{ .addr = CC115L_IOCFG0, .name = "IOCFG0" },
@@ -860,7 +935,7 @@ const static struct ao_cc115l_reg ao_cc115l_reg[] = {
 
 static void ao_radio_show(void) {
 	uint8_t	status = ao_radio_status();
-	int	i;
+	unsigned int	i;
 
 	ao_radio_get();
 	status = ao_radio_status();
@@ -893,7 +968,6 @@ static void ao_radio_packet(void) {
 	ao_radio_send(packet, sizeof (packet));
 }
 
-#endif /* CC115L_DEBUG */
 
 #if HAS_APRS
 #include <ao_aprs.h>
@@ -907,6 +981,7 @@ ao_radio_aprs()
 	ao_aprs_send();
 }
 #endif
+#endif /* CC115L_DEBUG */
 
 static const struct ao_cmds ao_radio_cmds[] = {
 	{ ao_radio_test_cmd,	"C <1 start, 0 stop, none both>\0Radio carrier test" },
@@ -924,7 +999,9 @@ static const struct ao_cmds ao_radio_cmds[] = {
 void
 ao_radio_init(void)
 {
+#if 0
 	int	i;
+#endif
 
 	ao_radio_configured = 0;
 	ao_spi_init_cs (AO_CC115L_SPI_CS_PORT, (1 << AO_CC115L_SPI_CS_PIN));