Bump to 1.0.9.3

TeleScience and TelePyro now work.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/configure.ac b/configure.ac
index 57d2f1961c178a4f9ab856175e97c82c106c12f7..19db6d27b48f9a6c9dd588e0af5df16ef93b185c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)

-AC_INIT([altos], 1.0.9.2)
+AC_INIT([altos], 1.0.9.3)

 AC_CONFIG_SRCDIR([src/core/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 AC_CONFIG_SRCDIR([src/core/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

diff --git a/src/avr/ao_spi_slave.c b/src/avr/ao_spi_slave.c
index 3aa0b97f51496b0ff109a0efac48a68c89ce3f0f..b742d29aa6de10b73bb6d1ce8e60f756c0d7fc3f 100644 (file)
--- a/src/avr/ao_spi_slave.c
+++ b/src/avr/ao_spi_slave.c
@@ -18,7 +18,7 @@
 #include "ao.h"
 
 uint8_t
 #include "ao.h"
 
 uint8_t

-ao_spi_read(uint8_t *buf, uint8_t len)
+ao_spi_slave_recv(uint8_t *buf, uint8_t len)

 {
        while (len--) {
                while (!(SPSR & (1 << SPIF)))
 {
        while (len--) {
                while (!(SPSR & (1 << SPIF)))


@@ -30,7 +30,7 @@ ao_spi_read(uint8_t *buf, uint8_t len)
 }
 
 void
 }
 
 void

-ao_spi_write(uint8_t *buf, uint8_t len)
+ao_spi_slave_send(uint8_t *buf, uint8_t len)

 {
        while (len--) {
                SPDR = *buf++;
 {
        while (len--) {
                SPDR = *buf++;

diff --git a/src/avr/ao_usb_avr.c b/src/avr/ao_usb_avr.c
index 74bdea23ef8d5eb630dde4c59d390eaf276672ec..fc8899d815c91d8771e12b3ec95a5673fdd5ce09 100644 (file)
--- a/src/avr/ao_usb_avr.c
+++ b/src/avr/ao_usb_avr.c
@@ -303,9 +303,6 @@ ao_usb_ep0_setup(void)
                        }
                        break;
                case AO_USB_RECIP_INTERFACE:
                        }
                        break;
                case AO_USB_RECIP_INTERFACE:

-#ifndef AVR
-                       #pragma disable_warning 110
-#endif

                        debug ("Interface setup packet\n");
                        switch(ao_usb_setup.request) {
                        case AO_USB_REQ_GET_STATUS:
                        debug ("Interface setup packet\n");
                        switch(ao_usb_setup.request) {
                        case AO_USB_REQ_GET_STATUS:

diff --git a/src/core/ao.h b/src/core/ao.h
index c04747295e32f826cb90ee499698d385164154a2..94526bc3f87bd8c28283a604cdf50fd380844170 100644 (file)
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -975,10 +975,10 @@ ao_spi_init(void);
  */
 
 uint8_t
  */
 
 uint8_t

-ao_spi_read(uint8_t *buf, uint8_t len);
+ao_spi_slave_recv(uint8_t *buf, uint8_t len);

 
 void
 
 void

-ao_spi_write(uint8_t *buf, uint8_t len);
+ao_spi_slave_send(uint8_t *buf, uint8_t len);

 
 void
 ao_spi_slave_init(void);
 
 void
 ao_spi_slave_init(void);

diff --git a/src/drivers/ao_pyro_slave.c b/src/drivers/ao_pyro_slave.c
index e6c73a3c914356deefb5e564a4e2ec9a37cb3dc9..5ef42b5ac61296b19a7a9f5774196b38a57d4ae5 100644 (file)
--- a/src/drivers/ao_pyro_slave.c
+++ b/src/drivers/ao_pyro_slave.c
@@ -29,19 +29,19 @@ static const struct ao_companion_setup      ao_telepyro_setup = {
 
 void ao_spi_slave(void)
 {
 
 void ao_spi_slave(void)
 {

-       if (!ao_spi_read((uint8_t *) &ao_companion_command,
-                        sizeof (ao_companion_command)))
+       if (!ao_spi_slave_recv((uint8_t *) &ao_companion_command,
+                              sizeof (ao_companion_command)))

                return;
 
        /* Figure out the outbound data */
        switch (ao_companion_command.command) {
        case AO_COMPANION_SETUP:
                return;
 
        /* Figure out the outbound data */
        switch (ao_companion_command.command) {
        case AO_COMPANION_SETUP:

-               ao_spi_write((uint8_t *) &ao_telepyro_setup,
-                            sizeof (ao_telepyro_setup));
+               ao_spi_slave_send((uint8_t *) &ao_telepyro_setup,
+                                 sizeof (ao_telepyro_setup));

                break;
        case AO_COMPANION_FETCH:
                break;
        case AO_COMPANION_FETCH:

-               ao_spi_write((uint8_t *) &ao_adc_ring[ao_adc_ring_prev(ao_adc_head)].adc,
-                            AO_TELEPYRO_NUM_ADC * sizeof (uint16_t));
+               ao_spi_slave_send((uint8_t *) &ao_adc_ring[ao_adc_ring_prev(ao_adc_head)].adc,
+                                 AO_TELEPYRO_NUM_ADC * sizeof (uint16_t));

                break;
        case AO_COMPANION_NOTIFY:
                break;
                break;
        case AO_COMPANION_NOTIFY:
                break;

diff --git a/src/drivers/ao_science_slave.c b/src/drivers/ao_science_slave.c
index 78941255ef7014a28947620dcecac59b524bc45c..1ebb1480b36927167fc38c035ccbb06b6796ccfb 100644 (file)
--- a/src/drivers/ao_science_slave.c
+++ b/src/drivers/ao_science_slave.c
@@ -29,19 +29,19 @@ static const struct ao_companion_setup      ao_telescience_setup = {
 
 void ao_spi_slave(void)
 {
 
 void ao_spi_slave(void)
 {

-       if (!ao_spi_read((uint8_t *) &ao_companion_command,
-                        sizeof (ao_companion_command)))
+       if (!ao_spi_slave_recv((uint8_t *) &ao_companion_command,
+                              sizeof (ao_companion_command)))

                return;
 
        /* Figure out the outbound data */
        switch (ao_companion_command.command) {
        case AO_COMPANION_SETUP:
                return;
 
        /* Figure out the outbound data */
        switch (ao_companion_command.command) {
        case AO_COMPANION_SETUP:

-               ao_spi_write((uint8_t *) &ao_telescience_setup,
-                            sizeof (ao_telescience_setup));
+               ao_spi_slave_send((uint8_t *) &ao_telescience_setup,
+                                 sizeof (ao_telescience_setup));

                break;
        case AO_COMPANION_FETCH:
                break;
        case AO_COMPANION_FETCH:

-               ao_spi_write((uint8_t *) &ao_adc_ring[ao_adc_ring_prev(ao_adc_head)].adc,
-                            AO_LOG_TELESCIENCE_NUM_ADC * sizeof (uint16_t));
+               ao_spi_slave_send((uint8_t *) &ao_adc_ring[ao_adc_ring_prev(ao_adc_head)].adc,
+                                 AO_LOG_TELESCIENCE_NUM_ADC * sizeof (uint16_t));

                break;
        case AO_COMPANION_NOTIFY:
                break;
                break;
        case AO_COMPANION_NOTIFY:
                break;