X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fmainboard%2Fstrat_db.c;h=d6af32e188d316083ed71f4a6980fc9fabaecd4e;hp=d2835fe76a6022a247bbb49a367bba92d564686a;hb=a3ec2f79a4ed7b2148ede881e0685ddb6f141d82;hpb=17aadc4c8c3e60c2b5e6bbba91c8542849addbd7

diff --git a/projects/microb2010/mainboard/strat_db.c b/projects/microb2010/mainboard/strat_db.c
index d2835fe..d6af32e 100644
--- a/projects/microb2010/mainboard/strat_db.c
+++ b/projects/microb2010/mainboard/strat_db.c
@@ -173,10 +173,14 @@ int8_t xycoord_to_ijcoord(int16_t *xp, int16_t *yp, uint8_t *ip, uint8_t *jp)
 	if ((i & 1) == 1) {
 		j = y / STEP_CORN_Y;
 	}
+	else if ((i & 3) == 0) {
+		j = y / (STEP_CORN_Y*2);
+		j = j*2 + 1;
+	}
 	else {
-		y += (STEP_CORN_Y/2);
-		y /= (STEP_CORN_Y*2);
-		j = (y * 2) + 1;
+		y += (STEP_CORN_Y);
+		j = y / (STEP_CORN_Y*2);
+		j = j*2;
 	}
 
 	if (ijcoord_to_xycoord(i, j, &x, &y) < 0)
@@ -194,7 +198,6 @@ int8_t xycoord_to_ijcoord(int16_t *xp, int16_t *yp, uint8_t *ip, uint8_t *jp)
 	return 0;
 }
 
-
 /******** CORN */
 
 /* return the index of a corn given its i,j coords. */
@@ -492,7 +495,6 @@ void strat_db_init(void)
 			/* tomato */
 			idx = ijcoord_to_tomato_idx(i, j);
 			if (idx >= 0) {
-				printf("%d %d\n", i, j);
 				wp->type = WP_TYPE_TOMATO;
 				wp->present = 1;
 				wp->tomato.idx = idx;