[Firebug-cvs] fireboard/fireboard/sensors/intersema5534ap Intersema.nc,1.2,1.3 IntersemaLower.nc,1.1
Brought to you by:
doolin
Menu
▾
▴
[Firebug-cvs] fireboard/fireboard/sensors/intersema5534ap Intersema.nc,1.2,1.3 IntersemaLower.nc,1.1.1.1,1.2 IntersemaM.nc,1.1.1.1,1.2
|
From: <do...@us...> - 2004-01-22 00:40:10
|
Update of /cvsroot/firebug/fireboard/fireboard/sensors/intersema5534ap
In directory sc8-pr-cvs1:/tmp/cvs-serv31002/fireboard/sensors/intersema5534ap
Modified Files:
Intersema.nc IntersemaLower.nc IntersemaM.nc
Log Message:
Crash bang boom. Light and barometer are down at the moment, but the driver code is getting much cleaner. May need to back out a couple of
minor changes later. There may be a file or two that have been removed from the archive that will be actually needed, it/they can be added back if it is
not possible to make the system files work.
Index: Intersema.nc
===================================================================
RCS file: /cvsroot/firebug/fireboard/fireboard/sensors/intersema5534ap/Intersema.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Intersema.nc 6 Jan 2004 16:29:47 -0000 1.2
--- Intersema.nc 22 Jan 2004 00:40:06 -0000 1.3
***************
*** 76,81 ****
implementation {
! components IntersemaM, IntersemaPressure,
! MicaWbSwitch, TimerC, NoLeds,LedsC;
IntersemaM.StdControl = StdControl;
--- 76,85 ----
implementation {
!
! components IntersemaM,
! IntersemaPressure,
! TimerC,
! NoLeds,
! LedsC;
IntersemaM.StdControl = StdControl;
Index: IntersemaLower.nc
===================================================================
RCS file: /cvsroot/firebug/fireboard/fireboard/sensors/intersema5534ap/IntersemaLower.nc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** IntersemaLower.nc 5 Jan 2004 21:03:27 -0000 1.1.1.1
--- IntersemaLower.nc 22 Jan 2004 00:40:06 -0000 1.2
***************
*** 1,6 ****
/* tab:4
! *
! *
! * "Copyright (c) 2000-2002 The Regents of the University of California.
* All rights reserved.
*
--- 1,4 ----
/* tab:4
! * "Copyright (c) 2000-2003 The Regents of the University of California.
* All rights reserved.
*
***************
*** 21,61 ****
* 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.
- *
*
*/
/*
--- 19,29 ----
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
*
! * Copyright (c) 2002-2003 Intel Corporation
* All rights reserved.
*
+ * This file is distributed under the terms in the attached INTEL-LICENSE
+ * file. If you do not find these files, copies can be found by writing to
+ * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA,
+ * 94704. Attention: Intel License Inquiry.
*/
/*
Index: IntersemaM.nc
===================================================================
RCS file: /cvsroot/firebug/fireboard/fireboard/sensors/intersema5534ap/IntersemaM.nc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** IntersemaM.nc 5 Jan 2004 21:03:27 -0000 1.1.1.1
--- IntersemaM.nc 22 Jan 2004 00:40:06 -0000 1.2
***************
*** 87,95 ****
command result_t StdControl.start() {
- call Leds.redOn();
- call Leds.yellowOn();
- call Leds.greenOn();
state = START;
- //call Timer.start(TIMER_REPEAT, 1500);
return SUCCESS;
}
--- 87,91 ----
***************
*** 105,112 ****
event result_t Timer.fired() {
- call Leds.redOff();
- call Leds.yellowOff();
- call Leds.greenOff();
-
call PressureControl.start();
return SUCCESS;
--- 101,104 ----
***************
*** 154,158 ****
data,PressureData,(int)Temp, (int)Press);
- //signal Sensor.dataReady((void*)0);
// FIXME: PressureControl is wired to SplitControl in IntersemaPressureM,
--- 146,149 ----
***************
*** 247,250 ****
--- 238,242 ----
command result_t Sensor.startSampling() {
+ call Timer.start(TIMER_REPEAT, 1500);
return SUCCESS;
}
***************
*** 266,270 ****
}
! default event result_t Sensor.error(uint16_t error_code) {
return SUCCESS;
}
--- 258,262 ----
}
! async default event result_t Sensor.error(uint16_t error_code) {
return SUCCESS;
}
|
