]> rtime.felk.cvut.cz Git - eurobot/public.git/commitdiff
cand: update after sharps reconfiguration.
authorTran Duy Khanh <trandk1@fel.cvut.cz>
Sat, 3 May 2008 04:04:30 +0000 (06:04 +0200)
committerTran Duy Khanh <trandk1@fel.cvut.cz>
Sat, 3 May 2008 04:04:30 +0000 (06:04 +0200)
src/cand/eb2008/cand_eb2008.cc

index 8f482f939867babfaca41dbf449ed44d9149c877..f5cfad621002712b8f479eef6355eb0c4b1cddd8 100644 (file)
@@ -268,14 +268,14 @@ int cand_parse_frame(struct eb2008_orte_data *orte_eb2008,
                                                          (frame.data[1]))/1000.0;
                        orte_eb2008->sharps.right = s_gp2y0a21_ir2mmLong((frame.data[2] << 8)| \
                                                          (frame.data[3]))/1000.0;
+                       orte_eb2008->sharps.left = s_gp2y0a21_ir2mmLong((frame.data[4] << 8)| \
+                                                         (frame.data[5]))/1000.0;
+                       orte_eb2008->sharps.front_left = s_gp2y0a21_ir2mmLong((frame.data[6] << 8)| \
+                                                         (frame.data[7]))/1000.0;
                        ORTEPublicationSend(orte_eb2008->publication_sharps);
                        break;
 
                case CAN_ADC_2:
-                       orte_eb2008->sharps.front_left = s_gp2y0a21_ir2mmLong((frame.data[0] << 8)| \
-                                                         (frame.data[1]))/1000.0;
-                       orte_eb2008->sharps.left = s_gp2y0a21_ir2mmLong((frame.data[2] << 8)| \
-                                                         (frame.data[3]))/1000.0;
                        orte_eb2008->sharps.back_left = s_gp2d120_ir2mmShort((frame.data[4] << 8)| \
                                                          (frame.data[5]))/1000.0;
                        orte_eb2008->sharps.back_right = s_gp2d120_ir2mmShort((frame.data[6] << 8)| \