summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/drivers/ao_cc1120.c6
-rw-r--r--src/megadongle-v0.1/ao_pins.h4
2 files changed, 7 insertions, 3 deletions
diff --git a/src/drivers/ao_cc1120.c b/src/drivers/ao_cc1120.c
index 3e894f76..63d2f955 100644
--- a/src/drivers/ao_cc1120.c
+++ b/src/drivers/ao_cc1120.c
@@ -1195,7 +1195,7 @@ static void ao_radio_show(void) {
}
static void ao_radio_beep(void) {
- ao_radio_rdf(RDF_PACKET_LEN);
+ ao_radio_rdf();
}
static void ao_radio_packet(void) {
@@ -1231,6 +1231,7 @@ ao_radio_test_recv()
}
}
+#if HAS_APRS
#include <ao_aprs.h>
static void
@@ -1239,13 +1240,16 @@ ao_radio_aprs()
ao_packet_slave_stop();
ao_aprs_send();
}
+#endif
#endif
static const struct ao_cmds ao_radio_cmds[] = {
{ ao_radio_test_cmd, "C <1 start, 0 stop, none both>\0Radio carrier test" },
#if CC1120_DEBUG
+#if HAS_APRS
{ ao_radio_aprs, "G\0Send APRS packet" },
+#endif
{ ao_radio_show, "R\0Show CC1120 status" },
{ ao_radio_beep, "b\0Emit an RDF beacon" },
{ ao_radio_packet, "p\0Send a test packet" },
diff --git a/src/megadongle-v0.1/ao_pins.h b/src/megadongle-v0.1/ao_pins.h
index d810cd4c..5a5eaa30 100644
--- a/src/megadongle-v0.1/ao_pins.h
+++ b/src/megadongle-v0.1/ao_pins.h
@@ -132,8 +132,8 @@
#define AO_RADIO_CAL_DEFAULT 0x6ca333
#define AO_FEC_DEBUG 0
-#define AO_CC1120_SPI_CS_PORT (&stm_gpioc)
-#define AO_CC1120_SPI_CS_PIN 5
+#define AO_CC1120_SPI_CS_PORT (&stm_gpioa)
+#define AO_CC1120_SPI_CS_PIN 0
#define AO_CC1120_SPI_BUS AO_SPI_2_PB13_PB14_PB15
#define AO_CC1120_INT_PORT (&stm_gpioc)