Update of /cvsroot/firebug/fireboard/tools/src/xlisten
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25760
Modified Files:
xlisten.c xpacket.c xsensors.h
Log Message:
Fixed xlisten code, added voltage output.
Index: xpacket.c
===================================================================
RCS file: /cvsroot/firebug/fireboard/tools/src/xlisten/xpacket.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** xpacket.c 23 Jul 2004 00:32:07 -0000 1.4
--- xpacket.c 4 Aug 2004 01:56:13 -0000 1.5
***************
*** 210,214 ****
case XPACKET_TEXT_MSG:
packet->reserved2 = '\0';
! printf("MSG from id=%d: %s\n\n", packet->node_id, packet->data);
return;
}
--- 210,215 ----
case XPACKET_TEXT_MSG:
packet->reserved2 = '\0';
! printf("MSG from id=%d: %s\n\n", packet->node_id,
! (char*)packet->data);
return;
}
***************
*** 221,228 ****
if (packet_printer[i].type == sensorboard_id) {
packet_printer[i].print_cooked(packet);
! break;
}
i++;
}
}
--- 222,230 ----
if (packet_printer[i].type == sensorboard_id) {
packet_printer[i].print_cooked(packet);
! return;
}
i++;
}
+ fprintf(stderr,"No print function defined for this sensor board.\n");
}
***************
*** 321,325 ****
case XTYPE_MTS420:
! //mts420_print_tabbed(packet);
break;
--- 323,327 ----
case XTYPE_MTS420:
! //mts420_print_cooked(packet);
break;
Index: xsensors.h
===================================================================
RCS file: /cvsroot/firebug/fireboard/tools/src/xlisten/xsensors.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xsensors.h 15 Jul 2004 17:03:39 -0000 1.1
--- xsensors.h 4 Aug 2004 01:56:13 -0000 1.2
***************
*** 70,74 ****
#define XPACKET_LENGTH 4 //!< offset to length of TOS packet
#define XPACKET_DATASTART 5 //!< UART offset to data payload
! #define XPACKET_DATASTART_WIRELESS 7 //!< Wireless offset to data payload
/* Sensorboard data packet definitions */
--- 70,75 ----
#define XPACKET_LENGTH 4 //!< offset to length of TOS packet
#define XPACKET_DATASTART 5 //!< UART offset to data payload
! #define XPACKET_DATASTART_WIRELESS 5 //!< Wireless offset to data payload
! #define XPACKET_DATASTART_MULTIHOP 12 //!< Multihop offset to data payload
/* Sensorboard data packet definitions */
Index: xlisten.c
===================================================================
RCS file: /cvsroot/firebug/fireboard/tools/src/xlisten/xlisten.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xlisten.c 15 Jul 2004 17:03:39 -0000 1.1
--- xlisten.c 4 Aug 2004 01:56:13 -0000 1.2
***************
*** 57,60 ****
--- 57,63 ----
+ /**
+ * Shut down cleanly.
+ */
void
catch_sigint(int signal) {
***************
*** 114,118 ****
case 'w':
g_params.bits.mode_wireless = 1;
! xpacket_set_start(XPACKET_DATASTART_WIRELESS);
break;
--- 117,124 ----
case 'w':
g_params.bits.mode_wireless = 1;
! int offset = XPACKET_DATASTART_WIRELESS;
! if (argv[argc][2] == '=')
! offset = atoi(argv[argc]+3);
! xpacket_set_start(offset);
break;
***************
*** 229,232 ****
--- 235,239 ----
if (g_params.bits.display_cooked) xpacket_print_cooked(buffer);
+ //if (g_params.bits.display_cooked) xpacket_print_tabbed(buffer);
}
}
|
