X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fkernel%2Fao_log_micro.c;h=aa0f5c76c45f9c3277d638fa090f777b5946d55f;hp=d665efb5b56f94e1123afe8df306ad02dc53bbca;hb=db12c17e9538bd82f2c2bf21357887ee7d894a1c;hpb=24167015705ae831692b95735968b04a876f935e

diff --git a/src/kernel/ao_log_micro.c b/src/kernel/ao_log_micro.c
index d665efb5..aa0f5c76 100644
--- a/src/kernel/ao_log_micro.c
+++ b/src/kernel/ao_log_micro.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
@@ -22,10 +23,17 @@
 
 static uint16_t ao_log_offset = STARTING_LOG_OFFSET;
 
+#define AO_LOG_ID_SHIFT	12
+#define AO_LOG_ID_MASK	((1 << AO_LOG_ID_SHIFT) - 1)
+
 void
 ao_log_micro_save(void)
 {
 	uint16_t	n_samples = (ao_log_offset - STARTING_LOG_OFFSET) / sizeof (uint16_t);
+
+#if AO_LOG_ID
+	n_samples |= AO_LOG_ID << AO_LOG_ID_SHIFT;
+#endif
 	ao_eeprom_write(PA_GROUND_OFFSET, &pa_ground, sizeof (pa_ground));
 	ao_eeprom_write(PA_MIN_OFFSET, &pa_min, sizeof (pa_min));
 	ao_eeprom_write(N_SAMPLES_OFFSET, &n_samples, sizeof (n_samples));
@@ -99,8 +107,12 @@ ao_log_micro_dump(void)
 	uint16_t	crc = 0xffff;
 
 	ao_eeprom_read(N_SAMPLES_OFFSET, &n_samples, sizeof (n_samples));
+
 	if (n_samples == 0xffff)
 		n_samples = 0;
+#if AO_LOG_ID
+	n_samples &= AO_LOG_ID_MASK;
+#endif
 	nbytes = STARTING_LOG_OFFSET + sizeof (uint16_t) * n_samples;
 	ao_async_start();
 	ao_async_byte('M');