diff options
| -rw-r--r-- | doc/altusmetrum.xsl | 14 | ||||
| -rw-r--r-- | src/drivers/ao_cc1120.c | 2 | ||||
| -rw-r--r-- | src/megametrum-v0.1/stlink-pins | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/doc/altusmetrum.xsl b/doc/altusmetrum.xsl index 0fd19e60..55f02e26 100644 --- a/doc/altusmetrum.xsl +++ b/doc/altusmetrum.xsl @@ -2599,13 +2599,13 @@ NAR #88757, TRA #12200 <appendix xmlns:xi="http://www.w3.org/2001/XInclude"> <title>Release Notes</title> - <xi:include href="release-notes-1.1.1.xsl" xpointer="xpointer(/article/*)"/> - <xi:include href="release-notes-1.1.xsl" xpointer="xpointer(/article/*)"/> - <xi:include href="release-notes-1.0.1.xsl" xpointer="xpointer(/article/*)"/> - <xi:include href="release-notes-0.9.2.xsl" xpointer="xpointer(/article/*)"/> - <xi:include href="release-notes-0.9.xsl" xpointer="xpointer(/article/*)"/> - <xi:include href="release-notes-0.8.xsl" xpointer="xpointer(/article/*)"/> - <xi:include href="release-notes-0.7.1.xsl" xpointer="xpointer(/article/*)"/> + <simplesect><title>Version 1.1.1</title><xi:include href="release-notes-1.1.1.xsl" xpointer="xpointer(/article/*)"/></simplesect> + <simplesect><title>Version 1.1</title><xi:include href="release-notes-1.1.xsl" xpointer="xpointer(/article/*)"/></simplesect> + <simplesect><title>Version 1.0.1</title><xi:include href="release-notes-1.0.1.xsl" xpointer="xpointer(/article/*)"/></simplesect> + <simplesect><title>Version 0.9.2</title><xi:include href="release-notes-0.9.2.xsl" xpointer="xpointer(/article/*)"/></simplesect> + <simplesect><title>Version 0.9</title><xi:include href="release-notes-0.9.xsl" xpointer="xpointer(/article/*)"/></simplesect> + <simplesect><title>Version 0.8</title><xi:include href="release-notes-0.8.xsl" xpointer="xpointer(/article/*)"/></simplesect> + <simplesect><title>Version 0.7.1</title><xi:include href="release-notes-0.7.1.xsl" xpointer="xpointer(/article/*)"/></simplesect> </appendix> </book> diff --git a/src/drivers/ao_cc1120.c b/src/drivers/ao_cc1120.c index 8068740f..53bb5a62 100644 --- a/src/drivers/ao_cc1120.c +++ b/src/drivers/ao_cc1120.c @@ -38,7 +38,7 @@ extern const uint32_t ao_radio_cal; #define FOSC 32000000 -#define ao_radio_select() ao_spi_get_mask(AO_CC1120_SPI_CS_PORT,(1 << AO_CC1120_SPI_CS_PIN),AO_CC1120_SPI_BUS,AO_SPI_SPEED_1MHz) +#define ao_radio_select() ao_spi_get_mask(AO_CC1120_SPI_CS_PORT,(1 << AO_CC1120_SPI_CS_PIN),AO_CC1120_SPI_BUS,AO_SPI_SPEED_4MHz) #define ao_radio_deselect() ao_spi_put_mask(AO_CC1120_SPI_CS_PORT,(1 << AO_CC1120_SPI_CS_PIN),AO_CC1120_SPI_BUS) #define ao_radio_spi_send(d,l) ao_spi_send((d), (l), AO_CC1120_SPI_BUS) #define ao_radio_spi_send_fixed(d,l) ao_spi_send_fixed((d), (l), AO_CC1120_SPI_BUS) diff --git a/src/megametrum-v0.1/stlink-pins b/src/megametrum-v0.1/stlink-pins index e6094372..3bd16d0b 100644 --- a/src/megametrum-v0.1/stlink-pins +++ b/src/megametrum-v0.1/stlink-pins @@ -1,4 +1,4 @@ - ST discovery card pins +ST discovery card pins 1 AIN-1 2 JTCK @@ -7,7 +7,7 @@ 5 NRST 6 SWO -MM misc connector +MegaMetrum v0.1 misc connector 1 GND 2 reset_n @@ -28,13 +28,13 @@ MM misc connector For debugging: - ST MM + ST MM v0.1 JTCK 2 9 GND 3 7 JTMS 4 8 NRST 5 2 -TL debug connector: +Altus Metrum STM32L standard debug connector (4 pin MicoMaTch): TL ST GND 1 3 |