X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Ftests%2Fstatic_beacon%2Fstatic_beacon.c;h=d2accb33b514a46c88b9d0ff01e2b89a845baed6;hp=08b4251bdcead32f5b515f399672afa2e92475de;hb=7bca487a2198825b6d7caabcd1143e2d5e19dd43;hpb=844fa3427676e08d7e9f92279788def635377714

diff --git a/projects/microb2010/tests/static_beacon/static_beacon.c b/projects/microb2010/tests/static_beacon/static_beacon.c
index 08b4251..d2accb3 100755
--- a/projects/microb2010/tests/static_beacon/static_beacon.c
+++ b/projects/microb2010/tests/static_beacon/static_beacon.c
@@ -20,8 +20,11 @@
  *
  */
 
+#include <math.h>
+
 #include <aversive.h>
 #include <aversive/wait.h>
+#include <aversive/pgmspace.h>
 
 #include <uart.h>
 
@@ -50,7 +53,7 @@
 #define BEACON_ID_SHIFT 0
 
 /* */
-#define FRAME_DATA_MASK  0xFFF8
+#define FRAME_DATA_MASK  0x0FF8
 #define FRAME_DATA_SHIFT 3
 
 #if (defined MODUL_455KHZ)
@@ -69,6 +72,10 @@
 #error "no freq defined"
 #endif
 
+#define MIN_DIST 150.
+#define MAX_DIST 3600.
+#define LASER_DIST 25.
+
 #define N_CYCLES_PERIOD (N_CYCLES_0 + N_CYCLES_1)
 
 #define LED_PORT PORTD
@@ -124,6 +131,7 @@
 #error "speed not defined"
 #endif
 
+extern prog_uint16_t framedist_table[];
 /* basic functions to transmit on IR */
 
 static inline void xmit_0(void)
@@ -186,13 +194,49 @@ static void xmit_bits(uint32_t frame, uint8_t nbit)
 }
 
 #ifdef WAIT_LASER
-/* get the frame from laser time difference */
+/* val is 12 bits. Return the 16 bits value that includes the 4 bits
+ * cksum in MSB. */
+static uint16_t do_cksum(uint16_t val)
+{
+	uint16_t x, cksum;
+
+	x = (val & 0xfff);
+	/* add the three 4-bits blocks of x together */
+	cksum = x & 0xf;
+	x = x >> 4;
+	cksum += x & 0xf;
+	cksum = (cksum & 0xf) + ((cksum & 0xf0) >> 4);
+	x = x >> 4;
+	cksum += x & 0xf;
+	cksum = (cksum & 0xf) + ((cksum & 0xf0) >> 4);
+	cksum = (~cksum) & 0xf;
+	return (cksum << 12) + (val & 0xfff);
+}
+
+/* get the frame from laser time difference, return 0 on error (this
+ * frame cannot be sent). */
 static uint32_t get_frame(uint16_t laserdiff)
 {
 	uint32_t frame = 0;
-	frame |= ((uint32_t)BEACON_ID << BEACON_ID_SHIFT);
-	frame |= ((uint32_t)(laserdiff & FRAME_DATA_MASK) << FRAME_DATA_SHIFT);
-	return frame;
+	uint16_t frame_dist = 256;
+	uint16_t step, val;
+
+	/* for calibration, return the time */
+	if (0)
+		return laserdiff;
+
+	for (step = 128; step != 0; step /= 2) {
+		val = pgm_read_word(&framedist_table[frame_dist]);
+		if (laserdiff > val)
+			frame_dist -= step;
+		else
+			frame_dist += step;
+	}
+
+	frame |= ((uint32_t)(frame_dist & FRAME_DATA_MASK) << FRAME_DATA_SHIFT);
+
+	/* process cksum and return */
+	return do_cksum(frame);
 }
 
 /* Wait 2 consecutive rising edges on photodiode. Return 0 on success,
@@ -330,6 +374,11 @@ int main(void)
 			continue;
 
 		frame = get_frame(diff);
+		/* cannot convert into frame... skip it */
+		if (frame == 0) {
+			wait_ms(INTER_LASER_TIME);
+			continue;
+		}
 
 		/* wait before IR xmit */
 		while ((int16_t)(when-TCNT1) > 0);