firebug-cvs Mailing List for FireBug: wireless wildfire monitoring (Page 35)
Brought to you by:
doolin
Menu
▾
▴
firebug-cvs — cvs mailing list
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(36) |
Jun
(45) |
Jul
(108) |
Aug
(31) |
Sep
(2) |
Oct
(4) |
Nov
(113) |
Dec
(20) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(63) |
Feb
(37) |
Mar
(24) |
Apr
(6) |
May
(5) |
Jun
(5) |
Jul
(71) |
Aug
(42) |
Sep
(7) |
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
(3) |
Apr
|
May
(64) |
Jun
(71) |
Jul
(51) |
Aug
(89) |
Sep
(24) |
Oct
(1) |
Nov
(1) |
Dec
(2) |
| 2006 |
Jan
|
Feb
|
Mar
(3) |
Apr
(2) |
May
|
Jun
|
Jul
(21) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <do...@us...> - 2003-07-02 22:49:32
|
Update of /cvsroot/firebug/firebug/project/zaurus In directory sc8-pr-cvs1:/tmp/cvs-serv25953 Added Files: .cvsignore Log Message: ignore file. --- NEW FILE: .cvsignore --- dist classes build.properties |
|
From: <do...@us...> - 2003-07-02 22:48:55
|
Update of /cvsroot/firebug/firebug/project/zaurus
In directory sc8-pr-cvs1:/tmp/cvs-serv25817
Modified Files:
build.xml
Log Message:
The run target for the ant build file now
works correctly when the TINYOSJAR variable is properly
set in a local build.properties file. build.properties
is used to account for variations in local configurations
of tiny, java etc., and should not be added to the
cvs repository.
Index: build.xml
===================================================================
RCS file: /cvsroot/firebug/firebug/project/zaurus/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.xml 2 Jul 2003 22:35:53 -0000 1.3
--- build.xml 2 Jul 2003 22:48:52 -0000 1.4
***************
*** 71,80 ****
<target name="run" depends="jar">
! <echo message="Running Listener: java -classpath ${classpath} org.firebug.ListenRawFB"/>
! <!--
! <java classpath="${dist}/firebug.jar" classname="org.firebug.ListenRawFB" fork="yes"/>
! -->
! <java classpath=".\dist\firebug.jar;C:\jdk1.3.1_01\lib\comm.jar" classname="org.firebug.ListenRawFB" fork="yes">
! <arg value="COM1"/>
</java>
</target>
--- 71,77 ----
<target name="run" depends="jar">
! <echo message=".\dist\tosmc.jar;${TINYOSJAR}" />
! <java classpath=".\dist\tosmc.jar;${TINYOSJAR}/tinyos.jar"
! classname="isis.nest.messageCenter.CenterFrame" fork="yes">
</java>
</target>
|
|
From: <do...@us...> - 2003-07-02 22:36:26
|
Update of /cvsroot/firebug/firebug/project/zaurus
In directory sc8-pr-cvs1:/tmp/cvs-serv22408
Modified Files:
build.xml
Log Message:
Fixed build file to target the vandy source directory.
Index: build.xml
===================================================================
RCS file: /cvsroot/firebug/firebug/project/zaurus/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build.xml 2 Jul 2003 18:37:32 -0000 1.1
--- build.xml 2 Jul 2003 22:28:25 -0000 1.2
***************
*** 48,52 ****
<target name="compile" depends="prepare">
! <javac srcdir="src"
classpath="${servletlib}"
destdir="${build}" />
--- 48,52 ----
<target name="compile" depends="prepare">
! <javac srcdir="vu"
classpath="${servletlib}"
destdir="${build}" />
|
|
From: <do...@us...> - 2003-07-02 22:35:56
|
Update of /cvsroot/firebug/firebug/project/zaurus
In directory sc8-pr-cvs1:/tmp/cvs-serv23758
Modified Files:
build.xml
Log Message:
Fixed jar file name.
Index: build.xml
===================================================================
RCS file: /cvsroot/firebug/firebug/project/zaurus/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.xml 2 Jul 2003 22:28:25 -0000 1.2
--- build.xml 2 Jul 2003 22:35:53 -0000 1.3
***************
*** 53,59 ****
</target>
!
<target name="jar" depends="compile">
! <jar basedir="${build}" jarfile="${dist}/firebug.jar"/>
</target>
--- 53,59 ----
</target>
! <!-- tosmc = tos message center -->
<target name="jar" depends="compile">
! <jar basedir="${build}" jarfile="${dist}/tosmc.jar"/>
</target>
|
|
From: <do...@us...> - 2003-07-02 18:37:35
|
Update of /cvsroot/firebug/firebug/project/zaurus
In directory sc8-pr-cvs1:/tmp/cvs-serv8485
Added Files:
build.xml
Log Message:
ant build file for java stuff.
--- NEW FILE: build.xml ---
<?xml version="1.0" encoding="ISO-8859-1"?>
<project basedir="." default="jar" name="firebug">
<!--
For this build.xml file to work, the build.properties
file or the environment variables need to point at
wherever comm.jar is located, and wherever the root
of the tinyos java tools (net.tinyos.*) are located.
The build.properties file is system dependent, DO NOT
add and commit it to the cvs archive. Newer versions
of ant may allow the same information to be defined in
an .antrc file, which is the preferable method if it
is possible to do.
-->
<property file="build.properties"/>
<property name="firebug" value="firebug"/>
<property name="build" value="classes"/>
<property name="lib" value="classes/lib"/>
<property name="dist" value="dist"/>
<property name="javadoc" value="doc"/>
<property name="servletlib" value="./jar/jsdk22.jar"/>
<property name="dblib" value="./jar/mm.mysql-2.0.4-bin.jar"/>
<property name="messagepath" value="c:\\tinyos-1.x\\tools\\java"/>
<target name="prepare">
<tstamp/>
<mkdir dir="${build}"/>
<mkdir dir="${dist}"/>
</target>
<!-- This stuff doesn't seem to work at all. -->
<!--
<path id="firebugpath">
<pathelement path="${classpath}" />
<pathelement location="d:\jdk1.3.1_07\lib\comm.jar" />
<pathelement location=".\dist\firebug.jar" />
<pathelement location=".\jar\xerces.jar" />
<pathelement location=".\jar\jsdk22.jar" />
</path>
-->
<target name="compile" depends="prepare">
<javac srcdir="src"
classpath="${servletlib}"
destdir="${build}" />
</target>
<target name="jar" depends="compile">
<jar basedir="${build}" jarfile="${dist}/firebug.jar"/>
</target>
<target name="clean" description="Delete old build and dist directories">
<delete verbose="true" file="*~"/>
<delete verbose="true" dir="${build}"/>
<delete verbose="true" dir="${dist}"/>
</target>
<target name="javadoc">
<mkdir dir="doc/api"/>
<javadoc sourcepath="./src" packagenames="org.firebug.*" destdir="doc/api"/>
</target>
<target name="run" depends="jar">
<echo message="Running Listener: java -classpath ${classpath} org.firebug.ListenRawFB"/>
<!--
<java classpath="${dist}/firebug.jar" classname="org.firebug.ListenRawFB" fork="yes"/>
-->
<java classpath=".\dist\firebug.jar;C:\jdk1.3.1_01\lib\comm.jar" classname="org.firebug.ListenRawFB" fork="yes">
<arg value="COM1"/>
</java>
</target>
</project>
|
|
From: <do...@us...> - 2003-07-02 18:36:14
|
Update of /cvsroot/firebug/firebug/project/zaurus In directory sc8-pr-cvs1:/tmp/cvs-serv8198 Removed Files: HelloJava.java Log Message: Removed old example file. --- HelloJava.java DELETED --- |
|
From: <pho...@us...> - 2003-07-02 18:33:21
|
Update of /cvsroot/firebug/firebug/project/zaurus
In directory sc8-pr-cvs1:/tmp/cvs-serv7348
Added Files:
INSTALL
Log Message:
Install instructions for zaurus.
----------------------------------------------------------------------
--- NEW FILE: INSTALL ---
Instructions for installing apps on Zaurus
******************************************
1) Install Zaurus tools on PC from
* Install Zaurus File Transfer (under Install PC Software)
* Install Zaurus Terminal (under Install Software for the Zaurus)
~ for the terminal application, you will need to have
Zaurus File Transfer, and install files as you would any other
(see below).
The terminal application file is: qpe-terminal_1.5.0-3_arm.ipk
2) On the PC, start up Zaurus File Transfer and drag the *.ipk file
you wish to install onto
My Zaurus/Internal Flash/Install_Files
3) On the Zaurus
* select the "Files" Tab (furthest to right)
* click on the "Internal Flash" icon
* click on the "Install Files" icon
* double click the application (same name as *.ipk) icon
and install the package
* close everything. Depending on the *.ipk, an icon will appear under
applications, games, etc.
4) Open up the terminal evm -cp /home/QtPalmtop/java/spectrum.jar spectrum/ARSMain
5) ???? Is this necessary???? Need to change java permissions
/home/QtPalmtop/java needs user read and execute (chmod 755)
* "su root; exec bash" first
Instructions for building apps on Zaurus
****************************************
1) Create a build directory for your application by copying
the sample build directory for ars_arm.ipk
2) You need the files build.sh control and the home directory
3) run the build.sh script to generate *.ipk
Unsure files are home/QtPalmtop/apps/Games/ars.desktop
control
|
|
From: <pho...@us...> - 2003-07-02 17:02:44
|
Update of /cvsroot/firebug/firebug/project/zaurus/vu/isis/nest/zaurus In directory sc8-pr-cvs1:/tmp/cvs-serv25754/zaurus Log Message: Directory /cvsroot/firebug/firebug/project/zaurus/vu/isis/nest/zaurus added to the repository |
|
From: <pho...@us...> - 2003-07-02 17:00:50
|
Update of /cvsroot/firebug/firebug/project/zaurus/vu/isis/nest In directory sc8-pr-cvs1:/tmp/cvs-serv25494/nest Log Message: Directory /cvsroot/firebug/firebug/project/zaurus/vu/isis/nest added to the repository |
|
From: <pho...@us...> - 2003-07-02 17:00:26
|
Update of /cvsroot/firebug/firebug/project/zaurus/vu/isis In directory sc8-pr-cvs1:/tmp/cvs-serv25409/isis Log Message: Directory /cvsroot/firebug/firebug/project/zaurus/vu/isis added to the repository |
|
From: <pho...@us...> - 2003-07-02 17:00:08
|
Update of /cvsroot/firebug/firebug/project/zaurus/net/tinyos/tostools In directory sc8-pr-cvs1:/tmp/cvs-serv25287/tostools Log Message: Directory /cvsroot/firebug/firebug/project/zaurus/net/tinyos/tostools added to the repository |
|
From: <pho...@us...> - 2003-07-02 16:59:54
|
Update of /cvsroot/firebug/firebug/project/zaurus/net/tinyos In directory sc8-pr-cvs1:/tmp/cvs-serv25207/tinyos Log Message: Directory /cvsroot/firebug/firebug/project/zaurus/net/tinyos added to the repository |
|
From: <pho...@us...> - 2003-07-02 16:57:22
|
Update of /cvsroot/firebug/firebug/project/zaurus/net In directory sc8-pr-cvs1:/tmp/cvs-serv24772/net Log Message: Directory /cvsroot/firebug/firebug/project/zaurus/net added to the repository |
|
From: <pho...@us...> - 2003-07-02 16:57:21
|
Update of /cvsroot/firebug/firebug/project/zaurus/vu In directory sc8-pr-cvs1:/tmp/cvs-serv24772/vu Log Message: Directory /cvsroot/firebug/firebug/project/zaurus/vu added to the repository |
|
From: <do...@us...> - 2003-07-02 16:32:32
|
Update of /cvsroot/firebug/firebug/project/zaurus
In directory sc8-pr-cvs1:/tmp/cvs-serv21261
Added Files:
design.txt
Log Message:
Preliminary design documentation for zaurus.
--- NEW FILE: design.txt ---
>From pho...@EE... Wed Jul 2 09:23:04 2003
Date: Mon, 16 Jun 2003 16:32:49 -0700
From: pho...@EE...
To: che...@ya...
Subject: Zaurus starting instructions
Zaurus Programming
******************
Close collaboration with: Service visualization coordinator
DESCRIPTION
We wish to use the Zauruses for the final integrated demo, so people
can walk around the network to eavesdrop on the packets and use that to observe
what is happening in different local areas of the network. Instead of
displaying raw data, we hope to process the information and display the various
services covered in the minidemos. The user should be able to select from a
menu/tabbed pane which service to display on the screen.
IMPLEMENTATION
There are two ways of gathering information from the network. One is
to eavesdrop on packets flying by and listen to broadcasts on the network using
a generic_comm mote connected to the Zaurus. The other is to send queries into
the network for information using a generic_comm mote connect to the Zaurus
(see RESOURCES list below for more information on using Config interface for
sending queries).
Ideally, we will be using the Compact Flash Motes developed by Intel
(see RESOURCES list below) to serve as a generic_base mote to communicate with
the network of MICA2 motes. This may or may not require redevelopment of
software on the java side to talk to the compact flash mote. At the Spring
2003 NEST retreat, David Gay at Intel demonstrated using a compact flash mote
on the Compaq IPAQ to communicate with a MICA1 network, so he may have some
software that can already be used. The backup plan is to use the serial port
on the Zaurus's and connect to a MICA2 mote directly. In this case, we would
probably use the serial forwarder, moteIF, messageListener java
programs/interfaces to talk to the network. In any case, we will have to test
the latter first until the compact flash motes for the MICA2 networks come in.
To save development time, we wish to reuse the code from the minidemos
in our Zaurus devices. Therefore, the main task of the Zaurus programmer is to
port the code over to the Java 2 Platform, Micro Edition (J2ME). Part of the
tasks is to discover the limitations of running Java on the Zauruses (if any)
and inform the service visualization coordinator so he can disseminate this
information to the visualization coders. Ideally, even for the minidemos, we
have only one program in a JAR file that links to all the service visualization
java programs and displays them in a tabbed pane. If no problems arise,
porting to the Zaurus should be as easy as just running the JAR program used
for the minidemos. However, we need an expert on the Zauruses to identify and
provide workarounds to any problems that arise.
TASKS
1) Read documentation on differences in J2ME and J2SE. Pay particular
attention to whether there are differences in how input/output is handled.
* For example, we know that the Zaurus's have a smaller screen. Will this
cause formatting problems for the display windows?
* Are there progamming functions/constructs that are not supported/behave
differently on J2ME? Ex. Is Java's Swing supported? If there are coding
differences, notify the service visualization coordinator.
2) After playing with the Zaurus's, note what particular forms of input are
more/less cumbersome than that experienced on a laptop computer.
Currently, the plan is to use only buttons and pull down menus to switch
between modes and select options, minimizing typing. Provide this
feedback to the service visualization coordinator.
3) Test porting the Oscilloscope application to the Zaurus, and note any
difficulties encountered porting the program. Pay close attention to any
effects on the graphics.
4) Test porting Vanderbilt's Message Center to the Zaurus (see RESOURCES) as
a debugging tool, and note any difficulties encountered porting the program.
Note that VU's Message Center uses Swing... this is an opportunity to see
if there are any problems with using swing and finding work arounds.
5) Optional: Make modifications to the VU tools to make it easier to use on
the Zaurus (or write a new set of tools completely if appropriate). This
will make the Zaurus a good platform for debugging a deployed sensor
network.
6) Help with actual porting of service visualizations to Zaurus.
7) Write a set of instructions on how to setup and run the Zauruses. One set
of instructions for any initial configurations/setup, and another set of
instructions for how to start the program.
8)
RESOURCES
1) Java 2 Platform, Micro Edition
http://java.sun.com/j2me/
2) See the list "Packets Received From the Network".
3) Talk to David Gay (dg...@in...) and Wei Hong
(wh...@in...) about when we can get Compact Flash cards to
plug into the Zaurus's to interface with the Mica2 motes.
4) Querying the sensor network for information can be accomplished through
the Configuration interface written by Cory Sharp
(cs...@ee...). The documentation SHOULD be in
tinyos/minitasks/03/ucb/Config/Config_README.txt . If it is not there,
please email Cory Sharp to get it updated.
5) See Vanderbilt Tool Quick Reference for notes on how to run Vanderbilt's
network snooping tool.
6) See NesC tutorial for more information about the Oscilloscope application.
Vanderbilt Tool Quick Reference
-------------------------------
- In minitasks/02/VU/tools/java/isis/nest/messageCenter run
javac ./messageCenter/*.java ./util/*.java
- In minitasks/02/VU/tools/java directory run
java isis/nest/messageCenter/CenterFrame
- Progams that can be loaded by the App Loader:
* AllMSGDisplay.java
* DiagMSGDisplay.java
* MessageTable.java
* RegisterManager.java
- Message Table: mouse over the message format whitespace and wait
to get entry formatting information
* types accepted: char uint8 int8 hex8 uint16 int16 hex16
uint32 int32 hex32 float
* modifiers accepted: omit unique const (or no modifier)
* press reset button for formatting changes to take effect
* use AllMSGDisplay to help determine msg type and fields that are used
* the packet format specified has to be the exact length of the packet
transmitted to have the messages displayed
* you can add rows, fill in information, and send messages back to the
network
* if you save a configuration (the message format info), it will persist
between java sessions
- To delete all the messages in AllMSGDisplay and DiagMSGDisplay, type Ctrl-A,
then DELETE
|
|
From: <do...@us...> - 2003-07-02 03:39:21
|
Update of /cvsroot/firebug/firebug/web In directory sc8-pr-cvs1:/tmp/cvs-serv18274 Modified Files: smartstruct_abs.txt Log Message: Hopeful last draft of abstract. Index: smartstruct_abs.txt =================================================================== RCS file: /cvsroot/firebug/firebug/web/smartstruct_abs.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** smartstruct_abs.txt 2 Jul 2003 00:34:05 -0000 1.3 --- smartstruct_abs.txt 2 Jul 2003 03:39:18 -0000 1.4 *************** *** 1,4 **** - Title: --- 1,3 ---- *************** *** 14,26 **** sensors are becoming closer to practical reality. Interpreting data from such structures, however, ! often requires context. For example, temperature sensors fixed to the exterior of a building may record high temperatures as a result of radiant heat from a solar source, or from a wildfire. Interpreting such data ! often requires knowing the environmental conditions surrounding the structure, which may also be monitored by networked sensors. Convenience dictates that any such surrounding network be wireless and self-organizing. Wireless self-organizing sensor networks are the topic of much current interest. One of the most difficult aspects to --- 13,27 ---- sensors are becoming closer to practical reality. Interpreting data from such structures, however, ! requires context. For example, temperature sensors fixed to the exterior of a building may record high temperatures as a result of radiant heat from a solar source, or from a wildfire. Interpreting such data ! requires knowing the environmental conditions surrounding the structure, which may also be monitored by networked sensors. Convenience dictates that any such surrounding network be wireless and self-organizing. + + Wireless self-organizing sensor networks are the topic of much current interest. One of the most difficult aspects to *************** *** 34,41 **** gather information and do routing, to not perform optimally. Here, we present the results of field experiments using the Mica2 platfrom, an Atmel 128L microprocessor running ! the Tiny Operating System (TinyOS). The network ! was deployed in Claremont Canyon, a wooded riparian environment straddling the Berkeley and Oakland (CA) city limits. Vegetation in Claremont Canyon consists --- 35,47 ---- gather information and do routing, to not perform optimally. + + Preliminary results using 900 MHz radios indicate + that vegetation reduces the reliability of the + network to transmit data. Here, we present the results of field experiments using the Mica2 platfrom, an Atmel 128L microprocessor running ! the Tiny Operating System (TinyOS) with 433 MHz radio. ! The network was deployed in Claremont Canyon, ! a wooded riparian environment straddling the Berkeley and Oakland (CA) city limits. Vegetation in Claremont Canyon consists *************** *** 46,57 **** Regional Parks system, while the lower parts are heavily developed with single family residences ! and small retail establishments. - Our main interest is in testing our hypothesis using available - designs for organizing, sharing and routing in sensor - networks in a wildland environment. We present the results of - on-location behavior of the network, including a number - of link statistics and propose changes to the existing design for - added robustness. --- 52,57 ---- Regional Parks system, while the lower parts are heavily developed with single family residences ! and small retail establishments. |
|
From: <che...@us...> - 2003-07-02 00:47:55
|
Update of /cvsroot/firebug/firebug/project/src/multihop
In directory sc8-pr-cvs1:/tmp/cvs-serv30991/src/multihop
Modified Files:
BaseStation.nc BaseStationM.nc CollectDataFB.nc
CollectDataMFB.nc Makefile
Log Message:
change code for Blast-Mica2
Index: BaseStation.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/BaseStation.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BaseStation.nc 25 Apr 2003 01:10:14 -0000 1.5
--- BaseStation.nc 2 Jul 2003 00:47:50 -0000 1.6
***************
*** 7,15 ****
--- 7,29 ----
/*////////////////////////////////////////////////////////*/
+ includes RoutingStack;
configuration BaseStation {
}
+ implementation {
+ components Main, BaseStationM, MHSender, TimerWrapper, LedsC, VirtualComm, ParentSelection;
+ Main.StdControl -> BaseStationM.StdControl;
+ //BaseStationM.MultiHopSend -> MHSender.MultiHopSend[MH_STATISTIC_TYPE];
+ //ParentSelection.InForwardReceive -> VirtualComm.ReceiveMsg[MH_STATISTIC_TYPE];
+ BaseStationM.MultiHopSend -> MHSender.MultiHopSend[RS_DATA_TYPE];
+ ParentSelection.InForwardReceive -> VirtualComm.ReceiveMsg[RS_DATA_TYPE];
+ BaseStationM.Timer -> TimerWrapper.Timer[unique("Timer")];
+ BaseStationM.Leds -> LedsC;
+ Main.StdControl -> MHSender.StdControl;
+ //BaseStationM.Random -> RandomLFSR;
+ }
+ /*
implementation {
components Main, BaseStationM, MHDispatcher, TimerWrapper, LedsC, BcastCommand;
***************
*** 21,22 ****
--- 35,37 ----
//BaseStationM.ReceiveMsg -> CrcFilter.UpperReceive;
}
+ */
Index: BaseStationM.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/BaseStationM.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BaseStationM.nc 22 May 2003 22:39:51 -0000 1.7
--- BaseStationM.nc 2 Jul 2003 00:47:50 -0000 1.8
***************
*** 14,18 ****
! includes RoutingStackShared;
module BaseStationM {
--- 14,19 ----
! //includes RoutingStackShared;
! includes RoutingStack;
module BaseStationM {
***************
*** 21,32 ****
}
uses {
! interface MultiHopSend as MultiHopSend;
interface Timer as Timer;
interface Leds;
! interface HandleBcast;
//interface ReceiveMsg;
}
}
implementation {
--- 22,35 ----
}
uses {
! interface Send as MultiHopSend;
interface Timer as Timer;
interface Leds;
! //interface HandleBcast;
//interface ReceiveMsg;
+ //interface Random;
}
}
+ #define DATA_FREQ 3000
implementation {
***************
*** 69,75 ****
// struct DataFormat_t *dataPortion;
uint8_t *dataPortion;
struct DataFormat_t *df;
if (sending == 1) return SUCCESS;
! dataPortion = call MultiHopSend.getUsablePortion(msgToSend.data);
df = (struct DataFormat_t *) dataPortion;
df->addr = TOS_LOCAL_ADDRESS;
--- 72,80 ----
// struct DataFormat_t *dataPortion;
uint8_t *dataPortion;
+ uint16_t availableLength = 0;
+
struct DataFormat_t *df;
if (sending == 1) return SUCCESS;
! dataPortion = call MultiHopSend.getBuffer(&msgToSend, &availableLength);
df = (struct DataFormat_t *) dataPortion;
df->addr = TOS_LOCAL_ADDRESS;
***************
*** 92,98 ****
* @return: void
*/
! event void MultiHopSend.sendDone(TOS_MsgPtr msg, uint8_t success) {
!
sending = 0;
}
--- 97,103 ----
* @return: void
*/
! event result_t MultiHopSend.sendDone(TOS_MsgPtr msg, uint8_t success) {
sending = 0;
+ return SUCCESS;
}
***************
*** 123,130 ****
* @return: void
*/
!
event void HandleBcast.execute(TOS_MsgPtr msg) {
// uint8_t *cmdmsg = call HandleBcast.extractData(msg);
// do whatever we want to this message
}
}
--- 128,136 ----
* @return: void
*/
! /*
event void HandleBcast.execute(TOS_MsgPtr msg) {
// uint8_t *cmdmsg = call HandleBcast.extractData(msg);
// do whatever we want to this message
}
+ */
}
Index: CollectDataFB.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/CollectDataFB.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CollectDataFB.nc 23 May 2003 14:58:27 -0000 1.3
--- CollectDataFB.nc 2 Jul 2003 00:47:50 -0000 1.4
***************
*** 6,17 ****
*/
- includes RoutingStackShared;
configuration CollectDataFB {
}
-
implementation {
--- 6,34 ----
*/
+ includes RoutingStack;
+ configuration CollectDataFB {
+
+ }
+ implementation {
+ components Main, CollectDataMFB, MHSender, TimerWrapper, LedsC, VirtualComm, ParentSelection;
+ Main.StdControl -> CollectDataMFB.StdControl;
+ //CollectDataMFB.MultiHopSend -> MHSender.MultiHopSend[MH_STATISTIC_TYPE];
+ //ParentSelection.InForwardReceive -> VirtualComm.ReceiveMsg[MH_STATISTIC_TYPE];
+ CollectDataMFB.MultiHopSend -> MHSender.MultiHopSend[RS_DATA_TYPE];
+ ParentSelection.InForwardReceive -> VirtualComm.ReceiveMsg[RS_DATA_TYPE];
+ CollectDataMFB.Timer -> TimerWrapper.Timer[unique("Timer")];
+ CollectDataMFB.Leds -> LedsC;
+ Main.StdControl -> MHSender.StdControl;
+ //CollectDataMFB.Random -> RandomLFSR;
+ }
+
+ /*
+ includes RoutingStackShared;
configuration CollectDataFB {
}
implementation {
***************
*** 23,29 ****
BcastCommand,
RandomLFSR;
!
!
!
Main.StdControl -> CollectDataMFB.StdControl;
--- 40,44 ----
BcastCommand,
RandomLFSR;
!
Main.StdControl -> CollectDataMFB.StdControl;
***************
*** 35,36 ****
--- 50,52 ----
}
+ */
Index: CollectDataMFB.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/CollectDataMFB.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CollectDataMFB.nc 27 Jun 2003 19:17:20 -0000 1.7
--- CollectDataMFB.nc 2 Jul 2003 00:47:50 -0000 1.8
***************
*** 16,27 ****
*/
! includes RoutingStackShared;
! includes Routing;
!
/** max int is 2^16 for the lfsr random
* number generation scheme used in tinyos.
*/
! //#define FB_RAND_MAX 256*256
module CollectDataMFB {
--- 16,27 ----
*/
! //includes RoutingStackShared;
! //includes Routing;
! includes RoutingStack;
/** max int is 2^16 for the lfsr random
* number generation scheme used in tinyos.
*/
! #define FB_RAND_MAX 256*256
module CollectDataMFB {
***************
*** 34,46 ****
uses {
! interface MultiHopSend as MultiHopSend;
interface Timer as Timer;
interface Leds;
! interface HandleBcast;
! interface Random;
}
}
implementation {
--- 34,47 ----
uses {
! interface Send as MultiHopSend;
interface Timer as Timer;
interface Leds;
! //interface HandleBcast;
! //interface Random;
}
}
+ #define DATA_FREQ 3000
implementation {
***************
*** 100,104 ****
//#endif
*/
-
return 72.1;
}
--- 101,104 ----
***************
*** 125,128 ****
--- 125,129 ----
//uint8_t result;
uint8_t *dataPortion;
+ uint16_t availableLength = 0;
struct DataFormat_t *df;
***************
*** 132,136 ****
}
! dataPortion = call MultiHopSend.getUsablePortion(msgToSend.data);
df = (struct DataFormat_t *) dataPortion;
df->addr = TOS_LOCAL_ADDRESS;
--- 133,137 ----
}
! dataPortion = call MultiHopSend.getBuffer(&msgToSend, &availableLength);
df = (struct DataFormat_t *) dataPortion;
df->addr = TOS_LOCAL_ADDRESS;
***************
*** 144,150 ****
df->baro_pres = get_baro_pres();
! sending = 1;
! call MultiHopSend.send(&msgToSend, sizeof(struct DataFormat_t));
! //call Leds.greenToggle();
return SUCCESS;
}
--- 145,150 ----
df->baro_pres = get_baro_pres();
! sending = call MultiHopSend.send(&msgToSend, sizeof(struct DataFormat_t));
! call Leds.greenToggle();
return SUCCESS;
}
***************
*** 160,170 ****
*/
! event void MultiHopSend.sendDone(TOS_MsgPtr msg, uint8_t success) {
sending = 0;
! }
!
! event void HandleBcast.execute(TOS_MsgPtr msg) {
! // uint8_t *cmdmsg = call HandleBcast.extractData(msg);
! // do whatever we want to this message
}
--- 160,166 ----
*/
! event result_t MultiHopSend.sendDone(TOS_MsgPtr msg, uint8_t success) {
sending = 0;
! return SUCCESS;
}
Index: Makefile
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile 2 Jul 2003 00:19:22 -0000 1.12
--- Makefile 2 Jul 2003 00:47:50 -0000 1.13
***************
*** 12,20 ****
UISP = uisp
UISP_FLAGS = -dprog=dapa $(UISP_EXTRA_FLAGS)
! TOSROOT=/cygdrive/c/tinyos-1.x
PLATFORMS= mica mica2 pc
! DATASTRUCTURE=$(TOSROOT)/broken/experimental/terence/tos/lib/DataStructure
! ROUTESTACK=$(TOSROOT)/broken/experimental/terence/apps/mh6
! INCLUDES=-I$(DATASTRUCTURE) -I$(ROUTESTACK)
PFLAGS := $(PFLAGS) -Wall -Wshadow -DDEF_TOS_AM_GROUP=0x7d
--- 12,23 ----
UISP = uisp
UISP_FLAGS = -dprog=dapa $(UISP_EXTRA_FLAGS)
! TOSROOT=/cygdrive/c
PLATFORMS= mica mica2 pc
! #DATASTRUCTURE=$(TOSROOT)/broken/experimental/terence/tos/lib/DataStructure
! #ROUTESTACK=$(TOSROOT)/broken/experimental/terence/apps/mh6
! #INCLUDES=-I$(DATASTRUCTURE) -I$(ROUTESTACK)
!
! INCLUDES=-I$(TOSROOT)/Blast-0.1/Sender -I$(TOSROOT)/Blast-0.1/Interface -I$(TOSROOT)/Blast-0.1/DataStructure -I$(TOSROOT)/Blast-0.1/VirtualComm -I$(TOSROOT)/Blast-0.1/ParentSelection -I$(TOSROOT)/tinyos-1.x/tos
!
PFLAGS := $(PFLAGS) -Wall -Wshadow -DDEF_TOS_AM_GROUP=0x7d
|
|
From: <che...@us...> - 2003-07-02 00:47:55
|
Update of /cvsroot/firebug/firebug/project/java/src/org/firebug
In directory sc8-pr-cvs1:/tmp/cvs-serv30991/java/src/org/firebug
Modified Files:
DBLogger.java
Log Message:
change code for Blast-Mica2
Index: DBLogger.java
===================================================================
RCS file: /cvsroot/firebug/firebug/project/java/src/org/firebug/DBLogger.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DBLogger.java 23 May 2003 00:57:14 -0000 1.15
--- DBLogger.java 2 Jul 2003 00:47:49 -0000 1.16
***************
*** 32,36 ****
private int getMoteID (byte [] packet) {
! int baseID=packet[10];
return baseID; //id;
}
--- 32,36 ----
private int getMoteID (byte [] packet) {
! int baseID=packet[5];
return baseID; //id;
}
***************
*** 60,64 ****
// message.
! SensorMsg msg = new SensorMsg(packet,10,24);
Connection conn = dbh.getConnection();
--- 60,64 ----
// message.
! SensorMsg msg = new SensorMsg(packet,5,19);
Connection conn = dbh.getConnection();
|
|
From: <ash...@us...> - 2003-07-02 00:34:08
|
Update of /cvsroot/firebug/firebug/web In directory sc8-pr-cvs1:/tmp/cvs-serv29316 Modified Files: smartstruct_abs.txt Log Message: Index: smartstruct_abs.txt =================================================================== RCS file: /cvsroot/firebug/firebug/web/smartstruct_abs.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** smartstruct_abs.txt 1 Jul 2003 21:53:51 -0000 1.2 --- smartstruct_abs.txt 2 Jul 2003 00:34:05 -0000 1.3 *************** *** 23,33 **** any such surrounding network be wireless and self-organizing. - The efficacy of low power radio communication in wireless networks - not well understood. Work at Berkeley - and elsewhere has established the base-line behavior - of radio communication in a number of relatively - unobstructed environments, such as flat outdoor areas, - and large indoor spaces. Here, we present the results of field experiments using the Mica2 platfrom, an Atmel 128L microprocessor running --- 23,37 ---- any such surrounding network be wireless and self-organizing. + Wireless self-organizing sensor networks are the topic of much + current interest. One of the most difficult aspects to + constrain with these networks is the efficacy of radio + communications as a result of limited power. Most of the ongoing + work in this arena has been built upon testing in relatively + unobstructed environments, such as flat outdoor areas, and large + indoor spaces. However, more real world environments + that comprise of man-made of natural obstructions will cause the + existing architectures - in the way they organize, share and/or + gather information and do routing, to not perform optimally. Here, we present the results of field experiments using the Mica2 platfrom, an Atmel 128L microprocessor running *************** *** 44,52 **** and small retail establishments. ! ! Our main interest is in developing wireless communication ! in the wildland environment. We present the results of on-location behavior of the network, including a number ! of link statistics. --- 48,59 ---- and small retail establishments. ! Our main interest is in testing our hypothesis using available ! designs for organizing, sharing and routing in sensor ! networks in a wildland environment. We present the results of on-location behavior of the network, including a number ! of link statistics and propose changes to the existing design for ! added robustness. ! ! |
|
From: <ash...@us...> - 2003-07-02 00:19:24
|
Update of /cvsroot/firebug/firebug/project/src/multihop
In directory sc8-pr-cvs1:/tmp/cvs-serv21427
Modified Files:
Makefile
Log Message:
Index: Makefile
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile 27 Jun 2003 19:17:20 -0000 1.11
--- Makefile 2 Jul 2003 00:19:22 -0000 1.12
***************
*** 10,31 ****
!
! TOSROOT=/cygdrive/c
!
DATASTRUCTURE=$(TOSROOT)/broken/experimental/terence/tos/lib/DataStructure
ROUTESTACK=$(TOSROOT)/broken/experimental/terence/apps/mh6
! INCLUDES=-I$(DATASTRUCTURE) -I$(ROUTESTACK) -I$(TOSROOT)/tinyos-1.x/tos
! #INCLUDES=-I$(TOSROOT)/Blast-0.1/Sender -I$(TOSROOT)/Blast-0.1/Interface -I$(TOSROOT)/Blast-0.1/DataStructure -I$(TOSROOT)/Blast-0.1/VirtualComm -I$(TOSROOT)/Blast-0.1/ParentSelection
! #-I$(TOSROOT)/tinyos-1.x/tos
! PLATFORM=mica2
! MAIN_EXE= build/$(PLATFORM)/main.exe
! MAIN_SREC= build/$(PLATFORM)/main.srec
! APPLICATION = CollectDataFB.nc
! #APPLICATION = BaseStation.nc
--- 10,95 ----
! UISP = uisp
! UISP_FLAGS = -dprog=dapa $(UISP_EXTRA_FLAGS)
! TOSROOT=/cygdrive/c/tinyos-1.x
! PLATFORMS= mica mica2 pc
DATASTRUCTURE=$(TOSROOT)/broken/experimental/terence/tos/lib/DataStructure
ROUTESTACK=$(TOSROOT)/broken/experimental/terence/apps/mh6
! INCLUDES=-I$(DATASTRUCTURE) -I$(ROUTESTACK)
! PFLAGS := $(PFLAGS) -Wall -Wshadow -DDEF_TOS_AM_GROUP=0x7d
! PLATAUX=$(PLATFORMS) all
! PLATFORM := $(filter $(PLATAUX), $(MAKECMDGOALS))
! PFLAGS := -target=$(PLATFORM) $(PFLAGS)
! MAKECMDGOALS := $(filter-out $(PLATAUX), $(MAKECMDGOALS))
! BUILDDIR= build/$(PLATFORM)
! MAIN_EXE= $(BUILDDIR)/main.exe
! MAIN_SREC= $(BUILDDIR)/main.srec
! TARGETS= CollectDataFB BaseStation
! TARGET := $(filter $(TARGETS), $(MAKECMDGOALS))
! MAKECMDGOALS := $(filter-out $(TARGET), $(MAKECMDGOALS))
! ifeq ($(PLATFORM), pc)
! PFLAGS := -g -O0 -pthread $(PFLAGS) -fnesc-nido-tosnodes=1000 -fnesc-cfile=$(BUILDDIR)/app.c
! MAIN_TARGET = $(MAIN_EXE)
! else
! PFLAGS := -Os $(PFLAGS) -finline-limit=100000 -fnesc-cfile=$(BUILDDIR)/app.c
! MAIN_TARGET = $(MAIN_SREC)
! endif
+ NCC := ncc -board=micasb
! ######################################################################
! # top-level rules. switch based on MAKECMDGOALS
! ######################################################################
!
! #
! # rules for make clean
! #
! ifeq ($(MAKECMDGOALS)_x, clean_x)
!
! PLATFORM=
+ $(PLATAUX):
+ @echo ""
+
+ else
+
+ ifeq ($(PLATFORM)_x,_x)
+ $(error $(PLATAUX) $(MAKECMDGOALS) $(USAGE))
+ endif
+
+ MAKECMDGOALS := $(patsubst install.%,install,$(MAKECMDGOALS))
+ MAKECMDGOALS := $(patsubst reinstall.%,reinstall,$(MAKECMDGOALS))
+
+ #
+ # rules for make install <platform>
+ #
+ ifeq ($(MAKECMDGOALS)_x, install_x)
+
+ $(PLATAUX):
+ @true
+
+ else
+ ifeq ($(MAKECMDGOALS)_x, reinstall_x)
+
+ $(PLATAUX):
+ @true
+
+ else
+ all:
+ for platform in $(PLATFORMS); do \
+ $(MAKE) $$platform $(DOCS) || exit 1; \
+ done
+
+ $(PLATFORMS): build
+
+ endif
+ endif
+ endif
+
+
+ #APPLICATION = CollectDataFB.nc
+ #APPLICATION = BaseStation.nc
***************
*** 40,86 ****
! pc:
! ncc -board=micasb -o build/pc/main.exe -g -O0 -pthread -target=pc -Wall -Wshadow -DDEF_TOS_AM_GROUP=0x7d -fnesc-nido-tosnodes=1000 -fnesc-cfile=build/pc/app.c $(INCLUDES) $(APPLICATION) -lm
!
!
! mica:
! ncc -board=micasb -o build/mica/main.exe -Os -target=mica -Wall -Wshadow -DDEF_TOS_AM_GROUP=0x7d -finline-limit=100000 -fnesc-cfile=build/mica/app.c $(INCLUDES) $(APPLICATION) -lm
- mica2:
- ncc -board=micasb -o build/mica2/main.exe -Os -target=mica2 -Wall -Wshadow -DDEF_TOS_AM_GROUP=0x7d -finline-limit=100000 -fnesc-cfile=build/mica2/app.c $(INCLUDES) $(APPLICATION) -lm
install: $(MAIN_SREC) FORCE
! $(MAKE) $(PLATFORM) re$@
!
install.%: $(MAIN_SREC) FORCE
$(MAKE) $(PLATFORM) re$@
- UISP = uisp
- UISP_FLAGS = -dprog=dapa $(UISP_EXTRA_FLAGS)
-
reinstall: FORCE
! @echo " installing mica binary "
! $(UISP) $(UISP_FLAGS) --erase
! sleep 1
! $(UISP) $(UISP_FLAGS) --upload if=build/$(PLATFORM)/main.srec
! sleep 1
! $(UISP) $(UISP_FLAGS) --verify if=build/$(PLATFORM)/main.srec
!
reinstall.%: FORCE
! @echo " installing mica binary "
! set-mote-id build/$(PLATFORM)/main.srec build/$(PLATFORM)/main.srec.out `echo $@ |sed 's:reinstall.::g'`
$(UISP) $(UISP_FLAGS) --erase
sleep 1
! $(UISP) $(UISP_FLAGS) --upload if=build/$(PLATFORM)/main.srec.out
sleep 1
! $(UISP) $(UISP_FLAGS) --verify if=build/$(PLATFORM)/main.srec.out
$(MAIN_SREC): $(MAIN_EXE)
! avr-objcopy --output-target=srec build/$(PLATFORM)/main.exe build/$(PLATFORM)/main.srec
clean:
! rm build/mica/*
! rm build/pc/*
--- 104,149 ----
! build: $(MAIN_TARGET)
install: $(MAIN_SREC) FORCE
! @$(MAKE) $(PLATFORM) re$@
install.%: $(MAIN_SREC) FORCE
$(MAKE) $(PLATFORM) re$@
reinstall: FORCE
! @echo " installing $(PLATFORM) binary"
! $(UISP) $(UISP_FLAGS) --erase
! sleep 1
! $(UISP) $(UISP_FLAGS) --upload if=$(MAIN_SREC)
! sleep 1
! $(UISP) $(UISP_FLAGS) --verify if=$(MAIN_SREC)
reinstall.%: FORCE
! @echo " installing $(PLATFORM) binary "
! set-mote-id $(BUILDDIR)/main.srec $(BUILDDIR)/main.srec.out `echo $@ |sed 's:reinstall.::g'`
$(UISP) $(UISP_FLAGS) --erase
sleep 1
! $(UISP) $(UISP_FLAGS) --upload if=$(BUILDDIR)/main.srec.out
sleep 1
! $(UISP) $(UISP_FLAGS) --verify if=$(BUILDDIR)/main.srec.out
!
!
! $(MAIN_EXE): $(BUILDDIR) FORCE
! @echo " compiling $(TARGET) to a $(PLATFORM) binary"
! $(NCC) -o $(MAIN_EXE) $(PFLAGS) $(CFLAGS) $(INCLUDES) $(TARGET).nc -lm $(LDFLAGS)
! @echo " compiled $(COMPONENT) to $@"
! @objdump -h $(MAIN_EXE) | perl -ne '$$b{$$1}=hex $$2 if /^\s*\d+\s*\.(text|data|bss)\s+(\S+)/; END { printf("%16d bytes in ROM\n%16d bytes in RAM\n",$$b{text}+$$b{data},$$b{bss}); }'
$(MAIN_SREC): $(MAIN_EXE)
! avr-objcopy --output-target=srec $(MAIN_EXE) $(MAIN_SREC)
!
! $(BUILDDIR):
! mkdir -p $(BUILDDIR)
clean:
! rm -rf $(BUILDDIR)
! rm -f core.*
! rm -f *~
|
|
From: <do...@us...> - 2003-07-01 21:53:54
|
Update of /cvsroot/firebug/firebug/web In directory sc8-pr-cvs1:/tmp/cvs-serv14470 Modified Files: smartstruct_abs.txt Log Message: Fixed some poor wording in the abstract. Index: smartstruct_abs.txt =================================================================== RCS file: /cvsroot/firebug/firebug/web/smartstruct_abs.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** smartstruct_abs.txt 25 Jun 2003 22:29:40 -0000 1.1 --- smartstruct_abs.txt 1 Jul 2003 21:53:51 -0000 1.2 *************** *** 14,46 **** sensors are becoming closer to practical reality. Interpreting data from such structures, however, ! often requires context: brick cladding sensor ! high temperatures as a result of radiant heating ! from solar or from wildfire. Interpreting such data often requires knowing the environmental conditions ! surrounding the structure. Convenience dictates that any such surrounding network be wireless and self-organizing. ! Wireless self-organizing sensor networks are the topic ! of much current interest. One of the most difficult ! aspects to constrain with these networks is the ! efficacy of radio communications. Work at Berkeley ! and elsewhere has established base-line behavior of radio communication in a number of relatively unobstructed environments, such as flat outdoor areas, ! and large indoor and indoor corridors. ! ! Here, we present the results of field experiments using the ! Mica2 platfrom, and Atmel 128L microprocessor running ! the Tiny Operating System (TinyOS) deployed in Claremont ! Canyon, a wooded riparian environment straddling the Berkeley and Oakland (CA) city limits. Vegetation in Claremont Canyon consists ! of a high proportion of Eucalyptus and Monterey Pine groves, extremely flammable in the dry conditions common in late summer and early autumn in the area. The upper ends of the canyon are part of the East Bay Regional Parks system, while the lower parts are ! heavily developed with single family residences. Our main interest is in developing wireless communication --- 14,47 ---- sensors are becoming closer to practical reality. Interpreting data from such structures, however, ! often requires context. For example, temperature sensors ! fixed to the exterior of a building may record high ! temperatures as a result of radiant heat from a solar ! source, or from a wildfire. Interpreting such data often requires knowing the environmental conditions ! surrounding the structure, which may also be monitored ! by networked sensors. Convenience dictates that any such surrounding network be wireless and self-organizing. ! ! The efficacy of low power radio communication in wireless networks ! not well understood. Work at Berkeley ! and elsewhere has established the base-line behavior of radio communication in a number of relatively unobstructed environments, such as flat outdoor areas, ! and large indoor spaces. Here, we present the results of field experiments using the ! Mica2 platfrom, an Atmel 128L microprocessor running ! the Tiny Operating System (TinyOS). The network ! was deployed in Claremont Canyon, a wooded riparian environment straddling the Berkeley and Oakland (CA) city limits. Vegetation in Claremont Canyon consists ! of a high proportion of eucalyptus and Monterey pine groves, extremely flammable in the dry conditions common in late summer and early autumn in the area. The upper ends of the canyon are part of the East Bay Regional Parks system, while the lower parts are ! heavily developed with single family residences ! and small retail establishments. ! Our main interest is in developing wireless communication |
|
From: <cs...@us...> - 2003-06-27 23:47:30
|
Update of /cvsroot/firebug/firebug/project/java/src/org/firebug/gps In directory sc8-pr-cvs1:/tmp/cvs-serv16753 Removed Files: gpsBcast.java Log Message: removed gpsBcast --- gpsBcast.java DELETED --- |
|
From: <cs...@us...> - 2003-06-27 23:44:32
|
Update of /cvsroot/firebug/firebug/project/java/src/org/firebug/gps
In directory sc8-pr-cvs1:/tmp/cvs-serv16256
Modified Files:
LogMsg.java
Log Message:
update class files
Index: LogMsg.java
===================================================================
RCS file: /cvsroot/firebug/firebug/project/java/src/org/firebug/gps/LogMsg.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LogMsg.java 23 May 2003 15:30:43 -0000 1.1
--- LogMsg.java 27 Jun 2003 23:44:29 -0000 1.2
***************
*** 7,10 ****
--- 7,11 ----
package org.firebug.gps;
+
public class LogMsg extends net.tinyos.message.Message {
|
|
From: <che...@us...> - 2003-06-27 19:22:27
|
Update of /cvsroot/firebug/firebug/project/src/multihop
In directory sc8-pr-cvs1:/tmp/cvs-serv7254
Modified Files:
CollectDataMFB.nc Makefile
Log Message:
.
Index: CollectDataMFB.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/CollectDataMFB.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CollectDataMFB.nc 23 May 2003 14:58:27 -0000 1.6
--- CollectDataMFB.nc 27 Jun 2003 19:17:20 -0000 1.7
***************
*** 23,28 ****
* number generation scheme used in tinyos.
*/
! #define FB_RAND_MAX 256*256
!
module CollectDataMFB {
--- 23,27 ----
* number generation scheme used in tinyos.
*/
! //#define FB_RAND_MAX 256*256
module CollectDataMFB {
***************
*** 86,90 ****
float get_temp() {
!
//#if 0
float x1,x2,w,y1,y2;
--- 85,89 ----
float get_temp() {
! /*
//#if 0
float x1,x2,w,y1,y2;
***************
*** 100,103 ****
--- 99,103 ----
y2 = x2*w;
//#endif
+ */
return 72.1;
***************
*** 123,128 ****
event result_t Timer.fired() {
! uint8_t result;
uint8_t *dataPortion;
struct DataFormat_t *df;
--- 123,129 ----
event result_t Timer.fired() {
! //uint8_t result;
uint8_t *dataPortion;
+
struct DataFormat_t *df;
***************
*** 144,149 ****
sending = 1;
! result = call MultiHopSend.send(&msgToSend, sizeof(struct DataFormat_t));
! call Leds.greenToggle();
return SUCCESS;
}
--- 145,150 ----
sending = 1;
! call MultiHopSend.send(&msgToSend, sizeof(struct DataFormat_t));
! //call Leds.greenToggle();
return SUCCESS;
}
***************
*** 162,171 ****
sending = 0;
}
!
event void HandleBcast.execute(TOS_MsgPtr msg) {
// uint8_t *cmdmsg = call HandleBcast.extractData(msg);
// do whatever we want to this message
}
!
}
--- 163,172 ----
sending = 0;
}
!
event void HandleBcast.execute(TOS_MsgPtr msg) {
// uint8_t *cmdmsg = call HandleBcast.extractData(msg);
// do whatever we want to this message
}
!
}
Index: Makefile
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Makefile 23 May 2003 00:57:14 -0000 1.10
--- Makefile 27 Jun 2003 19:17:20 -0000 1.11
***************
*** 11,22 ****
! TOSROOT=/cygdrive/c/tinyos-1.x
DATASTRUCTURE=$(TOSROOT)/broken/experimental/terence/tos/lib/DataStructure
ROUTESTACK=$(TOSROOT)/broken/experimental/terence/apps/mh6
! INCLUDES=-I$(DATASTRUCTURE) -I$(ROUTESTACK)
- MAIN_EXE= build/mica/main.exe
- MAIN_SREC= build/mica/main.srec
APPLICATION = CollectDataFB.nc
--- 11,27 ----
! TOSROOT=/cygdrive/c
DATASTRUCTURE=$(TOSROOT)/broken/experimental/terence/tos/lib/DataStructure
ROUTESTACK=$(TOSROOT)/broken/experimental/terence/apps/mh6
! INCLUDES=-I$(DATASTRUCTURE) -I$(ROUTESTACK) -I$(TOSROOT)/tinyos-1.x/tos
!
! #INCLUDES=-I$(TOSROOT)/Blast-0.1/Sender -I$(TOSROOT)/Blast-0.1/Interface -I$(TOSROOT)/Blast-0.1/DataStructure -I$(TOSROOT)/Blast-0.1/VirtualComm -I$(TOSROOT)/Blast-0.1/ParentSelection
! #-I$(TOSROOT)/tinyos-1.x/tos
!
! PLATFORM=mica2
! MAIN_EXE= build/$(PLATFORM)/main.exe
! MAIN_SREC= build/$(PLATFORM)/main.srec
APPLICATION = CollectDataFB.nc
***************
*** 42,51 ****
ncc -board=micasb -o build/mica/main.exe -Os -target=mica -Wall -Wshadow -DDEF_TOS_AM_GROUP=0x7d -finline-limit=100000 -fnesc-cfile=build/mica/app.c $(INCLUDES) $(APPLICATION) -lm
install: $(MAIN_SREC) FORCE
! $(MAKE) mica re$@
install.%: $(MAIN_SREC) FORCE
! $(MAKE) mica re$@
UISP = uisp
--- 47,58 ----
ncc -board=micasb -o build/mica/main.exe -Os -target=mica -Wall -Wshadow -DDEF_TOS_AM_GROUP=0x7d -finline-limit=100000 -fnesc-cfile=build/mica/app.c $(INCLUDES) $(APPLICATION) -lm
+ mica2:
+ ncc -board=micasb -o build/mica2/main.exe -Os -target=mica2 -Wall -Wshadow -DDEF_TOS_AM_GROUP=0x7d -finline-limit=100000 -fnesc-cfile=build/mica2/app.c $(INCLUDES) $(APPLICATION) -lm
install: $(MAIN_SREC) FORCE
! $(MAKE) $(PLATFORM) re$@
install.%: $(MAIN_SREC) FORCE
! $(MAKE) $(PLATFORM) re$@
UISP = uisp
***************
*** 56,75 ****
$(UISP) $(UISP_FLAGS) --erase
sleep 1
! $(UISP) $(UISP_FLAGS) --upload if=build/mica/main.srec
sleep 1
! $(UISP) $(UISP_FLAGS) --verify if=build/mica/main.srec
reinstall.%: FORCE
@echo " installing mica binary "
! set-mote-id build/mica/main.srec build/mica/main.srec.out `echo $@ |sed 's:reinstall.::g'`
$(UISP) $(UISP_FLAGS) --erase
sleep 1
! $(UISP) $(UISP_FLAGS) --upload if=build/mica/main.srec.out
sleep 1
! $(UISP) $(UISP_FLAGS) --verify if=build/mica/main.srec.out
$(MAIN_SREC): $(MAIN_EXE)
! avr-objcopy --output-target=srec build/mica/main.exe build/mica/main.srec
clean:
--- 63,82 ----
$(UISP) $(UISP_FLAGS) --erase
sleep 1
! $(UISP) $(UISP_FLAGS) --upload if=build/$(PLATFORM)/main.srec
sleep 1
! $(UISP) $(UISP_FLAGS) --verify if=build/$(PLATFORM)/main.srec
reinstall.%: FORCE
@echo " installing mica binary "
! set-mote-id build/$(PLATFORM)/main.srec build/$(PLATFORM)/main.srec.out `echo $@ |sed 's:reinstall.::g'`
$(UISP) $(UISP_FLAGS) --erase
sleep 1
! $(UISP) $(UISP_FLAGS) --upload if=build/$(PLATFORM)/main.srec.out
sleep 1
! $(UISP) $(UISP_FLAGS) --verify if=build/$(PLATFORM)/main.srec.out
$(MAIN_SREC): $(MAIN_EXE)
! avr-objcopy --output-target=srec build/$(PLATFORM)/main.exe build/$(PLATFORM)/main.srec
clean:
|
|
From: <do...@us...> - 2003-06-25 22:43:42
|
Update of /cvsroot/firebug/firebug/web
In directory sc8-pr-cvs1:/tmp/cvs-serv2868
Modified Files:
people.html
Log Message:
Contact info for friday.
Index: people.html
===================================================================
RCS file: /cvsroot/firebug/firebug/web/people.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** people.html 23 Jun 2003 23:59:40 -0000 1.3
--- people.html 25 Jun 2003 22:43:38 -0000 1.4
***************
*** 62,71 ****
</li>
! <li>David M. Doolin</li>
<li>Carmel Majidi</li>
<li>(Max) Min Chen</li>
<li>Anshuman Sharma</li>
! <li>Wei Luo</li>
! <li>JinChuan Xu</li>
<li>Tracy Yang</li>
</ul>
--- 62,81 ----
</li>
! <li>
! David M. Doolin, O: 642-9278, H: 558-8294.
! </li>
!
<li>Carmel Majidi</li>
<li>(Max) Min Chen</li>
<li>Anshuman Sharma</li>
!
! <li>
! Wei Luo, O: 642-8641, H: 525-3870.
! </li>
!
! <li>
! JinChuan Xu, H: 558-1240.
! </li>
!
<li>Tracy Yang</li>
</ul>
|
