X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2Fao_adc_stm.c;h=2399e6a281bf7196f1e75474d89fb84d77b056c6;hb=c6e57291d91f1f6c4de5c54a5cfd3eef66d9f830;hp=17ff344d3a228ee9310bbf009bfeefaa665692be;hpb=63683f91f5fe9588c1d905a572509cb674aaad68;p=fw%2Faltos

diff --git a/src/stm/ao_adc_stm.c b/src/stm/ao_adc_stm.c
index 17ff344d..2399e6a2 100644
--- a/src/stm/ao_adc_stm.c
+++ b/src/stm/ao_adc_stm.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -56,6 +57,9 @@ static void ao_adc_done(int index)
 #endif
 #if HAS_MPU6000
 		ao_data_ring[ao_data_head].mpu6000 = ao_mpu6000_current;
+#endif
+#if HAS_MPU9250
+		ao_data_ring[ao_data_head].mpu9250 = ao_mpu9250_current;
 #endif
 		ao_data_ring[ao_data_head].tick = ao_tick_count;
 		ao_data_head = ao_data_ring_next(ao_data_head);
@@ -96,7 +100,7 @@ ao_adc_poll(void)
  * Fetch a copy of the most recent ADC data
  */
 void
-ao_adc_get(__xdata struct ao_adc *packet)
+ao_adc_get(struct ao_adc *packet)
 {
 #if HAS_FLIGHT
 	uint8_t	i = ao_data_ring_prev(ao_sample_data);
@@ -173,7 +177,7 @@ static const char *ao_adc_name[AO_NUM_ADC] = {
 #endif
 
 static void
-ao_adc_dump(void) __reentrant
+ao_adc_dump(void) 
 {
 	struct ao_data	packet;
 #ifndef AO_ADC_DUMP
@@ -190,7 +194,7 @@ ao_adc_dump(void) __reentrant
 	for (i = 0; i < AO_NUM_ADC; i++) {
 #ifdef AO_ADC_SQ1_NAME
 		if (ao_adc_name[i])
-			printf ("\t%s: %5d\n", ao_adc_name[i], d[i]);
+			printf (" %s: %5d", ao_adc_name[i], d[i]);
 		else		
 #endif
 			printf (" %2d: %5d", i, d[i]);
@@ -199,7 +203,7 @@ ao_adc_dump(void) __reentrant
 #endif
 }
 
-__code struct ao_cmds ao_adc_cmds[] = {
+const struct ao_cmds ao_adc_cmds[] = {
 	{ ao_adc_dump,	"a\0Display current ADC values" },
 	{ 0, NULL },
 };
@@ -376,7 +380,7 @@ ao_adc_init(void)
 #if AO_NUM_ADC > 18
 #error "need to finish stm_adc.sqr settings"
 #endif
-	
+
 	/* Turn ADC on */
 	stm_adc.cr2 = AO_ADC_CR2_VAL;