From 43686321a76c12c3b9aa35d9cbcbb61679ef1007 Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@almesberger.net>
Date: Sun, 1 Jul 2012 11:53:51 -0300
Subject: [PATCH] fw/diag.c: fix and improve DIAG function

- we didn't send ACKs for the authentication packets
- take multiple samples (4)
- add 100 ms delay to let the battery voltage settle
---
 fw/diag.c  | 32 +++++++++++++++++++-------------
 fw/proto.h |  2 ++
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/fw/diag.c b/fw/diag.c
index ff86d8a..30a81fb 100644
--- a/fw/diag.c
+++ b/fw/diag.c
@@ -16,6 +16,8 @@
 #include <string.h>
 
 #include <avr/interrupt.h>
+#define	F_CPU	8000000UL
+#include <util/delay.h>
 
 #include "hash.h"
 #include "proto.h"
@@ -33,17 +35,22 @@ static bool failed;
 
 static void do_diag(void)
 {
-	uint8_t pkg[7] = { DIAG_ACK, 0, 0, };
+	uint8_t pkg[3+4*DIAG_SAMPLES] = { DIAG_ACK, 4, 0, };
+	uint8_t *p = pkg+3;
 	uint16_t v;
+	uint8_t i;
 
 	cli();
 	set_line(localize_line(tmp[0], tmp[1]));
-	v = measure_ref(1);
-	pkg[3] = v;
-	pkg[4] = v >> 8;
-	v = measure_ref(0);
-	pkg[5] = v;
-	pkg[6] = v >> 8;
+	_delay_ms(100);
+	for (i = 0; i != DIAG_SAMPLES; i++) {
+		v = measure_ref(1);
+		*p++ = v;
+		*p++ = v >> 8;
+		v = measure_ref(0);
+		*p++ = v;
+		*p++ = v >> 8;
+	}
 	set_line(localize_line(0, 0));
 	sei();
 	rf_send(pkg, sizeof(pkg));
@@ -63,13 +70,12 @@ static bool diag_more(uint8_t seq, uint8_t limit, const uint8_t *payload)
 	case 0:
 		if (!hash_eq(payload, PAYLOAD, PAYLOAD))
 			failed = 1;
-		if (failed)
-			return 0;
-		do_diag();
-		break;
+		if (!failed)
+			do_diag();
+		/* do_diag sends the ACK, not the dispatcher */
+		return 0;
 	}
-	/* do_diag sends the ACK, not the dispatcher */
-	return 0;
+	return 1;
 }
 
 
diff --git a/fw/proto.h b/fw/proto.h
index 0c045cc..279fad2 100644
--- a/fw/proto.h
+++ b/fw/proto.h
@@ -39,6 +39,8 @@ enum pck_type {
 
 #define	MAX_LINES		80
 
+#define	DIAG_SAMPLES		4
+
 #define	XA_HIGH_DEFAULT		850
 #define	XA_LOW_DEFAULT		170