[Firebug-cvs] fireboard/tools/src/xlisten/boards mts400.c,1.3,1.4
Brought to you by:
doolin
From: David M. D. <do...@us...> - 2004-08-04 01:56:22
|
Update of /cvsroot/firebug/fireboard/tools/src/xlisten/boards In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25760/boards Modified Files: mts400.c Log Message: Fixed xlisten code, added voltage output. Index: mts400.c =================================================================== RCS file: /cvsroot/firebug/fireboard/tools/src/xlisten/boards/mts400.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mts400.c 3 Aug 2004 23:22:35 -0000 1.3 --- mts400.c 4 Aug 2004 01:56:14 -0000 1.4 *************** *** 114,118 **** * @version 2004/3/29 husiquan Initial revision */ ! int mts400_convert_intersemapressure(XbowSensorboardPacket *packet) { --- 114,119 ---- * @version 2004/3/29 husiquan Initial revision */ ! float ! mts400_convert_intersemapressure(XbowSensorboardPacket *packet) { *************** *** 147,151 **** Press = X/32.0 + 250.0; ! return (int)Press; } --- 148,152 ---- Press = X/32.0 + 250.0; ! return Press; } *************** *** 158,162 **** * @version 2004/3/29 husiquan Initial revision */ ! int mts400_convert_intersematemp(XbowSensorboardPacket *packet) { float UT1,dT,Temp; --- 159,164 ---- * @version 2004/3/29 husiquan Initial revision */ ! float ! mts400_convert_intersematemp(XbowSensorboardPacket *packet) { float UT1,dT,Temp; *************** *** 179,183 **** Temp /=10.0; ! return (int)Temp; } --- 181,185 ---- Temp /=10.0; ! return Temp; } *************** *** 199,203 **** * @version 2004/3/29 husiquan Initial revision */ ! int mts400_convert_humidity(XbowSensorboardPacket *packet){ float fTemp,fHumidity; --- 201,206 ---- * @version 2004/3/29 husiquan Initial revision */ ! float ! mts400_convert_humidity(XbowSensorboardPacket *packet){ float fTemp,fHumidity; *************** *** 212,216 **** fHumidity= (fTemp-25.0)* (0.01 + 0.00008 * HumData) + fHumidity; ! return (int)fHumidity; } --- 215,219 ---- fHumidity= (fTemp-25.0)* (0.01 + 0.00008 * HumData) + fHumidity; ! return fHumidity; } *************** *** 223,227 **** * @version 2004/3/29 husiquan Initial revision */ ! int mts400_convert_temp(XbowSensorboardPacket *packet) { float fTemp; --- 226,231 ---- * @version 2004/3/29 husiquan Initial revision */ ! float ! mts400_convert_temp(XbowSensorboardPacket *packet) { float fTemp; *************** *** 231,236 **** fTemp = -38.4 + 0.0098*(float)TempData; ! return (int)fTemp; ! } /** --- 235,240 ---- fTemp = -38.4 + 0.0098*(float)TempData; ! return fTemp; ! } /** *************** *** 593,597 **** // Packet data should be dereferenced and passed to the // conversion functions, don't pass the entire packet. ! fprintf(logfile,"%s\t%i\t%i\t%i\t%i\t%i\n", timestring, packet->node_id, --- 597,601 ---- // Packet data should be dereferenced and passed to the // conversion functions, don't pass the entire packet. ! fprintf(stdout,"%s\t%i\t%.2f\t%.2f\t%.2f\t%.2f\t%i\n", timestring, packet->node_id, *************** *** 599,604 **** mts400_convert_temp(packet), mts400_convert_intersematemp(packet), ! mts400_convert_intersemapressure(packet)); ! fflush(logfile); } --- 603,609 ---- mts400_convert_temp(packet), mts400_convert_intersematemp(packet), ! mts400_convert_intersemapressure(packet), ! (int)mts400_convert_battery(packet)); ! //fflush(logfile); } |