[Tinyos-2-commits] CVS: tinyos-2.x/tos/sensorboards/mts300
SensorMts300C.nc, 1.1.2.1, 1.1.2.2 SensorMts300P.nc, 1.1.2.4,
1.1.2.5
Phil Levis
scipio at users.sourceforge.net
Sun Nov 5 10:09:55 PST 2006
Update of /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/mts300
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13786/tos/sensorboards/mts300
Modified Files:
Tag: tinyos-2_0_devel-BRANCH
SensorMts300C.nc SensorMts300P.nc
Log Message:
A few minor bug fixes, from the SF bugtracker. Limited MTS300 support.
Index: SensorMts300C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/mts300/SensorMts300C.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** SensorMts300C.nc 20 Oct 2005 04:44:07 -0000 1.1.2.1
--- SensorMts300C.nc 5 Nov 2006 18:09:53 -0000 1.1.2.2
***************
*** 24,27 ****
--- 24,28 ----
*
* @author Martin Turon <mturon at xbow.com>
+ * @author Miguel Freitas
*
* $Id$
***************
*** 33,38 ****
interface Init; //!< Standard Initialization
interface StdControl; //!< Start/Stop for Power Management
! interface AcquireData as Temp; //!< Thermister
! interface AcquireData as Light; //!< Photo sensor
}
}
--- 34,39 ----
interface Init; //!< Standard Initialization
interface StdControl; //!< Start/Stop for Power Management
! interface Read<uint16_t> as Temp; //!< Thermister
! interface Read<uint16_t> as Light; //!< Photo sensor
}
}
***************
*** 41,47 ****
components
SensorMts300P,
! HplGeneralIOC as IO,
! new AdcChannelC(1) as SensorADC,
! new OskiTimerMilliC() as WarmUpTimer
;
--- 42,49 ----
components
SensorMts300P,
! SensorMts300DeviceP,
! HplAtm128GeneralIOC as IO,
! new AdcReadClientC() as SensorADC,
! new TimerMilliC() as WarmUpTimer
;
***************
*** 51,54 ****
--- 53,59 ----
Light = SensorMts300P.Light;
+ SensorADC.Atm128AdcConfig -> SensorMts300DeviceP;
+ SensorADC.ResourceConfigure -> SensorMts300DeviceP;
+
SensorMts300P.SensorADC -> SensorADC;
SensorMts300P.TempPower -> IO.PortE6;
Index: SensorMts300P.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/sensorboards/mts300/SensorMts300P.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** SensorMts300P.nc 14 Feb 2006 17:01:46 -0000 1.1.2.4
--- SensorMts300P.nc 5 Nov 2006 18:09:53 -0000 1.1.2.5
***************
*** 24,27 ****
--- 24,28 ----
*
* @author Martin Turon <mturon at xbow.com>
+ * @author Miguel Freitas
*
* $Id$
***************
*** 48,53 ****
interface Init; //!< Standard Initialization
interface StdControl; //!< Start/Stop for Power Management
! interface AcquireData as Temp; //!< Thermister
! interface AcquireData as Light; //!< Photo sensor
}
--- 49,54 ----
interface Init; //!< Standard Initialization
interface StdControl; //!< Start/Stop for Power Management
! interface Read<uint16_t> as Temp; //!< Thermister
! interface Read<uint16_t> as Light; //!< Photo sensor
}
***************
*** 55,59 ****
interface GeneralIO as TempPower;
interface GeneralIO as LightPower;
! interface AcquireData as SensorADC;
interface Timer<TMilli> as WarmUpTimer;
}
--- 56,60 ----
interface GeneralIO as TempPower;
interface GeneralIO as LightPower;
! interface Read<uint16_t> as SensorADC;
interface Timer<TMilli> as WarmUpTimer;
}
***************
*** 88,91 ****
--- 89,93 ----
command error_t Init.init() {
g_flags.flat = STATE_IDLE;
+ return SUCCESS;
}
***************
*** 96,99 ****
--- 98,102 ----
*/
command error_t StdControl.start() {
+ return SUCCESS;
}
***************
*** 110,113 ****
--- 113,117 ----
call LightPower.makeInput();
atomic g_flags.bits.state = STATE_IDLE;
+ return SUCCESS;
}
***************
*** 154,158 ****
// Start the sample.
atomic { g_flags.bits.state = STATE_LIGHT_SAMPLING; }
! call SensorADC.getData();
return;
--- 158,162 ----
// Start the sample.
atomic { g_flags.bits.state = STATE_LIGHT_SAMPLING; }
! call SensorADC.read();
return;
***************
*** 170,174 ****
// If Temperature is busy, repost and try again later.
// This will not let the CPU sleep. Add delay timer.
! post getLightSample();
return;
--- 174,178 ----
// If Temperature is busy, repost and try again later.
// This will not let the CPU sleep. Add delay timer.
! post getTempSample();
return;
***************
*** 185,189 ****
// Start the sample.
atomic { g_flags.bits.state = STATE_TEMP_SAMPLING; }
! call SensorADC.getData();
return;
--- 189,193 ----
// Start the sample.
atomic { g_flags.bits.state = STATE_TEMP_SAMPLING; }
! call SensorADC.read();
return;
***************
*** 204,208 ****
* 'dataReady' or 'error' will be signaled if SUCCESS is returned
*/
! command error_t Temp.getData() {
post getTempSample();
return SUCCESS;
--- 208,212 ----
* 'dataReady' or 'error' will be signaled if SUCCESS is returned
*/
! command error_t Temp.read() {
post getTempSample();
return SUCCESS;
***************
*** 219,223 ****
* 'dataReady' or 'error' will be signaled if SUCCESS is returned
*/
! command error_t Light.getData() {
post getLightSample();
return SUCCESS;
--- 223,227 ----
* 'dataReady' or 'error' will be signaled if SUCCESS is returned
*/
! command error_t Light.read() {
post getLightSample();
return SUCCESS;
***************
*** 241,246 ****
default:
//ERROR!!!
! signal Light.error(-1);
! signal Temp.error(-1);
}
// Worst case -- return to the IDLE state so next task can progress !!
--- 245,250 ----
default:
//ERROR!!!
! signal Light.readDone( FAIL, 0 );
! signal Temp.readDone( FAIL, 0 );
}
// Worst case -- return to the IDLE state so next task can progress !!
***************
*** 255,272 ****
* shifted left by 16-n bits.
*/
! event void SensorADC.dataReady(uint16_t data) {
switch (g_flags.bits.state) {
case STATE_LIGHT_SAMPLING:
! signal Light.dataReady(data);
break;
case STATE_TEMP_SAMPLING:
! signal Temp.dataReady(data);
break;
default:
//ERROR!!!
! signal Light.error(data);
! signal Temp.error(data);
}
// ADC.dataReady must return to IDLE state so next task can progress !!
--- 259,276 ----
* shifted left by 16-n bits.
*/
! event void SensorADC.readDone( error_t result, uint16_t data ) {
switch (g_flags.bits.state) {
case STATE_LIGHT_SAMPLING:
! signal Light.readDone(result, data);
break;
case STATE_TEMP_SAMPLING:
! signal Temp.readDone(result, data);
break;
default:
//ERROR!!!
! signal Light.readDone( FAIL, 0 );
! signal Temp.readDone( FAIL, 0 );
}
// ADC.dataReady must return to IDLE state so next task can progress !!
***************
*** 274,304 ****
}
-
- /**
- * Signal that the data acquisition failed
- * @param info error information
- */
- event void SensorADC.error(uint16_t info) {
- switch (g_flags.bits.state) {
- case STATE_LIGHT_SAMPLING:
- signal Light.error(info);
- break;
-
- case STATE_TEMP_SAMPLING:
- signal Temp.error(info);
- break;
-
- default:
- //ERROR!!!
- signal Light.error(info);
- signal Temp.error(info);
- }
- // ADC.dataReady must return to IDLE state so next task can progress !!
- atomic { g_flags.bits.state = STATE_IDLE; }
- }
}
-
-
--- 278,283 ----
More information about the Tinyos-2-commits
mailing list