X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_log_mini.c;h=d5735cdc4a8c66a0c7cc3c24a907ec967aaa64db;hb=9fa46346d576081f99860cad96c91bcf63233649;hp=29e3bd9f6d87fcc40dfc570c1a571765aea95552;hpb=24167015705ae831692b95735968b04a876f935e;p=fw%2Faltos

diff --git a/src/kernel/ao_log_mini.c b/src/kernel/ao_log_mini.c
index 29e3bd9f..d5735cdc 100644
--- a/src/kernel/ao_log_mini.c
+++ b/src/kernel/ao_log_mini.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
@@ -20,7 +21,6 @@
 #include <ao_data.h>
 #include <ao_flight.h>
 
-static __xdata uint8_t	ao_log_mutex;
 static __xdata struct ao_log_mini log;
 
 __code uint8_t ao_log_format = AO_LOG_FORMAT;
@@ -111,9 +111,11 @@ ao_log(void)
 					      ao_data_ring[ao_log_data_pos].ms5607_raw.pres);
 				ao_log_pack24(log.u.sensor.temp,
 					      ao_data_ring[ao_log_data_pos].ms5607_raw.temp);
+#if AO_LOG_FORMAT != AO_LOG_FORMAT_DETHERM
 				log.u.sensor.sense_a = ao_data_ring[ao_log_data_pos].adc.sense_a;
 				log.u.sensor.sense_m = ao_data_ring[ao_log_data_pos].adc.sense_m;
 				log.u.sensor.v_batt = ao_data_ring[ao_log_data_pos].adc.v_batt;
+#endif
 				ao_log_mini(&log);
 				if (ao_log_state <= ao_flight_coast)
 					next_sensor = log.tick + AO_SENSOR_INTERVAL_ASCENT;