Update of /cvsroot/firebug/fireboard/beta/fireworks/tools/java/net/sf/firebug/fireworks
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11552/net/sf/firebug/fireworks
Modified Files:
Fireworks.java Makefile
Log Message:
Working pressure and temperature calibration
Index: Makefile
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/fireworks/tools/java/net/sf/firebug/fireworks/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile 26 Jul 2005 18:51:03 -0000 1.1
--- Makefile 29 Aug 2005 18:52:25 -0000 1.2
***************
*** 29,32 ****
--- 29,35 ----
$(JAVAC) $@
+ Fireworks.class:Fireworks.java
+ $(JAVAC) *.java
+
cleanmig:
rm -f $(MSGS)
Index: Fireworks.java
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/fireworks/tools/java/net/sf/firebug/fireworks/Fireworks.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Fireworks.java 26 Jul 2005 18:51:03 -0000 1.1
--- Fireworks.java 29 Aug 2005 18:52:25 -0000 1.2
***************
*** 20,26 ****
private static final boolean VERBOSE = false;
static int group_id = 0x7d;
! MoteIF mote;
static Fireworks fw;
--- 20,31 ----
private static final boolean VERBOSE = false;
+
+ private static final int IDLE = 0;
+ private static final int SENT_DATA_REQUEST = 1;
+ private static final int RECEIVING_DATA = 2;
+
static int group_id = 0x7d;
! static MoteIF mIF;
static Fireworks fw;
***************
*** 32,44 ****
static int numPowerLevels;
static int frequency;
Fireworks() {
data = new LinkedList();
!
! mote = new MoteIF(PrintStreamMessenger.err, group_id);
! mote.registerListener(new DataMsg(), this);
! mote.registerListener(new DataRequestMsg(), this);
! mote.registerListener(new PingMsg(), this);
! mote.registerListener(new PingReplyMsg(), this);
}
--- 37,51 ----
static int numPowerLevels;
static int frequency;
+ private static int state;
Fireworks() {
data = new LinkedList();
! state = Fireworks.IDLE;
!
! mIF = new MoteIF(PrintStreamMessenger.err, group_id);
! mIF.registerListener(new DataMsg(), this);
! mIF.registerListener(new DataRequestMsg(), this);
! mIF.registerListener(new PingMsg(), this);
! mIF.registerListener(new PingReplyMsg(), this);
}
***************
*** 66,72 ****
wait for data packets to come in */
!
!
}
}
--- 73,102 ----
wait for data packets to come in */
+ DataRequestMsg drMsg = new DataRequestMsg();
+ int seqno = 0;
+ int source = 0;
! while(source <numNodes) {
! if(state == Fireworks.IDLE) {
! drMsg.set_seqno(seqno++);
! drMsg.set_source(source++);
! //drMsg.set_client(target++); //set the client's address
! drMsg.set_numNodes(numNodes);
! drMsg.set_numTrials(numTrials);
! drMsg.set_numPowerLevels(numPowerLevels);
! drMsg.set_trialFrequency(frequency);
!
! try {
! if(VERBOSE) {
! System.out.println("Sending DataRequestMsg to " +source);
! mIF.send(source, drMsg);
! state = Fireworks.SENT_DATA_REQUEST;
! }
! } catch (IOException e) {
! System.err.println("Warning: Got IOException when sending DataRequestMsg");
! e.printStackTrace();
! }
! }
! }
}
}
***************
*** 91,94 ****
--- 121,125 ----
DataElement dElement=new DataElement();
+ state = RECEIVING_DATA;
if(VERBOSE) {
System.out.println("Received Data Msg from " + dest);
***************
*** 104,107 ****
--- 135,144 ----
if(dElement.get_source() != 0 && dElement.get_source() != src) {
dElement.add(dMsg.get_data(), src);
+ if(dElement.get_counter() >= numTrials) {
+ state = IDLE;
+ if(dElement.get_counter() > numTrials) {
+ System.err.println("Got more RSSI values than number of trials " + dElement.get_counter());
+ }
+ }
}
else {
|
