Flip ADC bytes around

[fw/altos] / target / adc-serial / adc_serial.c

diff --git a/target/adc-serial/adc_serial.c b/target/adc-serial/adc_serial.c
index 349f3d7e04e09afe4c683af5a3bfc9d47c80788b..fb58b4c28c59d37a98c3d03894e8e074cf01d20e 100644 (file)
--- a/target/adc-serial/adc_serial.c
+++ b/target/adc-serial/adc_serial.c
@@ -405,7 +405,7 @@ struct cc_dma_channel __xdata dma_config;
 
 #define ADC_LEN        6
 
-uint16_t __xdata adc_output[ADC_LEN];
+uint8_t __xdata adc_output[ADC_LEN*2];
 
 #define ADDRH(a)       (((uint16_t) (a)) >> 8)
 #define ADDRL(a)       (((uint16_t) (a)))
@@ -417,7 +417,7 @@ adc_init(void)
                           DMA_CFG0_TMODE_REPEATED_SINGLE |
                           DMA_CFG0_TRIGGER_ADC_CHALL);
        dma_config.cfg1 = (DMA_CFG1_SRCINC_0 |
-                          DMA_CFG1_DESTINC_2 |
+                          DMA_CFG1_DESTINC_1 |
                           DMA_CFG1_PRIORITY_NORMAL);
        
        dma_config.src_high = ADDRH(&ADCXDATA);
@@ -531,9 +531,13 @@ usart_out_number(uint16_t v)
                *--num_ptr = '0' + v % 10;
                v /= 10;
        } while (v);
+       while (num_ptr != num_buffer)
+               *--num_ptr = ' ';
        usart_out_string(num_ptr);
 }
 
+#define ADC(n) (((uint16_t) (adc_output[n<<1] << 8)) | (uint16_t) (adc_output[(n<<1)+1]))
+
 main ()
 {
        P1DIR |= 2;
@@ -546,17 +550,17 @@ main ()
        for (;;) {
                adc_run();
                usart_out_string("accel: ");
-               usart_out_number(adc_output[0]);
+               usart_out_number(ADC(0));
                usart_out_string("pres: ");
-               usart_out_number(adc_output[1]);
+               usart_out_number(ADC(1));
                usart_out_string("temp: ");
-               usart_out_number(adc_output[2]);
+               usart_out_number(ADC(2));
                usart_out_string("batt: ");
-               usart_out_number(adc_output[3]);
+               usart_out_number(ADC(3));
                usart_out_string("drogue: ");
-               usart_out_number(adc_output[4]);
-               usart_out_string(" main: ");
-               usart_out_number(adc_output[5]);
+               usart_out_number(ADC(4));
+               usart_out_string("main: ");
+               usart_out_number(ADC(5));
                usart_out_string("\r\n");
                delay(10);
        }