firebug-cvs Mailing List for FireBug: wireless wildfire monitoring (Page 34)
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: David D. <do...@ce...> - 2003-07-15 17:15:04
|
All that j++ stuff still really bugs me, I just
can't figure out why the pointer isn't offset
initially and the char arrays indexed appropriately.
But I am not going to fiddle with it if it works.
dave d
On Tue, 15 Jul 2003 cs...@us... wrote:
> Update of /cvsroot/firebug/firebug/project/src/gps
> In directory sc8-pr-cvs1:/tmp/cvs-serv29481
>
> Modified Files:
> TestMTS350M.nc
> Log Message:
> corrected index errors in logGPS
>
> Index: TestMTS350M.nc
> ===================================================================
> RCS file: /cvsroot/firebug/firebug/project/src/gps/TestMTS350M.nc,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -C2 -d -r1.3 -r1.4
> *** TestMTS350M.nc 11 Jul 2003 16:19:20 -0000 1.3
> --- TestMTS350M.nc 15 Jul 2003 16:57:35 -0000 1.4
> ***************
> *** 368,378 ****
> pGGA->Lat_deg = 10*(write[2][0]-'0') + (write[2][1]-'0');
> log_array[4] = pGGA->Lat_deg;
> ! pGGA->Lat_dec_min = 100000*(write[2][4]-'0') + 10000*(write[2][5]-'0') + 1000*(write[2][7]-'0') + 100*(write[2][8]-'0') + 10*(write[2][9]-'0') + (write[2][10]-'0');
> log_array[5] = (pGGA->Lat_dec_min)>>8;
> log_array[6] = pGGA->Lat_dec_min;
>
> ! pGGA->Long_deg = 10*(write[4][0]-'0') + (write[4][1]-'0');
> log_array[7] = pGGA->Long_deg;
> ! pGGA->Long_dec_min = 100000*(write[4][4]-'0') + 10000*(write[4][5]-'0') + 1000*(write[4][7]-'0') + 100*(write[4][8]-'0') + 10*(write[4][9]-'0') + (write[4][10]-'0');
> log_array[8] = (pGGA->Long_dec_min)>>8;
> log_array[9] = pGGA->Long_dec_min;
> --- 368,378 ----
> pGGA->Lat_deg = 10*(write[2][0]-'0') + (write[2][1]-'0');
> log_array[4] = pGGA->Lat_deg;
> ! pGGA->Lat_dec_min = 100000*(write[2][2]-'0') + 10000*(write[2][3]-'0') + 1000*(write[2][4]-'0') + 100*(write[2][5]-'0') + 10*(write[2][6]-'0') + (write[2][7]-'0');
> log_array[5] = (pGGA->Lat_dec_min)>>8;
> log_array[6] = pGGA->Lat_dec_min;
>
> ! pGGA->Long_deg = 100*(write[4][0]-'0') + 10*(write[4][1]-'0') + (write[4][2]-'0');
> log_array[7] = pGGA->Long_deg;
> ! pGGA->Long_dec_min = 100000*(write[4][3]-'0') + 10000*(write[4][4]-'0') + 1000*(write[4][5]-'0') + 100*(write[4][6]-'0') + 10*(write[4][7]-'0') + (write[4][8]-'0');
> log_array[8] = (pGGA->Long_dec_min)>>8;
> log_array[9] = pGGA->Long_dec_min;
> ***************
> *** 384,394 ****
>
> //***DEBUG: Output GGA data before write***
> ! //for(j=0; j<11; j++) UARTPutChar(log_array[j]);
> ! //SODbg(DBG_USR2, "\n");
> //*****************************************
>
> ! if(call GpsCmd.GpsPower(0)) {
> ! SODbg(DBG_USR2, "GPS Power Off\n");
> ! }
>
> if(call LoggerWrite.write(0x19,(char *)log_array)){
> --- 384,394 ----
>
> //***DEBUG: Output GGA data before write***
> ! for(j=0; j<11; j++) UARTPutChar(log_array[j]);
> ! SODbg(DBG_USR2, "\n");
> //*****************************************
>
> ! //if(call GpsCmd.GpsPower(0)) {
> ! // SODbg(DBG_USR2, "GPS Power Off\n");
> ! //}
>
> if(call LoggerWrite.write(0x19,(char *)log_array)){
> ***************
> *** 402,412 ****
>
> //***DEBUG: Read and Output Stored GGA data***
> ! //char line[32];
> ! //uint8_t i;
> ! //if (call LoggerRead.read(0x19,line)) {
> ! // for(i=16; i<32; i++) UARTPutChar(line[i]);
> ! //}
> ! //SODbg(DBG_USR2, "\n");
> ! //SODbg(DBG_USR2, "\n");
> //*********************************************
>
> --- 402,412 ----
>
> //***DEBUG: Read and Output Stored GGA data***
> ! char line[32];
> ! uint8_t i;
> ! if (call LoggerRead.read(0x19,line)) {
> ! for(i=16; i<32; i++) UARTPutChar(line[i]);
> ! }
> ! SODbg(DBG_USR2, "\n");
> ! SODbg(DBG_USR2, "\n");
> //*********************************************
>
>
>
>
>
> -------------------------------------------------------
> This SF.Net email sponsored by: Parasoft
> Error proof Web apps, automate testing & more.
> Download & eval WebKing and get a free book.
> www.parasoft.com/bulletproofapps1
> _______________________________________________
> Firebug-cvs mailing list
> Fir...@li...
> https://lists.sourceforge.net/lists/listinfo/firebug-cvs
>
|
|
From: <cs...@us...> - 2003-07-15 16:57:38
|
Update of /cvsroot/firebug/firebug/project/src/gps
In directory sc8-pr-cvs1:/tmp/cvs-serv29481
Modified Files:
TestMTS350M.nc
Log Message:
corrected index errors in logGPS
Index: TestMTS350M.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/gps/TestMTS350M.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMTS350M.nc 11 Jul 2003 16:19:20 -0000 1.3
--- TestMTS350M.nc 15 Jul 2003 16:57:35 -0000 1.4
***************
*** 368,378 ****
pGGA->Lat_deg = 10*(write[2][0]-'0') + (write[2][1]-'0');
log_array[4] = pGGA->Lat_deg;
! pGGA->Lat_dec_min = 100000*(write[2][4]-'0') + 10000*(write[2][5]-'0') + 1000*(write[2][7]-'0') + 100*(write[2][8]-'0') + 10*(write[2][9]-'0') + (write[2][10]-'0');
log_array[5] = (pGGA->Lat_dec_min)>>8;
log_array[6] = pGGA->Lat_dec_min;
! pGGA->Long_deg = 10*(write[4][0]-'0') + (write[4][1]-'0');
log_array[7] = pGGA->Long_deg;
! pGGA->Long_dec_min = 100000*(write[4][4]-'0') + 10000*(write[4][5]-'0') + 1000*(write[4][7]-'0') + 100*(write[4][8]-'0') + 10*(write[4][9]-'0') + (write[4][10]-'0');
log_array[8] = (pGGA->Long_dec_min)>>8;
log_array[9] = pGGA->Long_dec_min;
--- 368,378 ----
pGGA->Lat_deg = 10*(write[2][0]-'0') + (write[2][1]-'0');
log_array[4] = pGGA->Lat_deg;
! pGGA->Lat_dec_min = 100000*(write[2][2]-'0') + 10000*(write[2][3]-'0') + 1000*(write[2][4]-'0') + 100*(write[2][5]-'0') + 10*(write[2][6]-'0') + (write[2][7]-'0');
log_array[5] = (pGGA->Lat_dec_min)>>8;
log_array[6] = pGGA->Lat_dec_min;
! pGGA->Long_deg = 100*(write[4][0]-'0') + 10*(write[4][1]-'0') + (write[4][2]-'0');
log_array[7] = pGGA->Long_deg;
! pGGA->Long_dec_min = 100000*(write[4][3]-'0') + 10000*(write[4][4]-'0') + 1000*(write[4][5]-'0') + 100*(write[4][6]-'0') + 10*(write[4][7]-'0') + (write[4][8]-'0');
log_array[8] = (pGGA->Long_dec_min)>>8;
log_array[9] = pGGA->Long_dec_min;
***************
*** 384,394 ****
//***DEBUG: Output GGA data before write***
! //for(j=0; j<11; j++) UARTPutChar(log_array[j]);
! //SODbg(DBG_USR2, "\n");
//*****************************************
! if(call GpsCmd.GpsPower(0)) {
! SODbg(DBG_USR2, "GPS Power Off\n");
! }
if(call LoggerWrite.write(0x19,(char *)log_array)){
--- 384,394 ----
//***DEBUG: Output GGA data before write***
! for(j=0; j<11; j++) UARTPutChar(log_array[j]);
! SODbg(DBG_USR2, "\n");
//*****************************************
! //if(call GpsCmd.GpsPower(0)) {
! // SODbg(DBG_USR2, "GPS Power Off\n");
! //}
if(call LoggerWrite.write(0x19,(char *)log_array)){
***************
*** 402,412 ****
//***DEBUG: Read and Output Stored GGA data***
! //char line[32];
! //uint8_t i;
! //if (call LoggerRead.read(0x19,line)) {
! // for(i=16; i<32; i++) UARTPutChar(line[i]);
! //}
! //SODbg(DBG_USR2, "\n");
! //SODbg(DBG_USR2, "\n");
//*********************************************
--- 402,412 ----
//***DEBUG: Read and Output Stored GGA data***
! char line[32];
! uint8_t i;
! if (call LoggerRead.read(0x19,line)) {
! for(i=16; i<32; i++) UARTPutChar(line[i]);
! }
! SODbg(DBG_USR2, "\n");
! SODbg(DBG_USR2, "\n");
//*********************************************
|
|
From: <do...@us...> - 2003-07-15 01:51:23
|
Update of /cvsroot/firebug/firebug/web
In directory sc8-pr-cvs1:/tmp/cvs-serv14337
Modified Files:
spie.bib spie_2004.tex
Log Message:
Fixeda conflict in spie.bib
Index: spie.bib
===================================================================
RCS file: /cvsroot/firebug/firebug/web/spie.bib,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** spie.bib 14 Jul 2003 23:17:20 -0000 1.4
--- spie.bib 15 Jul 2003 01:51:07 -0000 1.5
***************
*** 52,56 ****
}
! @inproceedings{Mihai:ProbabilisticLocalization,
author = {V.~Ramadurai and M.~L.~Sichitiu},
title = {Localization in Wireless Sensor Networks: A
--- 52,57 ----
}
!
! @inproceedings{ramadurai:v2003,
author = {V.~Ramadurai and M.~L.~Sichitiu},
title = {Localization in Wireless Sensor Networks: A
***************
*** 59,68 ****
Wireless Networks (ICWN 2003)},
address = {Las Vegas, NV},
! month = Jun,
year = 2003,
}
! @inproceedings{Mihai:SimpleLocalization,
author = {M.~L.~Sichitiu and V.~Ramadurai and
P.~Peddabachagari},
--- 60,69 ----
Wireless Networks (ICWN 2003)},
address = {Las Vegas, NV},
! month = June,
year = 2003,
}
! @inproceedings{sichitiu:ml2003,
author = {M.~L.~Sichitiu and V.~Ramadurai and
P.~Peddabachagari},
***************
*** 73,77 ****
Wireless Networks (ICWN 2003)},
address = {Las Vegas, NV},
! month = Jun,
year = 2003,
}
--- 74,78 ----
Wireless Networks (ICWN 2003)},
address = {Las Vegas, NV},
! month = June,
year = 2003,
}
***************
*** 106,110 ****
title = {Taming the underlying hurdles for
Reliable Multihop Routing in Sensor Networks},
! booktitle = {},
OPTcrossref = {},
OPTkey = {},
--- 107,111 ----
title = {Taming the underlying hurdles for
Reliable Multihop Routing in Sensor Networks},
! booktitle = {Proceedings of ACM SenSys 2003},
OPTcrossref = {},
OPTkey = {},
***************
*** 115,120 ****
OPTnumber = {},
OPTseries = {},
! OPTaddress = {},
! OPTmonth = {},
OPTorganization = {},
OPTpublisher = {},
--- 116,121 ----
OPTnumber = {},
OPTseries = {},
! address = {Los Angeles, CA},
! month = {November 5-7},
OPTorganization = {},
OPTpublisher = {},
Index: spie_2004.tex
===================================================================
RCS file: /cvsroot/firebug/firebug/web/spie_2004.tex,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** spie_2004.tex 14 Jul 2003 22:40:22 -0000 1.3
--- spie_2004.tex 15 Jul 2003 01:51:07 -0000 1.4
***************
*** 100,104 ****
One or two paragraphs describing other work with
wireless sensor networks outdoors, specifically,
! ~\cite{mainwaring:a2002,west:b2001,mehta:v2002}.
--- 100,104 ----
One or two paragraphs describing other work with
wireless sensor networks outdoors, specifically,
! ~\cite{mainwaring:a2002,west:b2001,mehta:v2002,sichitiu:ml2003}.
***************
*** 126,130 ****
\item Routing tables evolve using window mean with exponentially weighted,
moving average (WMEWMA) estimators for evaluating link quality.
! EWMA balances reactivity to changes in link quality (agility)
with
--- 126,130 ----
\item Routing tables evolve using window mean with exponentially weighted,
moving average (WMEWMA) estimators for evaluating link quality.
! WMEWMA balances reactivity to changes in link quality (agility)
with
|
|
From: <do...@us...> - 2003-07-14 23:17:23
|
Update of /cvsroot/firebug/firebug/web
In directory sc8-pr-cvs1:/tmp/cvs-serv25325
Modified Files:
spie.bib
Log Message:
Added ref for ucla report.
Index: spie.bib
===================================================================
RCS file: /cvsroot/firebug/firebug/web/spie.bib,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** spie.bib 14 Jul 2003 22:40:22 -0000 1.3
--- spie.bib 14 Jul 2003 23:17:20 -0000 1.4
***************
*** 1,4 ****
--- 1,22 ----
+
+
+ @TechReport{ganesan:d2002,
+ author = {D. Ganesan and B. Krishnamachari and A. Woo
+ and D. Culler and D. Estrin and and S. Wicker},
+ title = {Complex Behavior at Scale: An Experimental
+ Study of Low-Power Wireless Sensor Networks. },
+ institution = {University of California},
+ year = {2002},
+ OPTkey = {},
+ type = {Technical Report CSD-TR 02-0013},
+ OPTnumber = {},
+ address = {Los Angeles},
+ month = {February},
+ OPTnote = {},
+ OPTannote = {}
+ }
+
@inproceedings{mainwaring:a2002,
author = "Alan Mainwaring and Joseph Polastre and
|
|
From: <do...@us...> - 2003-07-14 22:40:29
|
Update of /cvsroot/firebug/firebug/web
In directory sc8-pr-cvs1:/tmp/cvs-serv19125
Modified Files:
Makefile spie.bib spie_2004.tex
Added Files:
tempfig.gnu
Log Message:
Added gnuplot file for a temporary figure
just to hold place until we get some real data.
--- NEW FILE: tempfig.gnu ---
set term postscript eps
set output "tempfig.eps"
set size 0.6
plot sin(x)
Index: Makefile
===================================================================
RCS file: /cvsroot/firebug/firebug/web/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile 11 Jul 2003 16:11:44 -0000 1.1
--- Makefile 14 Jul 2003 22:40:22 -0000 1.2
***************
*** 1,4 ****
--- 1,9 ----
+ .SUFFIXES : .gnu .eps
+
+ EPSPLOTS = tempfig.eps
+
+ all: $(EPSPLOTS) spie_2004
spie_2004:
***************
*** 8,9 ****
--- 13,20 ----
latex spie_2004
dvips -o spie_2004.ps spie_2004.dvi
+
+ .gnu.eps:
+ gnuplot < $*.gnu
+
+ clean:
+ rm -rf tempfig.eps
\ No newline at end of file
Index: spie.bib
===================================================================
RCS file: /cvsroot/firebug/firebug/web/spie.bib,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** spie.bib 11 Jul 2003 18:15:48 -0000 1.2
--- spie.bib 14 Jul 2003 22:40:22 -0000 1.3
***************
*** 34,37 ****
--- 34,61 ----
}
+ @inproceedings{Mihai:ProbabilisticLocalization,
+ author = {V.~Ramadurai and M.~L.~Sichitiu},
+ title = {Localization in Wireless Sensor Networks: A
+ Probabilistic Approach},
+ booktitle = {Proc. of the 2003 International Conference on
+ Wireless Networks (ICWN 2003)},
+ address = {Las Vegas, NV},
+ month = Jun,
+ year = 2003,
+ }
+
+
+ @inproceedings{Mihai:SimpleLocalization,
+ author = {M.~L.~Sichitiu and V.~Ramadurai and
+ P.~Peddabachagari},
+ title = {Simple Algorithm for Outdoor Localization of
+ Wireless Sensor Networks with Inaccurate Range
+ Measurements},
+ booktitle = {Proc. of the 2003 International Conference on
+ Wireless Networks (ICWN 2003)},
+ address = {Las Vegas, NV},
+ month = Jun,
+ year = 2003,
+ }
Index: spie_2004.tex
===================================================================
RCS file: /cvsroot/firebug/firebug/web/spie_2004.tex,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** spie_2004.tex 11 Jul 2003 18:15:48 -0000 1.2
--- spie_2004.tex 14 Jul 2003 22:40:22 -0000 1.3
***************
*** 1,4 ****
--- 1,7 ----
\documentclass[11pt]{article}
+
+ \usepackage{graphicx}
+
\setlength{\oddsidemargin}{0in}
\setlength{\textwidth}{6.5in}
***************
*** 164,168 ****
Put all the data from all the experiments here.
!
--- 167,177 ----
Put all the data from all the experiments here.
! \begin{figure}
! \begin{center}
! \includegraphics[width=3.5in]{tempfig.eps}
! \caption{A temporary figure for holding place.}
! \label{fig:tempfig}
! \end{center}
! \end{figure}
|
|
From: <do...@us...> - 2003-07-11 18:15:51
|
Update of /cvsroot/firebug/firebug/web
In directory sc8-pr-cvs1:/tmp/cvs-serv28391
Modified Files:
spie.bib spie_2004.tex
Log Message:
Added more to outline of spie paper.'
Index: spie.bib
===================================================================
RCS file: /cvsroot/firebug/firebug/web/spie.bib,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** spie.bib 11 Jul 2003 16:11:45 -0000 1.1
--- spie.bib 11 Jul 2003 18:15:48 -0000 1.2
***************
*** 1,3 ****
--- 1,63 ----
+
+ @inproceedings{mainwaring:a2002,
+ author = "Alan Mainwaring and Joseph Polastre and
+ Robert Szewczyk and David Culler and John Anderson",
+ title = "Wireless Sensor Networks for Habitat Monitoring",
+ booktitle = "ACM International Workshop on Wireless
+ Sensor Networks and Applications (WSNA'02)",
+ address = "Atlanta, GA",
+ month = Sep,
+ day = 28,
+ year = 2002,
+ url = "citeseer.nj.nec.com/mainwaring02wireless.html"
+ }
+
+ @InProceedings{mehta:v2002,
+ author = {V. Mehta and M. {El Zarki}},
+ title = {Fixed Sensor Networks for Civil Infrastructure Monitoring},
+ booktitle = {Proceedings Med-Hoc-Net, Sardegna, Italy},
+ OPTcrossref = {},
+ OPTkey = {},
+ OPTpages = {},
+ year = {2002},
+ OPTeditor = {},
+ OPTvolume = {},
+ OPTnumber = {},
+ OPTseries = {},
+ OPTaddress = {},
+ OPTmonth = {},
+ OPTorganization = {},
+ OPTpublisher = {},
+ OPTnote = {},
+ OPTannote = {}
+ }
+
+
+
+ @InProceedings{west:b2001,
+ author = {B. W. West and P. G. Flikkema and
+ T. Sisk and G. W. Koch},
+ title = {Wireless Sensor Networks for Dense
+ Spatio-Temporal Monitoring of the Environment: A Case for
+ Integrated Circuit, System, and Network Design},
+ booktitle = {2001 IEEE CAS Workshop on Wireless
+ Communications and Networking},
+ OPTcrossref = {},
+ OPTkey = {},
+ OPTpages = {},
+ year = {2001},
+ OPTeditor = {},
+ OPTvolume = {},
+ OPTnumber = {},
+ OPTseries = {},
+ address = {University of Notre Dame},
+ month = {August},
+ OPTorganization = {},
+ OPTpublisher = {},
+ OPTnote = {},
+ OPTannote = {}
+ }
+
@InProceedings{woo:a2003,
author = {A. Woo and T. Tong and D. Culler},
Index: spie_2004.tex
===================================================================
RCS file: /cvsroot/firebug/firebug/web/spie_2004.tex,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** spie_2004.tex 11 Jul 2003 16:11:45 -0000 1.1
--- spie_2004.tex 11 Jul 2003 18:15:48 -0000 1.2
***************
*** 6,9 ****
--- 6,12 ----
\setlength{\textheight}{8.5in}
+
+ \newcommand{\blast}{BLAST}
+
\begin{document}
***************
*** 84,89 ****
--- 87,112 ----
+ \subsection{Previous work using \blast/Mica2}
+
+ One paragraph of Alec's work~\cite{woo:a2003},
+ and anyone else's work using \blast/Mica2.
+
+
+ \subsection{Previous work with outdoor sensors}
+
+ One or two paragraphs describing other work with
+ wireless sensor networks outdoors, specifically,
+ ~\cite{mainwaring:a2002,west:b2001,mehta:v2002}.
+
+
+ \subsection{Pr\'ecis}
+
+ Briefly outline the paper in one paragraph, tell the
+ reader what you're going to tell them.
+
+
\section{Protocols}
+
\section{TOS active messages}
***************
*** 95,98 ****
--- 118,131 ----
whatever they are calling it when this paper ships.
+ The \blast\ protocol has the following characteristics:
+ \begin{enumerate}
+ \item Many-to-one: messages are routed to a single base node.
+ \item Routing tables evolve using window mean with exponentially weighted,
+ moving average (WMEWMA) estimators for evaluating link quality.
+ EWMA balances reactivity to changes in link quality (agility)
+ with
+
+ \end{enumerate}
+
\subsection{Firebug data protocol}
***************
*** 129,139 ****
\section{Results}
\section{Discussion}
! \section{Conclusions}
\bibliography{spie}
\bibliographystyle{plain}
! \end{document}
\ No newline at end of file
--- 162,188 ----
\section{Results}
+ Put all the data from all the experiments here.
+
+
+
\section{Discussion}
! Interpret all the data from the previous section here.
! Say what is important and why it's important.
!
!
!
! \section{Summary and conclusions}
!
! One or two paragraphs telling the reader what you told them,
! and what the bit work should be.
!
\bibliography{spie}
\bibliographystyle{plain}
! \end{document}
!
!
!
|
|
From: <cs...@us...> - 2003-07-11 16:19:23
|
Update of /cvsroot/firebug/firebug/project/src/gps
In directory sc8-pr-cvs1:/tmp/cvs-serv10668
Modified Files:
TestMTS350M.nc
Log Message:
output 0 if no GPS
Index: TestMTS350M.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/gps/TestMTS350M.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMTS350M.nc 11 Jul 2003 16:04:10 -0000 1.2
--- TestMTS350M.nc 11 Jul 2003 16:19:20 -0000 1.3
***************
*** 328,333 ****
// if field is empty, set it equal to 0
if (j <= 1) {
! //for (m=0; m<10; m++) write[i][m] = '0';
! for (m=0; m<10; m++) write[i][m] = '9';
}
--- 328,332 ----
// if field is empty, set it equal to 0
if (j <= 1) {
! for (m=0; m<10; m++) write[i][m] = '0';
}
|
|
From: <do...@us...> - 2003-07-11 16:11:49
|
Update of /cvsroot/firebug/firebug/web
In directory sc8-pr-cvs1:/tmp/cvs-serv8574
Added Files:
.cvsignore Makefile spie.bib spie_2004.tex
Log Message:
Started an outline for the SPIE paper.
--- NEW FILE: .cvsignore ---
*~ *.dvi *.log *.aux *.bbl *.blg
--- NEW FILE: Makefile ---
spie_2004:
latex spie_2004
bibtex spie_2004
latex spie_2004
latex spie_2004
dvips -o spie_2004.ps spie_2004.dvi
--- NEW FILE: spie.bib ---
@InProceedings{woo:a2003,
author = {A. Woo and T. Tong and D. Culler},
title = {Taming the underlying hurdles for
Reliable Multihop Routing in Sensor Networks},
booktitle = {},
OPTcrossref = {},
OPTkey = {},
OPTpages = {},
year = {2003},
OPTeditor = {},
OPTvolume = {},
OPTnumber = {},
OPTseries = {},
OPTaddress = {},
OPTmonth = {},
OPTorganization = {},
OPTpublisher = {},
OPTnote = {},
OPTannote = {}
}
--- NEW FILE: spie_2004.tex ---
\documentclass[11pt]{article}
\setlength{\oddsidemargin}{0in}
\setlength{\textwidth}{6.5in}
\setlength{\topmargin}{0in}
\setlength{\textheight}{8.5in}
\begin{document}
\title{Sensor network behavior at the urban-rural interface:
making smart structures smarter}
\author{M. M. Chen, A. Sharma, D. M. Doolin\thanks{%
Dept. of Civ. and Env. Eng., UC Berkeley}, S. Glaser, N. Sitar}
\date{\today}
\maketitle
\begin{abstract}
Abstract here will be a 1 paragraph summary of
what actually gets written in the paper, and
should be the very last part of the paper written.
The material in the abstracted submitted in the
call for papers forms the basis of the introduction.
\end{abstract}
\section{Introduction}
Smart structures incorporating wired and wireless network
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
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.
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
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.
Some of the questions that will need to be answered are:
\begin{itemize}
\item How ofen does data need to be transmitted?
\item Determine the signal strength gradient in
each of the vegetation types.
\item Does, the position/orientation (in the z direction)
of the sensor node matter?
\end{itemize}
\section{Protocols}
\section{TOS active messages}
One paragraph summary of AM here.
\section{Multihop routing}
One paragraph summary of MH6/MH11/BLAST or
whatever they are calling it when this paper ships.
\subsection{Firebug data protocol}
However many paragraphs it takes to explain our stuff.
\section{Methodology}
This presents an outline of field experiments on a
soft-deployment of a sensor network in the Claremont
Canyon to collect radio communication statistics.
Most simulation and test environments for sensor
networks are characterized as idealized, ease of line
of sight, smooth terrain.
Testing sensor networks in an outdoor setting has
been attempted mostly in scenarios dealing with
habitat monitoring and form the only precedence for any
field testing. We attempt to use to the MICA2 platform
and BLAST~\cite{woo:a2003} routing and topology algorithm and see how
it performs in a typical grassland environment
with plenty of natural barriers.
The test will consist of 20 nodes spread across various
fuel types in the environment. The metrics for observation
are radio signal strength, and packet loss events (0, 1),
spatial and temporal (long and short term) correlation in
packet loss, and measuring temperature field gradient.
Volume of data collected should be able to let us draw
conclusions regarding each of these metrics.
\section{Results}
\section{Discussion}
\section{Conclusions}
\bibliography{spie}
\bibliographystyle{plain}
\end{document}
|
|
From: <cs...@us...> - 2003-07-11 16:04:15
|
Update of /cvsroot/firebug/firebug/project/src/gps
In directory sc8-pr-cvs1:/tmp/cvs-serv7317
Modified Files:
TestMTS350M.nc
Log Message:
log_array must be assembled in parallel w GGA_Msg
Index: TestMTS350M.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/gps/TestMTS350M.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMTS350M.nc 8 Jul 2003 21:51:35 -0000 1.1
--- TestMTS350M.nc 11 Jul 2003 16:04:10 -0000 1.2
***************
*** 71,75 ****
#define MSG_LENGTH 100
! #define GGA_BYTES 12
#define NUM_FIELDS 6
#define NUM_BYTES_PER_FIELD 10
--- 71,75 ----
#define MSG_LENGTH 100
! #define GGA_BYTES 11
#define NUM_FIELDS 6
#define NUM_BYTES_PER_FIELD 10
***************
*** 304,310 ****
//***DEBUG: Output NMEA message***
! //uint16_t q;
! //for(q=0; q<length; q++) UARTPutChar(NMEAstr[q]);
! //SODbg(DBG_USR2, "\n");
//********************************
--- 304,310 ----
//***DEBUG: Output NMEA message***
! uint16_t q;
! for(q=0; q<length; q++) UARTPutChar(NMEAstr[q]);
! SODbg(DBG_USR2, "\n");
//********************************
***************
*** 328,332 ****
// if field is empty, set it equal to 0
if (j <= 1) {
! for (m=0; m<10; m++) write[i][m] = 0;
}
--- 328,333 ----
// if field is empty, set it equal to 0
if (j <= 1) {
! //for (m=0; m<10; m++) write[i][m] = '0';
! for (m=0; m<10; m++) write[i][m] = '9';
}
***************
*** 350,355 ****
GGA_Msg *pGGA;
! //char log_array[GGA_BYTES];
! char log_array[16];
char NS;
--- 351,355 ----
GGA_Msg *pGGA;
! char log_array[GGA_BYTES];
char NS;
***************
*** 360,398 ****
pGGA->hours = 10*(write[1][0]-'0') + (write[1][1]-'0');
pGGA->minutes = 10*(write[1][2]-'0') + (write[1][3]-'0');
pGGA->dec_sec = 10000*(write[1][4]-'0') + 1000*(write[1][5]-'0') + 100*(write[1][7]-'0') + 10*(write[1][8]-'0') + (write[1][9]-'0');
pGGA->Lat_deg = 10*(write[2][0]-'0') + (write[2][1]-'0');
pGGA->Lat_dec_min = 100000*(write[2][4]-'0') + 10000*(write[2][5]-'0') + 1000*(write[2][7]-'0') + 100*(write[2][8]-'0') + 10*(write[2][9]-'0') + (write[2][10]-'0');
pGGA->Long_deg = 10*(write[4][0]-'0') + (write[4][1]-'0');
pGGA->Long_dec_min = 100000*(write[4][4]-'0') + 10000*(write[4][5]-'0') + 1000*(write[4][7]-'0') + 100*(write[4][8]-'0') + 10*(write[4][9]-'0') + (write[4][10]-'0');
NS = (write[3][0] == 'N') ? 1 : 0;
EW = (write[5][0] == 'W') ? 1 : 0;
pGGA->NSEWind = EW | (NS<<4); // eg. Status = 000N000E = 00010000
! // Log GGA_Msg
!
! j = 0;
! log_array[j++] = pGGA->hours;
! log_array[j++] = pGGA->minutes;
! log_array[j++] = (pGGA->dec_sec)>>8; // MSB
! log_array[j++] = pGGA->dec_sec; // LSB
! log_array[j++] = pGGA->Lat_deg;
! log_array[j++] = (pGGA->Lat_dec_min)>>8;
! log_array[j++] = pGGA->Lat_dec_min;
! log_array[j++] = pGGA->Long_deg;
! log_array[j++] = (pGGA->Long_dec_min)>>8;
! log_array[j++] = pGGA->Long_dec_min;
! log_array[j++] = pGGA->NSEWind;
! log_array[j++] = 0xFF;
! log_array[j++] = 0xFF;
! log_array[j++] = 0xFF;
! log_array[j++] = 0xFF;
! //if(call GpsCmd.GpsPower(0)) {
! // SODbg(DBG_USR2, "GPS Power Off\n");
! //}
if(call LoggerWrite.write(0x19,(char *)log_array)){
--- 360,395 ----
pGGA->hours = 10*(write[1][0]-'0') + (write[1][1]-'0');
+ log_array[0] = pGGA->hours;
pGGA->minutes = 10*(write[1][2]-'0') + (write[1][3]-'0');
+ log_array[1] = pGGA->minutes;
pGGA->dec_sec = 10000*(write[1][4]-'0') + 1000*(write[1][5]-'0') + 100*(write[1][7]-'0') + 10*(write[1][8]-'0') + (write[1][9]-'0');
+ log_array[2] = (pGGA->dec_sec)>>8; // MSB
+ log_array[3] = pGGA->dec_sec; // LSB
pGGA->Lat_deg = 10*(write[2][0]-'0') + (write[2][1]-'0');
+ log_array[4] = pGGA->Lat_deg;
pGGA->Lat_dec_min = 100000*(write[2][4]-'0') + 10000*(write[2][5]-'0') + 1000*(write[2][7]-'0') + 100*(write[2][8]-'0') + 10*(write[2][9]-'0') + (write[2][10]-'0');
+ log_array[5] = (pGGA->Lat_dec_min)>>8;
+ log_array[6] = pGGA->Lat_dec_min;
pGGA->Long_deg = 10*(write[4][0]-'0') + (write[4][1]-'0');
+ log_array[7] = pGGA->Long_deg;
pGGA->Long_dec_min = 100000*(write[4][4]-'0') + 10000*(write[4][5]-'0') + 1000*(write[4][7]-'0') + 100*(write[4][8]-'0') + 10*(write[4][9]-'0') + (write[4][10]-'0');
+ log_array[8] = (pGGA->Long_dec_min)>>8;
+ log_array[9] = pGGA->Long_dec_min;
NS = (write[3][0] == 'N') ? 1 : 0;
EW = (write[5][0] == 'W') ? 1 : 0;
pGGA->NSEWind = EW | (NS<<4); // eg. Status = 000N000E = 00010000
+ log_array[10] = pGGA->NSEWind;
! //***DEBUG: Output GGA data before write***
! //for(j=0; j<11; j++) UARTPutChar(log_array[j]);
! //SODbg(DBG_USR2, "\n");
! //*****************************************
! if(call GpsCmd.GpsPower(0)) {
! SODbg(DBG_USR2, "GPS Power Off\n");
! }
if(call LoggerWrite.write(0x19,(char *)log_array)){
***************
*** 409,413 ****
//uint8_t i;
//if (call LoggerRead.read(0x19,line)) {
! // for(i=0; i<32; i++) UARTPutChar(line[i]);
//}
//SODbg(DBG_USR2, "\n");
--- 406,410 ----
//uint8_t i;
//if (call LoggerRead.read(0x19,line)) {
! // for(i=16; i<32; i++) UARTPutChar(line[i]);
//}
//SODbg(DBG_USR2, "\n");
|
|
From: <do...@us...> - 2003-07-10 21:17:40
|
Update of /cvsroot/firebug/firebug/web
In directory sc8-pr-cvs1:/tmp/cvs-serv17926
Modified Files:
admin.html fbmsg.html
Log Message:
Updated mysql and msg web pages.
Index: admin.html
===================================================================
RCS file: /cvsroot/firebug/firebug/web/admin.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** admin.html 14 May 2003 21:36:48 -0000 1.9
--- admin.html 10 Jul 2003 21:08:13 -0000 1.10
***************
*** 115,122 ****
</ul>
! <h3>An example mysql table for mote data</h3>
<center>
<table class="db_schema">
<tr>
--- 115,134 ----
</ul>
! <h3>MySQL tables for mote data</h3>
+ <p>
+ We use several different tables for mote data collection.
+ Since FireBug motes are not mobile, location data is recorded
+ only once. Sensor data is recorded into two tables. The
+ first table accumulates times histories of the data by
+ recording the data from each packet received. The second
+ table keeps a record of the most recent data received from
+ each mote, which saves querying the first table for real time
+ updates.
+ </p>
+
<center>
+ <h4>Sensor data table</h4>
<table class="db_schema">
<tr>
***************
*** 126,129 ****
--- 138,142 ----
<td>rel_hum</td>
<td>baro_pres</td>
+ <td>cnt</td>
</tr>
<tr>
***************
*** 135,138 ****
--- 148,152 ----
<td>FLOAT</td>
<td>FLOAT</td>
+ <td>INTEGER</td>
<td></td>
</tr>
***************
*** 143,146 ****
--- 157,161 ----
<center>
+ <h4>Sensor location table</h4>
<table class="db_schema">
<tr>
***************
*** 160,163 ****
--- 175,179 ----
+ <h3>Creating the tables</h3>
<p>
***************
*** 175,184 ****
<pre>
CREATE TABLE example (mote_id INTEGER,
- longitude FLOAT,
- latitude FLOAT,
time DECIMAL(9,3),
temp FLOAT,
rel_hum FLOAT,
! baro_pres FLOAT);
</pre>
--- 191,199 ----
<pre>
CREATE TABLE example (mote_id INTEGER,
time DECIMAL(9,3),
temp FLOAT,
rel_hum FLOAT,
! baro_pres FLOAT,
! cnt INTEGER);
</pre>
***************
*** 204,222 ****
<pre>
CREATE TABLE example_current (mote_id INTEGER,
- longitude FLOAT,
- latitude FLOAT,
time DECIMAL(9,3),
temp FLOAT,
rel_hum FLOAT,
! baro_pres FLOAT);
</pre>
<pre>
CREATE TABLE example_cumulative (mote_id INTEGER,
- longitude FLOAT,
- latitude FLOAT,
time DECIMAL(9,3),
temp FLOAT,
rel_hum FLOAT,
! baro_pres FLOAT);
</pre>
<p>
--- 219,235 ----
<pre>
CREATE TABLE example_current (mote_id INTEGER,
time DECIMAL(9,3),
temp FLOAT,
rel_hum FLOAT,
! baro_pres FLOAT,
! cnt INTEGER);
</pre>
<pre>
CREATE TABLE example_cumulative (mote_id INTEGER,
time DECIMAL(9,3),
temp FLOAT,
rel_hum FLOAT,
! baro_pres FLOAT,
! cnt INTEGER);
</pre>
<p>
Index: fbmsg.html
===================================================================
RCS file: /cvsroot/firebug/firebug/web/fbmsg.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fbmsg.html 22 May 2003 22:20:17 -0000 1.3
--- fbmsg.html 10 Jul 2003 21:08:13 -0000 1.4
***************
*** 35,39 ****
<tr class="msg_header">
<td colspan=4><b>TOS HEADER</b></td>
! <td colspan=2><b>MH6 INFO</b></td>
<td colspan=1><b>FIREBUG DATA</b></td>
</tr>
--- 35,39 ----
<tr class="msg_header">
<td colspan=4><b>TOS HEADER</b></td>
! <td colspan=2><b>BLAST INFO</b></td>
<td colspan=1><b>FIREBUG DATA</b></td>
</tr>
|
|
From: <che...@us...> - 2003-07-10 09:05:29
|
Update of /cvsroot/firebug/firebug/project/src/sensordata
In directory sc8-pr-cvs1:/tmp/cvs-serv9809/sensordata
Added Files:
mkmsg.sh sensormsg.h
Log Message:
use blast protocol and add cnt to sensor packet
--- NEW FILE: mkmsg.sh ---
#!/usr/bin/sh
# Temporary script for figuring out how to extract the
# struct definitions from the nc files, put them in
# header files, and use mig to make msgs from the
# struct definition.
mig java -java-classname=org.firebug.SensorMsg -I. ./sensormsg.h SensorMsg > SensorMsg.java
--- NEW FILE: sensormsg.h ---
/* -*- Mode: C; c-basic-indent: 3; indent-tabs-mode: nil -*- */
/* tab:4
* Copyright (c) 2000-2002 The Regents of the University of California.
* All rights reserved.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation for any purpose, without fee, and without written agreement is
* hereby granted, provided that the above copyright notice, the following
* two paragraphs and the author appear in all copies of this software.
*
* IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
* DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
* OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
* CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
* ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
*
*/
/*
* This file is part of the FireBug project.
*
* FireBug is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by the
* Free Software Foundation; either version 2, or (at your option) any
* later version.
*
* FireBug is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
* for more details.
* You should have received a copy of the GNU Lesser General Public License
* along with Geotechnica; see the file COPYING. If not, write to the Free
* Software Foundation, 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA.
*/
/*
* The definition of gps messages needs to be moved out
* of the "private" module files into "public" header
* files so that third party applications (such as mig)
* will be able to generate parsing code from the
* definition of the messages.
*/
/*
* @todo Break up the typedef, mig won't support it.
* Necessary typedefs can be used internally to the
* nesc source files.
*/
struct SensorMsg {
uint16_t addr;
uint16_t cnt;
float temp;
float rel_hum;
float baro_pres;
};
enum {
AM_SENSORMSG = 128
};
|
|
From: <che...@us...> - 2003-07-10 09:05:29
|
Update of /cvsroot/firebug/firebug/project/src/multihop
In directory sc8-pr-cvs1:/tmp/cvs-serv9809/multihop
Modified Files:
CollectDataMFB.nc
Log Message:
use blast protocol and add cnt to sensor packet
Index: CollectDataMFB.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/CollectDataMFB.nc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CollectDataMFB.nc 2 Jul 2003 00:47:50 -0000 1.8
--- CollectDataMFB.nc 10 Jul 2003 09:05:26 -0000 1.9
***************
*** 50,53 ****
--- 50,54 ----
struct DataFormat_t {
uint16_t addr;
+ uint16_t cnt;
float temp;
float rel_hum;
***************
*** 56,60 ****
};
! uint8_t counter;
uint8_t sending;
--- 57,61 ----
};
! uint16_t counter;
uint8_t sending;
***************
*** 136,140 ****
df = (struct DataFormat_t *) dataPortion;
df->addr = TOS_LOCAL_ADDRESS;
! //df->cnt = counter++;
//df->sampledata=TOS_LOCAL_ADDRESS;
//put more sensor data here
--- 137,141 ----
df = (struct DataFormat_t *) dataPortion;
df->addr = TOS_LOCAL_ADDRESS;
! df->cnt = counter++;
//df->sampledata=TOS_LOCAL_ADDRESS;
//put more sensor data here
|
|
From: <che...@us...> - 2003-07-10 09:03:00
|
Update of /cvsroot/firebug/firebug/project/java/src/org/firebug
In directory sc8-pr-cvs1:/tmp/cvs-serv9432/src/org/firebug
Modified Files:
DBLogger.java SensorMsg.java
Log Message:
add cnt to the sensormsg
Index: DBLogger.java
===================================================================
RCS file: /cvsroot/firebug/firebug/project/java/src/org/firebug/DBLogger.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** DBLogger.java 2 Jul 2003 00:47:49 -0000 1.16
--- DBLogger.java 10 Jul 2003 09:02:58 -0000 1.17
***************
*** 60,64 ****
// message.
! SensorMsg msg = new SensorMsg(packet,5,19);
Connection conn = dbh.getConnection();
--- 60,64 ----
// message.
! SensorMsg msg = new SensorMsg(packet,5,21);
Connection conn = dbh.getConnection();
***************
*** 73,77 ****
int mote_id = getMoteID(packet);
! int mote_id_test = msg.get_MoteID();
if (mote_id != mote_id_test){
--- 73,77 ----
int mote_id = getMoteID(packet);
! int mote_id_test = msg.get_addr();
if (mote_id != mote_id_test){
***************
*** 79,82 ****
--- 79,83 ----
}
+ int cnt=msg.get_cnt();
float temp = msg.get_temp();
float rel_hum = msg.get_rel_hum();
***************
*** 110,113 ****
--- 111,115 ----
String updatequery = "UPDATE current "
+ "SET time=" + time + ", "
+ + "cnt=" + cnt + ","
+ "rel_hum=" + rel_hum + ", "
+ "baro_pres=" + baro_pres + ", "
***************
*** 119,123 ****
+ temp + ", "
+ rel_hum + ", "
! + baro_pres + ")";
--- 121,126 ----
+ temp + ", "
+ rel_hum + ", "
! + baro_pres + ","
! + cnt + ")";
Index: SensorMsg.java
===================================================================
RCS file: /cvsroot/firebug/firebug/project/java/src/org/firebug/SensorMsg.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SensorMsg.java 23 May 2003 00:57:14 -0000 1.3
--- SensorMsg.java 10 Jul 2003 09:02:58 -0000 1.4
***************
*** 7,22 ****
package org.firebug;
-
public class SensorMsg extends net.tinyos.message.Message {
/** The default size of this message type in bytes. */
! public static final int DEFAULT_MESSAGE_SIZE = 14;
/** The Active Message type associated with this message. */
public static final int AM_TYPE = 128;
! /** Create a new SensorMsg of size 14. */
public SensorMsg() {
super(DEFAULT_MESSAGE_SIZE);
}
--- 7,22 ----
package org.firebug;
public class SensorMsg extends net.tinyos.message.Message {
/** The default size of this message type in bytes. */
! public static final int DEFAULT_MESSAGE_SIZE = 16;
/** The Active Message type associated with this message. */
public static final int AM_TYPE = 128;
! /** Create a new SensorMsg of size 16. */
public SensorMsg() {
super(DEFAULT_MESSAGE_SIZE);
+ amTypeSet(AM_TYPE);
}
***************
*** 24,27 ****
--- 24,28 ----
public SensorMsg(int data_length) {
super(data_length);
+ amTypeSet(AM_TYPE);
}
***************
*** 32,35 ****
--- 33,37 ----
public SensorMsg(int data_length, int base_offset) {
super(data_length, base_offset);
+ amTypeSet(AM_TYPE);
}
***************
*** 40,43 ****
--- 42,46 ----
public SensorMsg(byte[] data) {
super(data);
+ amTypeSet(AM_TYPE);
}
***************
*** 48,51 ****
--- 51,55 ----
public SensorMsg(byte[] data, int base_offset) {
super(data, base_offset);
+ amTypeSet(AM_TYPE);
}
***************
*** 56,59 ****
--- 60,64 ----
public SensorMsg(byte[] data, int base_offset, int data_length) {
super(data, base_offset, data_length);
+ amTypeSet(AM_TYPE);
}
***************
*** 64,67 ****
--- 69,73 ----
public SensorMsg(net.tinyos.message.Message msg, int base_offset) {
super(msg, base_offset, DEFAULT_MESSAGE_SIZE);
+ amTypeSet(AM_TYPE);
}
***************
*** 72,80 ****
public SensorMsg(net.tinyos.message.Message msg, int base_offset, int data_length) {
super(msg, base_offset, data_length);
! }
!
! /** Return the Active Message type of this message (-1 if unknown). */
! public int amType() {
! return AM_TYPE;
}
--- 78,82 ----
public SensorMsg(net.tinyos.message.Message msg, int base_offset, int data_length) {
super(msg, base_offset, data_length);
! amTypeSet(AM_TYPE);
}
***************
*** 83,101 ****
* message type name and the non-indexed field values.
*/
- /*
public String toString() {
String s = "Message <SensorMsg> \n";
! s += " [MoteID=0x"+Long.toHexString(get_MoteID())+"]\n";
! s += " [temp=0x" + Float.intBitsToFloat(get_temp()) + "]\n";
! s += " [rel_hum=0x"+Float.toHexString(get_rel_hum())+"]\n";
! s += " [baro_pres=0x"+Float.toHexString(get_baro_pres())+"]\n";
return s;
}
- */
// Message-type-specific access methods appear below.
/////////////////////////////////////////////////////////
! // Accessor methods for field: MoteID
// Field type: int
// Offset (bits): 0
--- 85,112 ----
* message type name and the non-indexed field values.
*/
public String toString() {
String s = "Message <SensorMsg> \n";
! try {
! s += " [addr=0x"+Long.toHexString(get_addr())+"]\n";
! } catch (ArrayIndexOutOfBoundsException aioobe) { /* Skip field */ }
! try {
! s += " [cnt=0x"+Long.toHexString(get_cnt())+"]\n";
! } catch (ArrayIndexOutOfBoundsException aioobe) { /* Skip field */ }
! try {
! s += " [temp="+Float.toString(get_temp())+"]\n";
! } catch (ArrayIndexOutOfBoundsException aioobe) { /* Skip field */ }
! try {
! s += " [rel_hum="+Float.toString(get_rel_hum())+"]\n";
! } catch (ArrayIndexOutOfBoundsException aioobe) { /* Skip field */ }
! try {
! s += " [baro_pres="+Float.toString(get_baro_pres())+"]\n";
! } catch (ArrayIndexOutOfBoundsException aioobe) { /* Skip field */ }
return s;
}
// Message-type-specific access methods appear below.
/////////////////////////////////////////////////////////
! // Accessor methods for field: addr
// Field type: int
// Offset (bits): 0
***************
*** 104,159 ****
/**
! * Return whether the field 'MoteID' is signed (true).
*/
! public static boolean isSigned_MoteID() {
return true;
}
/**
! * Return whether the field 'MoteID' is an array (false).
*/
! public static boolean isArray_MoteID() {
return false;
}
/**
! * Return the offset (in bytes) of the field 'MoteID'
*/
! public static int offset_MoteID() {
return (0 / 8);
}
/**
! * Return the offset (in bits) of the field 'MoteID'
*/
! public static int offsetBits_MoteID() {
return 0;
}
/**
! * Return the value (as a int) of the field 'MoteID'
*/
! public int get_MoteID() {
! return (int)getUIntElement(offsetBits_MoteID(), 16);
}
/**
! * Set the value of the field 'MoteID'
*/
! public void set_MoteID(int value) {
! setUIntElement(offsetBits_MoteID(), 16, value);
}
/**
! * Return the size, in bytes, of the field 'MoteID'
*/
! public static int size_MoteID() {
return (16 / 8);
}
/**
! * Return the size, in bits, of the field 'MoteID'
*/
! public static int sizeBits_MoteID() {
return 16;
}
--- 115,233 ----
/**
! * Return whether the field 'addr' is signed (true).
*/
! public static boolean isSigned_addr() {
return true;
}
/**
! * Return whether the field 'addr' is an array (false).
*/
! public static boolean isArray_addr() {
return false;
}
/**
! * Return the offset (in bytes) of the field 'addr'
*/
! public static int offset_addr() {
return (0 / 8);
}
/**
! * Return the offset (in bits) of the field 'addr'
*/
! public static int offsetBits_addr() {
return 0;
}
/**
! * Return the value (as a int) of the field 'addr'
*/
! public int get_addr() {
! return (int)getUIntElement(offsetBits_addr(), 16);
}
/**
! * Set the value of the field 'addr'
*/
! public void set_addr(int value) {
! setUIntElement(offsetBits_addr(), 16, value);
}
/**
! * Return the size, in bytes, of the field 'addr'
*/
! public static int size_addr() {
return (16 / 8);
}
/**
! * Return the size, in bits, of the field 'addr'
*/
! public static int sizeBits_addr() {
! return 16;
! }
!
! /////////////////////////////////////////////////////////
! // Accessor methods for field: cnt
! // Field type: int
! // Offset (bits): 16
! // Size (bits): 16
! /////////////////////////////////////////////////////////
!
! /**
! * Return whether the field 'cnt' is signed (true).
! */
! public static boolean isSigned_cnt() {
! return true;
! }
!
! /**
! * Return whether the field 'cnt' is an array (false).
! */
! public static boolean isArray_cnt() {
! return false;
! }
!
! /**
! * Return the offset (in bytes) of the field 'cnt'
! */
! public static int offset_cnt() {
! return (16 / 8);
! }
!
! /**
! * Return the offset (in bits) of the field 'cnt'
! */
! public static int offsetBits_cnt() {
! return 16;
! }
!
! /**
! * Return the value (as a int) of the field 'cnt'
! */
! public int get_cnt() {
! return (int)getUIntElement(offsetBits_cnt(), 16);
! }
!
! /**
! * Set the value of the field 'cnt'
! */
! public void set_cnt(int value) {
! setUIntElement(offsetBits_cnt(), 16, value);
! }
!
! /**
! * Return the size, in bytes, of the field 'cnt'
! */
! public static int size_cnt() {
! return (16 / 8);
! }
!
! /**
! * Return the size, in bits, of the field 'cnt'
! */
! public static int sizeBits_cnt() {
return 16;
}
***************
*** 162,166 ****
// Accessor methods for field: temp
// Field type: float
! // Offset (bits): 16
// Size (bits): 32
/////////////////////////////////////////////////////////
--- 236,240 ----
// Accessor methods for field: temp
// Field type: float
! // Offset (bits): 32
// Size (bits): 32
/////////////////////////////////////////////////////////
***************
*** 184,188 ****
*/
public static int offset_temp() {
! return (16 / 8);
}
--- 258,262 ----
*/
public static int offset_temp() {
! return (32 / 8);
}
***************
*** 191,195 ****
*/
public static int offsetBits_temp() {
! return 16;
}
--- 265,269 ----
*/
public static int offsetBits_temp() {
! return 32;
}
***************
*** 225,229 ****
// Accessor methods for field: rel_hum
// Field type: float
! // Offset (bits): 48
// Size (bits): 32
/////////////////////////////////////////////////////////
--- 299,303 ----
// Accessor methods for field: rel_hum
// Field type: float
! // Offset (bits): 64
// Size (bits): 32
/////////////////////////////////////////////////////////
***************
*** 247,251 ****
*/
public static int offset_rel_hum() {
! return (48 / 8);
}
--- 321,325 ----
*/
public static int offset_rel_hum() {
! return (64 / 8);
}
***************
*** 254,258 ****
*/
public static int offsetBits_rel_hum() {
! return 48;
}
--- 328,332 ----
*/
public static int offsetBits_rel_hum() {
! return 64;
}
***************
*** 288,292 ****
// Accessor methods for field: baro_pres
// Field type: float
! // Offset (bits): 80
// Size (bits): 32
/////////////////////////////////////////////////////////
--- 362,366 ----
// Accessor methods for field: baro_pres
// Field type: float
! // Offset (bits): 96
// Size (bits): 32
/////////////////////////////////////////////////////////
***************
*** 310,314 ****
*/
public static int offset_baro_pres() {
! return (80 / 8);
}
--- 384,388 ----
*/
public static int offset_baro_pres() {
! return (96 / 8);
}
***************
*** 317,321 ****
*/
public static int offsetBits_baro_pres() {
! return 80;
}
--- 391,395 ----
*/
public static int offsetBits_baro_pres() {
! return 96;
}
|
|
From: <che...@us...> - 2003-07-10 09:01:12
|
Update of /cvsroot/firebug/firebug/web
In directory sc8-pr-cvs1:/tmp/cvs-serv9251
Modified Files:
db_create.php table_select.php
Log Message:
add cnt column to db
Index: db_create.php
===================================================================
RCS file: /cvsroot/firebug/firebug/web/db_create.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** db_create.php 22 May 2003 21:48:45 -0000 1.6
--- db_create.php 10 Jul 2003 09:01:09 -0000 1.7
***************
*** 38,45 ****
mysql_query($statement) or die("Error: ".mysql_error()." in creating location atable");
! $statement = "CREATE TABLE current (mote_id INTEGER, time DECIMAL(9,3), temp FLOAT, rel_hum FLOAT, baro_pres FLOAT)";
mysql_query($statement) or die("Error: ".mysql_error()." in creating current atable");
! $statement = "CREATE TABLE cumulative (mote_id INTEGER, time DECIMAL(9,3), temp FLOAT, rel_hum FLOAT, baro_pres FLOAT)";
mysql_query($statement) or die("Error: ".mysql_error()." in creating cumulative atable");
--- 38,45 ----
mysql_query($statement) or die("Error: ".mysql_error()." in creating location atable");
! $statement = "CREATE TABLE current (mote_id INTEGER, time DECIMAL(9,3), temp FLOAT, rel_hum FLOAT, baro_pres FLOAT, cnt INTEGER)";
mysql_query($statement) or die("Error: ".mysql_error()." in creating current atable");
! $statement = "CREATE TABLE cumulative (mote_id INTEGER, time DECIMAL(9,3), temp FLOAT, rel_hum FLOAT, baro_pres FLOAT, cnt INTEGER)";
mysql_query($statement) or die("Error: ".mysql_error()." in creating cumulative atable");
***************
*** 53,57 ****
for ($i = 2; $i <= $nummotes+1; $i++) {
! $statement = "insert into current values ($i,NULL,NULL,NULL,NULL);";
print "<br />";
print $statement;
--- 53,57 ----
for ($i = 2; $i <= $nummotes+1; $i++) {
! $statement = "insert into current values ($i,NULL,NULL,NULL,NULL,NULL);";
print "<br />";
print $statement;
Index: table_select.php
===================================================================
RCS file: /cvsroot/firebug/firebug/web/table_select.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** table_select.php 23 May 2003 00:57:14 -0000 1.6
--- table_select.php 10 Jul 2003 09:01:09 -0000 1.7
***************
*** 28,31 ****
--- 28,32 ----
<td>Rel. Hum.</td>
<td>Baro. Pres.</td>
+ <td>cnt </td>
</tr>
***************
*** 54,57 ****
--- 55,62 ----
}
+ if ($cnt == "") {
+ $cnt = "%";
+ }
+
if ($temp == "") {
$temp = "%";
***************
*** 69,72 ****
--- 74,78 ----
where mote_id like '$mote_id%'
and time like '$time%'
+ and cnt like '$cnt%'
and temp like '$temp%'
and rel_hum like '$rel_hum%'
***************
*** 100,103 ****
--- 106,113 ----
print ("<td>");
print $row["baro_pres"];
+ print ("</td>");
+
+ print ("<td>");
+ print $row["cnt"];
print ("</td>");
|
|
From: <do...@us...> - 2003-07-09 17:57:47
|
Update of /cvsroot/firebug/firebug/web In directory sc8-pr-cvs1:/tmp/cvs-serv32248 Modified Files: publications.html smartstruct_abs.txt Removed Files: retreat_abs.txt Log Message: Moved nest retreat abstract to attic since it on the publications web page now. Index: publications.html =================================================================== RCS file: /cvsroot/firebug/firebug/web/publications.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** publications.html 9 Jul 2003 16:43:31 -0000 1.3 --- publications.html 9 Jul 2003 17:57:44 -0000 1.4 *************** *** 17,21 **** M. M. Chen, C. Majidi, D. M. Doolin, S. Glaser and N. Sitar. ! <a href="./tos_retreat.ppt" alt="NEST Poster"> Design and construction of a wildfire instrumentation system using networked sensors (Poster). --- 17,21 ---- M. M. Chen, C. Majidi, D. M. Doolin, S. Glaser and N. Sitar. ! <a href="./tos_retreat_2003.ppt" alt="NEST Poster"> Design and construction of a wildfire instrumentation system using networked sensors (Poster). Index: smartstruct_abs.txt =================================================================== RCS file: /cvsroot/firebug/firebug/web/smartstruct_abs.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** smartstruct_abs.txt 2 Jul 2003 03:39:18 -0000 1.4 --- smartstruct_abs.txt 9 Jul 2003 17:57:44 -0000 1.5 *************** *** 7,11 **** Authors: ! A. Sharma, M. M. Chen, D. M. Doolin, N. Sitar, S. Glaser --- 7,11 ---- Authors: ! A. Sharma, M. M. Chen, D. M. Doolin, S. Glaser, N. Sitar --- retreat_abs.txt DELETED --- |
|
From: <do...@us...> - 2003-07-09 16:43:35
|
Update of /cvsroot/firebug/firebug/web
In directory sc8-pr-cvs1:/tmp/cvs-serv21980
Modified Files:
claremont.html publications.html
Log Message:
Added abstract text of retreat poster to
publications web page.
Index: claremont.html
===================================================================
RCS file: /cvsroot/firebug/firebug/web/claremont.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** claremont.html 9 Jul 2003 16:32:40 -0000 1.1
--- claremont.html 9 Jul 2003 16:43:31 -0000 1.2
***************
*** 59,63 ****
<hr>
! x
</body>
</html>
--- 59,63 ----
<hr>
!
</body>
</html>
Index: publications.html
===================================================================
RCS file: /cvsroot/firebug/firebug/web/publications.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** publications.html 12 Jun 2003 15:25:40 -0000 1.2
--- publications.html 9 Jul 2003 16:43:31 -0000 1.3
***************
*** 24,27 ****
--- 24,50 ----
Retreat, June 17-18, 2003, Oakland
California.
+ <p>
+ ABSTRACT: Collecting real time data from wildfires
+ is important for life safety considerations,
+ and allows predictive analysis of evolving
+ fire behavior. One way to collect such data
+ is to deploy sensors in the wild fire
+ environment. FireBugs are small, wireless
+ sensors (motes) based on TinyOS that self-organize into
+ networks for collecting real time data in wild
+ fire environments. The motes package GPS, temperature,
+ pressure and other sensors onto a finger-sized board
+ equipped with a radio, and transmit the data through
+ the network. The FireBug system combines
+ state-of-the-art sensor hardware running
+ TinyOS with standard, off-the-shelf World Wide Web and
+ database technology for allowing users
+ to rapidly deploy FireBugs and monitor
+ network behavior. This poster
+ presents an overview of the FireBug system design,
+ and a snapshot of the current state of development.
+ </p>
+
+
</li>
|
|
From: <do...@us...> - 2003-07-09 16:32:44
|
Update of /cvsroot/firebug/firebug/web In directory sc8-pr-cvs1:/tmp/cvs-serv20534 Added Files: claremont.html Log Message: Added Anshumans experiment design for claremont canyon. --- NEW FILE: claremont.html --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> <html> <head> <title>Sensor performance in Claremont Canyon</title> </head> <body> <h1>Sensor performance in Claremont Canyon</h1> <p> This presents an outline of field experiments on a soft-deployment of a sensor network in the Claremont Canyon to collect radio communication statistics. Most simulation and test environments for sensor networks are characterized as idealized, ease of line of sight, smooth terrain. </p> <p> Testing sensor networks in an outdoor setting has been attempted mostly in scenarios dealing with habitat monitoring and form the only precedence for any field testing. We attempt to use to the MICA2 platform and MH6 routing and topology algorithm and see how it performs in a typical grassland environment with plenty of natural barriers. </p> <p> The test will consist of 20 nodes spread across various fuel types in the environment. The metrics for observation are radio signal strength, and packet loss events (0, 1), spatial and temporal (long and short term) correlation in packet loss, and measuring temperature field gradient. Volume of data collected should be able to let us draw conclusions regarding each of these metrics. </p> <p> Some of the questions that will need to be answered are: </p> <ul> <li>How ofen does data need to be transmitted? </li> <li>Determine the signal strength gradient in each of the vegetation types. </li> <li>Does, the position/orientation (in the z direction) of the sensor node matter? </li> </ul> <hr> x </body> </html> |
|
From: <do...@us...> - 2003-07-09 15:00:28
|
Update of /cvsroot/firebug/firebug/web In directory sc8-pr-cvs1:/tmp/cvs-serv5737 Modified Files: menu.html Added Files: burn.html firetraining.html Log Message: Added web pages for tracy's work. --- NEW FILE: burn.html --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html> <head> <link type="text/css" rel="stylesheet" href="main.css" /> <link type="text/css" rel="stylesheet" href="firebug.css" /> <script language="JavaScript1.2" src="/main.js" type="text/javascript"></script> <link rel="SHORTCUT ICON" href="./images/favicon.ico" /> <title>Controlled burning</title> </head> <body> <h1>Controlled burning</h1> <p> Controlled burns conducted by the East Bay Regional Parks fire department will allow the testing the Fire Board sensor. Below are maps of the area that will be burned. </p> <p> <img src="./images/carquinez2.jpg" alt="Controlled burn area overview"> <br /> <img src="./images/carquinez1.jpg" alt="Controlled burn area closeup"> </p> <hr /> </body> </html> --- NEW FILE: firetraining.html --- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html> <head> <link type="text/css" rel="stylesheet" href="main.css" /> <link type="text/css" rel="stylesheet" href="firebug.css" /> <script language="JavaScript1.2" src="/main.js" type="text/javascript"></script> <link rel="SHORTCUT ICON" href="./images/favicon.ico" /> <title>Wildland firefighting training</title> </head> <body> <h1>Wildland firefighting training</h1> <p> Field work on the FireBug project requires some unusual training: Type II wildland firefighting certification! The following series of photographs show Berkeley FireBug project people training with new hires for the East Bay Regional Parks fire department, under the supervision of the fire department staff. </p> <hr /> <p> Drip torches consist of a chamber containing a mix of 2 parts diesel to 1 part gasoline (or something equivalent to that), and a wick to ignite the mixture when the chamber is tilted. In the photograph, we are learning how to use the drip torch in the fire department parking lot. </p> <img src="./images/driptorch1.jpg" alt="Learning how to use the drip torch" /> <hr /> </body> </html> Index: menu.html =================================================================== RCS file: /cvsroot/firebug/firebug/web/menu.html,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** menu.html 24 Jun 2003 00:07:20 -0000 1.9 --- menu.html 9 Jul 2003 15:00:22 -0000 1.10 *************** *** 48,51 **** --- 48,67 ---- <td class="Nav"> <div class="NavText"> + <a href="./firetraining.html" target="main">Fire training</a> + </div> + </td> + </tr> + + <tr class="NavRow"> + <td class="Nav"> + <div class="NavText"> + <a href="./burn.html" target="main">Burning</a> + </div> + </td> + </tr> + + <tr class="NavRow"> + <td class="Nav"> + <div class="NavText"> <a href="./publications.html" target="main">Publications</a> </div> |
|
From: <do...@us...> - 2003-07-09 15:00:28
|
Update of /cvsroot/firebug/firebug/web/images In directory sc8-pr-cvs1:/tmp/cvs-serv5737/images Added Files: carquinez1.jpg carquinez2.jpg driptorch1.jpg Log Message: Added web pages for tracy's work. --- NEW FILE: carquinez1.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: carquinez2.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: driptorch1.jpg --- (This appears to be a binary file; contents omitted.) |
|
From: <cs...@us...> - 2003-07-08 21:51:39
|
Update of /cvsroot/firebug/firebug/project/src/gps
In directory sc8-pr-cvs1:/tmp/cvs-serv27755
Modified Files:
gps.nc gpsCmd.nc gpsCmdM.nc gpsM.nc
Added Files:
TestMTS350.nc TestMTS350M.nc gpsBcast.class gpsBcast.java
Removed Files:
LogMsg.class LogMsg.java gpsCmdMsg.class gpsCmdMsg.java
Log Message:
use TestMTS350 for Leadtek
--- NEW FILE: TestMTS350.nc ---
/* tab:4
*
*
* "Copyright (c) 2000-2002 The Regents of the University of California.
* All rights reserved.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation for any purpose, without fee, and without written agreement is
* hereby granted, provided that the above copyright notice, the following
* two paragraphs and the author appear in all copies of this software.
*
* IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
* DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
* OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
* CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
* ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
*
*/
/* tab:4
* IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. By
* downloading, copying, installing or using the software you agree to
* this license. If you do not agree to this license, do not download,
* install, copy or use the software.
*
* Intel Open Source License
*
* Copyright (c) 2002 Intel Corporation
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
*/
configuration TestMTS350 {
}
implementation {
components Main, TestMTS350M, RadioCRCPacket as Comm, UARTNoCRCPacket,SensirionHumidity, MicaWbSwitch,UARTGpsPacket,TimerC, LedsC, Logger;
Main.StdControl -> TestMTS350M;
Main.StdControl -> TimerC;
TestMTS350M.UARTControl -> UARTNoCRCPacket;
TestMTS350M.UARTSend -> UARTNoCRCPacket;
TestMTS350M.UARTReceive -> UARTNoCRCPacket;
TestMTS350M.GpsControl -> UARTGpsPacket;
TestMTS350M.GpsSend -> UARTGpsPacket;
TestMTS350M.GpsReceive -> UARTGpsPacket;
TestMTS350M.GpsCmd -> UARTGpsPacket.GpsCmd;
// TestMTS350M.SwitchControl -> MicaWbSwitch.StdControl;
// TestMTS350M.Switch1 -> MicaWbSwitch.Switch[0];
// TestMTS350M.SwitchI2W -> MicaWbSwitch.Switch[1];
TestMTS350M.ADCControl -> SensirionHumidity;
TestMTS350M.Humidity -> SensirionHumidity.Humidity;
TestMTS350M.Temperature -> SensirionHumidity.Temperature;
// Do we need these?
// TestMTS350M.HumidityError -> SensirionHumidity.HumidityError;
// TestMTS350M.TemperatureError -> SensirionHumidity.TemperatureError;
TestMTS350M.RadioControl -> Comm;
TestMTS350M.RadioSend -> Comm;
TestMTS350M.RadioReceive -> Comm;
TestMTS350M.Leds -> LedsC;
TestMTS350M.Timer -> TimerC.Timer[unique("Timer")];
TestMTS350M.LoggerWrite -> Logger.LoggerWrite;
TestMTS350M.LoggerRead -> Logger;
}
--- NEW FILE: TestMTS350M.nc ---
/* tab:4
*
*
* "Copyright (c) 2000-2002 The Regents of the University of California.
* All rights reserved.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation for any purpose, without fee, and without written agreement is
* hereby granted, provided that the above copyright notice, the following
* two paragraphs and the author appear in all copies of this software.
*
* IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
* DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
* OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
* CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
* ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
*
*/
/* tab:4
* IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING. By
* downloading, copying, installing or using the software you agree to
* this license. If you do not agree to this license, do not download,
* install, copy or use the software.
*
* Intel Open Source License
*
* Copyright (c) 2002 Intel Corporation
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
*
* Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*
*/
/* History: created 1/25/2001
*
*
*/
/* TestMTS350:
-
-
*/
includes gps;
#define MSG_LENGTH 100
#define GGA_BYTES 12
#define NUM_FIELDS 6
#define NUM_BYTES_PER_FIELD 10
#define DELIMITER ','
#define START_STRING '$'
#define END_STRING '*'
module TestMTS350M {
provides {
interface StdControl;
command result_t parseGPS(int8_t NMEAstr[MSG_LENGTH], uint8_t length);
command result_t logGPS(char write[NUM_FIELDS][NUM_BYTES_PER_FIELD]);
}
uses {
interface StdControl as UARTControl;
interface BareSendMsg as UARTSend;
interface ReceiveMsg as UARTReceive;
interface StdControl as GpsControl;
interface BareSendMsg as GpsSend;
interface ReceiveMsg as GpsReceive;
interface GpsCmd;
interface StdControl as RadioControl;
interface BareSendMsg as RadioSend;
interface ReceiveMsg as RadioReceive;
interface Timer;
interface Leds;
interface LoggerWrite;
interface LoggerRead;
// interface SplitControl as ADCControl;
interface StdControl as ADCControl;
interface ADC as Humidity;
interface ADC as Temperature;
interface ADCError as HumidityError;
interface ADCError as TemperatureError;
}
}
implementation
{
#include "SODebug.h"
TOS_Msg buffer;
TOS_MsgPtr ourBuffer;
bool sendPending;
uint8_t b_test;
/* Generic.Base.Init:
initialize lower components.
initialize component state, including constant portion of msgs.
*/
command result_t StdControl.init() {
result_t ok1, ok2, ok3 , ok4;
b_test = 0;
ourBuffer = &buffer;
sendPending = TRUE;
ok1 = call UARTControl.init();
ok2 = call RadioControl.init();
ok3 = call Leds.init();
ok4 = call GpsControl.init();
call ADCControl.init();
sendPending = FALSE;
//*****************************************************************************
// init debug uart
init_debug();
//*****************************************************************************
dbg(DBG_BOOT, "GenericBase initialized\n");
return rcombine4(ok1, ok2, ok3, ok4);
}
command result_t StdControl.start() {
result_t ok1, ok2, ok3;
//call Timer.start(TIMER_REPEAT, 5000);
ok1 = call UARTControl.start();
ok2 = call RadioControl.start();
ok3 = call ADCControl.start();
call GpsCmd.GpsPower(1); //turn on GPS power
return rcombine(ok1, ok2);
}
command result_t StdControl.stop() {
result_t ok1, ok2;
call ADCControl.stop();
ok1 = call UARTControl.stop();
ok2 = call RadioControl.stop();
return rcombine(ok1, ok2);
}
TOS_MsgPtr receive(TOS_MsgPtr received, bool fromUART) {
TOS_MsgPtr nextReceiveBuffer = received;
dbg(DBG_USR1, "GenericBase received %s packet\n",
fromUART ? "UART" : "radio");
if ((!sendPending) &&
(received->group == (TOS_AM_GROUP & 0xff))) {
result_t ok;
nextReceiveBuffer = ourBuffer;
ourBuffer = received;
dbg(DBG_USR1, "GenericBase forwarding packet to %s\n",
fromUART ? "radio" : "UART");
if (fromUART)
{
//call Leds.redOn();
ok = call RadioSend.send(received);
}
else
{
// call Leds.greenOn();
received->addr = TOS_UART_ADDR;
ok = call UARTSend.send(received);
}
if (ok != FAIL)
{
dbg(DBG_USR1, "GenericBase send pending\n");
sendPending = TRUE;
}
else {
//call Leds.yellowToggle();
}
}
return nextReceiveBuffer;
}
result_t sendDone(TOS_MsgPtr sent, result_t success) {
if(ourBuffer == sent)
{
dbg(DBG_USR1, "GenericBase send buffer free\n");
if (success == FAIL)
//call Leds.yellowToggle();
sendPending = FALSE;
}
return SUCCESS;
}
event TOS_MsgPtr RadioReceive.receive(TOS_MsgPtr data) {
if (data->crc) {
return receive(data, FALSE);
}
else {
return data;
}
}
/*
**************************
*Packet received from GPS*
**************************
*
*The following should be executed in GpsPacket
*/
event TOS_MsgPtr GpsReceive.receive(TOS_MsgPtr data) {
int8_t gga_string[MSG_LENGTH];
bool gga_read = FALSE;
bool gga_read_done = FALSE;
uint16_t i = 0;
uint8_t j = 0;
GPS_MsgPtr gps_data = (GPS_MsgPtr)data;
while (!gga_read_done) {
if(gps_data->data[i] == 'G') {
if(gps_data->data[i+1] == 'G') {
if(gps_data->data[i+2] == 'A') {
gga_read = TRUE;
}
}
}
if(gps_data->data[i] == '*') {
if(gga_read) {
call parseGPS(gga_string, j);
gga_read = FALSE;
gga_read_done = TRUE;
}
}
if(gga_read) {
gga_string[j] = gps_data->data[i];
j++;
}
i++;
}
}
/*
****************
*Parse GPS Data*
****************
*
* Fields are comma delimited
* NMEA string parsed by field and stored into
* write array
*/
command result_t parseGPS(int8_t NMEAstr[MSG_LENGTH], uint8_t length) {
char write[NUM_FIELDS][NUM_BYTES_PER_FIELD];
bool end_of_field = FALSE;
uint8_t i=0;
uint8_t j,m;
uint16_t k=0;
//***DEBUG: Output NMEA message***
//uint16_t q;
//for(q=0; q<length; q++) UARTPutChar(NMEAstr[q]);
//SODbg(DBG_USR2, "\n");
//********************************
// Parse and store comma delimited fields into EEPROM
while (i < NUM_FIELDS) {
// assemble write array
end_of_field = FALSE;
j = 0;
while (!end_of_field & k < length) {
if (NMEAstr[k] == DELIMITER) {
end_of_field = TRUE;
}
else {
write[i][j] = NMEAstr[k];
}
j++;
k++;
}
// if field is empty, set it equal to 0
if (j <= 1) {
for (m=0; m<10; m++) write[i][m] = 0;
}
i++;
}
call logGPS(write);
return SUCCESS;
}
/*
**************
*Log GGA data*
**************
*
* Assemble GGA message structure from write
* Store GGA data into line 25 of EEPROM
*/
command result_t logGPS(char write[NUM_FIELDS][NUM_BYTES_PER_FIELD]) {
GGA_Msg *pGGA;
//char log_array[GGA_BYTES];
char log_array[16];
char NS;
char EW;
uint8_t i,j;
// Assemble GGA_Msg
pGGA->hours = 10*(write[1][0]-'0') + (write[1][1]-'0');
pGGA->minutes = 10*(write[1][2]-'0') + (write[1][3]-'0');
pGGA->dec_sec = 10000*(write[1][4]-'0') + 1000*(write[1][5]-'0') + 100*(write[1][7]-'0') + 10*(write[1][8]-'0') + (write[1][9]-'0');
pGGA->Lat_deg = 10*(write[2][0]-'0') + (write[2][1]-'0');
pGGA->Lat_dec_min = 100000*(write[2][4]-'0') + 10000*(write[2][5]-'0') + 1000*(write[2][7]-'0') + 100*(write[2][8]-'0') + 10*(write[2][9]-'0') + (write[2][10]-'0');
pGGA->Long_deg = 10*(write[4][0]-'0') + (write[4][1]-'0');
pGGA->Long_dec_min = 100000*(write[4][4]-'0') + 10000*(write[4][5]-'0') + 1000*(write[4][7]-'0') + 100*(write[4][8]-'0') + 10*(write[4][9]-'0') + (write[4][10]-'0');
NS = (write[3][0] == 'N') ? 1 : 0;
EW = (write[5][0] == 'W') ? 1 : 0;
pGGA->NSEWind = EW | (NS<<4); // eg. Status = 000N000E = 00010000
// Log GGA_Msg
j = 0;
log_array[j++] = pGGA->hours;
log_array[j++] = pGGA->minutes;
log_array[j++] = (pGGA->dec_sec)>>8; // MSB
log_array[j++] = pGGA->dec_sec; // LSB
log_array[j++] = pGGA->Lat_deg;
log_array[j++] = (pGGA->Lat_dec_min)>>8;
log_array[j++] = pGGA->Lat_dec_min;
log_array[j++] = pGGA->Long_deg;
log_array[j++] = (pGGA->Long_dec_min)>>8;
log_array[j++] = pGGA->Long_dec_min;
log_array[j++] = pGGA->NSEWind;
log_array[j++] = 0xFF;
log_array[j++] = 0xFF;
log_array[j++] = 0xFF;
log_array[j++] = 0xFF;
//if(call GpsCmd.GpsPower(0)) {
// SODbg(DBG_USR2, "GPS Power Off\n");
//}
if(call LoggerWrite.write(0x19,(char *)log_array)){
call Leds.redOn();
}
return SUCCESS;
}
event result_t LoggerWrite.writeDone(result_t status){
//***DEBUG: Read and Output Stored GGA data***
//char line[32];
//uint8_t i;
//if (call LoggerRead.read(0x19,line)) {
// for(i=0; i<32; i++) UARTPutChar(line[i]);
//}
//SODbg(DBG_USR2, "\n");
//SODbg(DBG_USR2, "\n");
//*********************************************
return SUCCESS;
}
event result_t LoggerRead.readDone(uint8_t * packet, result_t status){
return SUCCESS;
}
event result_t GpsSend.sendDone(TOS_MsgPtr msg, result_t success) {
// call Leds.greenOff();
return sendDone(msg, success);
}
event TOS_MsgPtr UARTReceive.receive(TOS_MsgPtr data) {
return receive(data, TRUE);
}
event result_t UARTSend.sendDone(TOS_MsgPtr msg, result_t success) {
call Leds.greenOff();
return sendDone(msg, success);
}
event result_t RadioSend.sendDone(TOS_MsgPtr msg, result_t success) {
call Leds.redOff();
return sendDone(msg, success);
}
/******************************************************************************
* Timer fired, test GPS
*****************************************************************************/
event result_t Timer.fired() {
// sample
SODbg(DBG_USR2, "Timer fired\n");
if (!b_test){
//call Leds.redOn();
call GpsCmd.GpsPower(1); //turn on GPS power
b_test = 1;
}
else{
//call Leds.redOff();
// call GpsCmd.GpsPower(0); //turn on GPS power
b_test = 0;
}
// call ADCControl.start();
return SUCCESS;
}
/******************************************************************************
* Sensirion
*****************************************************************************/
#ifdef ADC_CONTROL
event result_t ADCControl.startDone() {
call Humidity.getData();
return SUCCESS;
}
event result_t ADCControl.initDone() {
return SUCCESS;
}
event result_t ADCControl.stopDone() {
return SUCCESS;
}
#endif
event result_t HumidityError.error(uint8_t token)
{
// short* sdata = (short*)(msg_buf.data);
// sdata[1] = 0;
call Leds.redOff();
call Temperature.getData();
return SUCCESS;
}
event result_t Humidity.dataReady(uint16_t data)
{
// short* sdata = (short*)(msg_buf.data);
// sdata[1] = data;
call Temperature.getData();
return SUCCESS;
}
event result_t TemperatureError.error(uint8_t token)
{
// short* sdata = (short*)(msg_buf.data);
// sdata[0] = TOS_LOCAL_ADDRESS;
// sdata[2] = 0;
// msg->data[6] = 0x99;
call ADCControl.stop();
// call Send.send(TOS_BCAST_ADDR, 7, msg);
return SUCCESS;
}
event result_t Temperature.dataReady(uint16_t data)
{
// short* sdata = (short*)(msg_buf.data);
// sdata[0] = TOS_LOCAL_ADDRESS;
// sdata[2] = data;
// msg->data[6] = 0x99;
call ADCControl.stop();
// call Send.send(TOS_BCAST_ADDR, 7, msg);
return SUCCESS;
}
}
Index: gps.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/gps/gps.nc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** gps.nc 22 May 2003 22:29:47 -0000 1.13
--- gps.nc 8 Jul 2003 21:51:35 -0000 1.14
***************
*** 65,69 ****
components Main,
LedsC,
! gpsM;
components GenericComm as Comm, Logger;
--- 65,70 ----
components Main,
LedsC,
! gpsM,
! gpsCmd;
components GenericComm as Comm, Logger;
Index: gpsCmd.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/gps/gpsCmd.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gpsCmd.nc 22 May 2003 22:29:47 -0000 1.1
--- gpsCmd.nc 8 Jul 2003 21:51:35 -0000 1.2
***************
*** 52,58 ****
Main.StdControl -> gpsCmdM;
! SimpleCmdM.Leds -> LedsC;
! gpsRetrive = gpsCmdM.gpsRetrieve;
gpsCmdM.CommControl -> Comm;
--- 52,58 ----
Main.StdControl -> gpsCmdM;
! gpsCmdM.Leds -> LedsC;
! gpsRetrieve = gpsCmdM.gpsRetrieve;
gpsCmdM.CommControl -> Comm;
Index: gpsCmdM.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/gps/gpsCmdM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gpsCmdM.nc 22 May 2003 22:29:47 -0000 1.1
--- gpsCmdM.nc 8 Jul 2003 21:51:35 -0000 1.2
***************
*** 87,91 ****
}
! signal ProcessCmd.done(cur_msg, status);
}
--- 87,91 ----
}
! signal gpsRetrieve.done(cur_msg, status);
}
***************
*** 130,134 ****
TOS_MsgPtr ret = cur_msg;
- call Leds.greenToggle();
retval = call gpsRetrieve.execute(pmsg);
if (retval==SUCCESS) {
--- 130,133 ----
Index: gpsM.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/gps/gpsM.nc,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** gpsM.nc 22 May 2003 22:29:47 -0000 1.26
--- gpsM.nc 8 Jul 2003 21:51:36 -0000 1.27
***************
*** 121,124 ****
--- 121,125 ----
command result_t StdControl.init() {
+
TOSH_MAKE_PW0_OUTPUT(); //make PW1 an output
//TOSH_SET_PW0_PIN(); //turn on GPS power
***************
*** 146,150 ****
// Enable reciever and transmitter, disabletheir interrupts
outp(((0 << RXCIE) | (0 << TXCIE) | (1 << RXEN) | (1 << TXEN)) ,UCSR0B);
!
return rcombine(call SubControl.init(), call Leds.init());
}
--- 147,151 ----
// Enable reciever and transmitter, disabletheir interrupts
outp(((0 << RXCIE) | (0 << TXCIE) | (1 << RXEN) | (1 << TXEN)) ,UCSR0B);
!
return rcombine(call SubControl.init(), call Leds.init());
}
***************
*** 274,278 ****
}
-
/*
**************
--- 275,278 ----
***************
*** 321,330 ****
// write to EEPROM
! call LoggerWrite.write(25 + field,(char *)write);
}
-
- return SUCCESS;
}
/*
--- 321,331 ----
// write to EEPROM
! if(call LoggerWrite.write(25+field,(char *)write)) {
! signal LoggerWrite.writeDone(SUCCESS);
! }
}
}
+
/*
--- LogMsg.class DELETED ---
--- LogMsg.java DELETED ---
--- gpsCmdMsg.class DELETED ---
--- gpsCmdMsg.java DELETED ---
|
|
From: <do...@us...> - 2003-07-08 20:54:32
|
Update of /cvsroot/firebug/firebug/project/zaurus/ipkg In directory sc8-pr-cvs1:/tmp/cvs-serv18324/ipkg Added Files: .cvsignore Log Message: ignore file added. --- NEW FILE: .cvsignore --- *~ home *.gz *.ipk |
|
From: <do...@us...> - 2003-07-08 20:53:52
|
Update of /cvsroot/firebug/firebug/project/zaurus
In directory sc8-pr-cvs1:/tmp/cvs-serv18172
Modified Files:
build.xml
Log Message:
Added java classes to support vu tools on the
Sharp Zaurus pda. These are gui classes that are hardwired to
the small screen size of the zaurus, and should be be extended.
Index: build.xml
===================================================================
RCS file: /cvsroot/firebug/firebug/project/zaurus/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build.xml 2 Jul 2003 22:48:52 -0000 1.4
--- build.xml 8 Jul 2003 20:53:48 -0000 1.5
***************
*** 67,77 ****
<target name="javadoc">
<mkdir dir="doc/api"/>
! <javadoc sourcepath="./src" packagenames="org.firebug.*" destdir="doc/api"/>
</target>
! <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>
--- 67,84 ----
<target name="javadoc">
<mkdir dir="doc/api"/>
! <javadoc sourcepath="./src" packagenames="isis.nest.zaurus.*" destdir="doc/api"/>
</target>
! <target name="runvu" 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>
+
+ <target name="runz" depends="jar">
+ <echo message=".\dist\tosmc.jar;${TINYOSJAR}" />
+ <java classpath=".\dist\tosmc.jar;${TINYOSJAR}/tinyos.jar"
+ classname="isis.nest.zaurus.ZMain" fork="yes">
</java>
</target>
|
|
From: <do...@us...> - 2003-07-08 20:53:52
|
Update of /cvsroot/firebug/firebug/project/zaurus/vu/isis/nest/zaurus In directory sc8-pr-cvs1:/tmp/cvs-serv18172/vu/isis/nest/zaurus Added Files: ZFrame.java ZMain.java ZMenu.java Log Message: Added java classes to support vu tools on the Sharp Zaurus pda. These are gui classes that are hardwired to the small screen size of the zaurus, and should be be extended. --- NEW FILE: ZFrame.java --- package isis.nest.zaurus; import java.awt. *; import java.lang. *; import java.awt.event. *; import java.io. *; public class ZFrame extends Frame { //implements WindowListener { //implements EarthquakeListener { public ZFrame () { MenuBar mb = new MenuBar(); this.setMenuBar (mb); ZMenu zm = new ZMenu(mb,this); System.out.println("ZFrame constructor"); } /** Custom event handler to listen for "earthquake events", * i.e., when the user changes parameters. */ /* public void parameterChanged (EarthquakeEvent e) { spectrum.spectrum (EQ); graphit.drawspectrum (); } */ } --- NEW FILE: ZMain.java --- package isis.nest.zaurus; import java.awt. *; import java.lang. *; public class ZMain extends Object { public static void main (String[]args) { System.out.println ("In main()..."); ZFrame zf = new ZFrame(); zf.setLocation(0, 0); //Canvas c = new Canvas(); //c.setSize(236,280); Panel panel = new Panel(); panel.setSize(236,280); zf.setSize(236,280); zf.add(panel); //zf.pack(); zf.show(); } } --- NEW FILE: ZMenu.java --- package isis.nest.zaurus; import java.awt. *; import java.awt.event. *; public class ZMenu extends MenuBar implements ActionListener { public ZMenu (MenuBar menubar, ZFrame zf) { makemenu (menubar); } private void makemenu (MenuBar menubar) { Menu file = new Menu ("File"); MenuItem loadItem = new MenuItem("Load"); loadItem.setActionCommand("load"); loadItem.addActionListener(this); file.add (loadItem); MenuItem quit_item = new MenuItem("Quit"); quit_item.setActionCommand("quit"); quit_item.addActionListener(this); file.add (quit_item); Menu help = new Menu ("Help"); MenuItem aboutItem = new MenuItem("About"); aboutItem.setActionCommand ("about"); //aboutItem.addActionListener (aboutdialog); help.add (aboutItem); menubar.add (file); menubar.add (help); } public void actionPerformed (ActionEvent e) { String command = e.getActionCommand (); if (command.equalsIgnoreCase ("about")) { //aboutdialog.show (); } else if (command.equalsIgnoreCase ("quit")) { System.exit(0); } else if (command.equalsIgnoreCase ("load")) { System.out.println("Load item invoked"); } } } |
|
From: <do...@us...> - 2003-07-08 20:51:49
|
Update of /cvsroot/firebug/firebug/project/zaurus/ipkg In directory sc8-pr-cvs1:/tmp/cvs-serv17906 Added Files: build.sh control laep-fire.png run_z z.desktop Log Message: Added files and shell script to support building an i-package for sharp zaurus. The package tree is built on the fly and populated using the script. Do not add any ipkg directories or files to cvs tree. --- NEW FILE: build.sh --- #/usr/bin/bash if [ -e home ] ; then rm -rf home fi HOME=home QT=$HOME/QtPalmtop APPS=$QT/apps BIN=$QT/bin JAVA=$QT/java PICS=$QT/pics GAMES=$APPS/Games mkdir $HOME mkdir $QT mkdir $APPS mkdir $GAMES mkdir $BIN mkdir $JAVA mkdir $PICS cp laep-fire.png $PICS cp run_z $BIN cp z.desktop $GAMES cp ../dist/tosmc.jar $JAVA rm -f *.ipk rm -f *.gz chmod 755 ./home/QtPalmtop/java/tosmc.jar chmod 755 ./home/QtPalmtop/bin tar -cvf control.tar ./control tar -cvf data.tar ./home gzip control.tar gzip data.tar tar -cvf z.tar ./control.tar.gz ./data.tar.gz gzip z.tar mv z.tar.gz z_arm.ipk --- NEW FILE: control --- Package: z Installed-Size: 80k Filename: ./z-evm_1.0_arm.ipk Version: 1.0 Architecture: Arm Maintainer: David M. Doolin <do...@ce...> Description: ZF Section: Java --- NEW FILE: laep-fire.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: run_z --- . /home/QtPalmtop/bin/installdir.sh $QPEDIR/bin/evm -cp /home/QtPalmtop/java/tosmc.jar isis.net.zaurus.ZMain --- NEW FILE: z.desktop --- [Desktop Entry] Comment=ZFrame. Exec=run_z Icon=laep-fire.png Type=Application Name=ZF |
|
From: <do...@us...> - 2003-07-08 20:13:18
|
Update of /cvsroot/firebug/firebug/project/zaurus/ipkg In directory sc8-pr-cvs1:/tmp/cvs-serv12130/ipkg Log Message: Directory /cvsroot/firebug/firebug/project/zaurus/ipkg added to the repository |
