[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/eyesIFX/sensors
BatteryLevelSensorC.nc, 1.1.2.1, 1.1.2.2 DemoSensorC.nc,
1.1.2.6, 1.1.2.7 DemoSensorNowC.nc, 1.1.2.3,
1.1.2.4 DemoSensorStreamC.nc, 1.1.2.2, 1.1.2.3 PhotoSensorC.nc,
1.1.2.4, 1.1.2.5 RssiSensorC.nc, 1.1.2.4,
1.1.2.5 SensorSettingsC.nc, 1.1.2.5, 1.1.2.6 TempExtSensorC.nc,
1.1.2.3, 1.1.2.4
Jan-Hinrich Hauer
janhauer at users.sourceforge.net
Mon Oct 9 06:34:46 PDT 2006
Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22747/tos/platforms/eyesIFX/sensors
Modified Files:
Tag: tinyos-2_0_devel-BRANCH
BatteryLevelSensorC.nc DemoSensorC.nc DemoSensorNowC.nc
DemoSensorStreamC.nc PhotoSensorC.nc RssiSensorC.nc
SensorSettingsC.nc TempExtSensorC.nc
Log Message:
Updated to work with new AdcConfigure interface.
Index: BatteryLevelSensorC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors/BatteryLevelSensorC.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
*** BatteryLevelSensorC.nc 31 May 2006 13:53:03 -0000 1.1.2.1
--- BatteryLevelSensorC.nc 9 Oct 2006 13:34:42 -0000 1.1.2.2
***************
*** 49,57 ****
components new AdcReadClientC() as AdcReadClient;
Read = AdcReadClient;
! AdcReadClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[INTERNAL_VOLTAGE_REF_2_5V];
components new AdcReadNowClientC() as AdcReadNowClient;
ReadNow = AdcReadNowClient;
ReadNowResource = AdcReadNowClient;
! AdcReadNowClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[INTERNAL_VOLTAGE_REF_2_5V];
}
--- 49,57 ----
components new AdcReadClientC() as AdcReadClient;
Read = AdcReadClient;
! AdcReadClient.AdcConfigure -> Settings.AdcConfigure[INTERNAL_VOLTAGE_REF_2_5V];
components new AdcReadNowClientC() as AdcReadNowClient;
ReadNow = AdcReadNowClient;
ReadNowResource = AdcReadNowClient;
! AdcReadNowClient.AdcConfigure -> Settings.AdcConfigure[INTERNAL_VOLTAGE_REF_2_5V];
}
Index: DemoSensorC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors/DemoSensorC.nc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** DemoSensorC.nc 7 Jul 2006 15:55:26 -0000 1.1.2.6
--- DemoSensorC.nc 9 Oct 2006 13:34:42 -0000 1.1.2.7
***************
*** 61,64 ****
Read = ReadShift;
ReadShift.ReadRaw -> AdcReadClient;
! AdcReadClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[PHOTO_SENSOR_DEFAULT];
}
--- 61,64 ----
Read = ReadShift;
ReadShift.ReadRaw -> AdcReadClient;
! AdcReadClient.AdcConfigure -> Settings.AdcConfigure[PHOTO_SENSOR_DEFAULT];
}
Index: DemoSensorNowC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors/DemoSensorNowC.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** DemoSensorNowC.nc 7 Jul 2006 15:55:26 -0000 1.1.2.3
--- DemoSensorNowC.nc 9 Oct 2006 13:34:42 -0000 1.1.2.4
***************
*** 64,67 ****
ReadNowShift.ReadNowRaw -> AdcReadNowClient;
Resource = AdcReadNowClient;
! AdcReadNowClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[PHOTO_SENSOR_DEFAULT];
}
--- 64,67 ----
ReadNowShift.ReadNowRaw -> AdcReadNowClient;
Resource = AdcReadNowClient;
! AdcReadNowClient.AdcConfigure -> Settings.AdcConfigure[PHOTO_SENSOR_DEFAULT];
}
Index: DemoSensorStreamC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors/DemoSensorStreamC.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** DemoSensorStreamC.nc 7 Jul 2006 15:55:26 -0000 1.1.2.2
--- DemoSensorStreamC.nc 9 Oct 2006 13:34:42 -0000 1.1.2.3
***************
*** 61,64 ****
ReadStream = ReadStreamShift;
ReadStreamShift.ReadStreamRaw -> AdcReadStreamClient;
! AdcReadStreamClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[PHOTO_SENSOR_DEFAULT];
}
--- 61,64 ----
ReadStream = ReadStreamShift;
ReadStreamShift.ReadStreamRaw -> AdcReadStreamClient;
! AdcReadStreamClient.AdcConfigure -> Settings.AdcConfigure[PHOTO_SENSOR_DEFAULT];
}
Index: PhotoSensorC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors/PhotoSensorC.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
*** PhotoSensorC.nc 31 Jan 2006 18:53:36 -0000 1.1.2.4
--- PhotoSensorC.nc 9 Oct 2006 13:34:42 -0000 1.1.2.5
***************
*** 59,68 ****
components new AdcReadClientC() as AdcReadClient;
Read = AdcReadClient;
! AdcReadClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[PHOTO_SENSOR_DEFAULT];
components new AdcReadNowClientC() as AdcReadNowClient;
ReadNow = AdcReadNowClient;
ReadNowResource = AdcReadNowClient;
! AdcReadNowClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[PHOTO_SENSOR_DEFAULT];
}
--- 59,68 ----
components new AdcReadClientC() as AdcReadClient;
Read = AdcReadClient;
! AdcReadClient.AdcConfigure -> Settings.AdcConfigure[PHOTO_SENSOR_DEFAULT];
components new AdcReadNowClientC() as AdcReadNowClient;
ReadNow = AdcReadNowClient;
ReadNowResource = AdcReadNowClient;
! AdcReadNowClient.AdcConfigure -> Settings.AdcConfigure[PHOTO_SENSOR_DEFAULT];
}
Index: RssiSensorC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors/RssiSensorC.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
*** RssiSensorC.nc 31 May 2006 13:53:03 -0000 1.1.2.4
--- RssiSensorC.nc 9 Oct 2006 13:34:42 -0000 1.1.2.5
***************
*** 59,67 ****
components new AdcReadClientC() as AdcReadClient;
Read = AdcReadClient;
! AdcReadClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[RSSI_SENSOR_REF_1_5V];
components new AdcReadNowClientC() as AdcReadNowClient;
ReadNow = AdcReadNowClient;
ReadNowResource = AdcReadNowClient;
! AdcReadNowClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[RSSI_SENSOR_REF_1_5V];
}
--- 59,67 ----
components new AdcReadClientC() as AdcReadClient;
Read = AdcReadClient;
! AdcReadClient.AdcConfigure -> Settings.AdcConfigure[RSSI_SENSOR_REF_1_5V];
components new AdcReadNowClientC() as AdcReadNowClient;
ReadNow = AdcReadNowClient;
ReadNowResource = AdcReadNowClient;
! AdcReadNowClient.AdcConfigure -> Settings.AdcConfigure[RSSI_SENSOR_REF_1_5V];
}
Index: SensorSettingsC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors/SensorSettingsC.nc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** SensorSettingsC.nc 31 May 2006 13:53:03 -0000 1.1.2.5
--- SensorSettingsC.nc 9 Oct 2006 13:34:42 -0000 1.1.2.6
***************
*** 44,60 ****
#include <sensors.h>
module SensorSettingsC {
! provides interface Msp430Adc12Config[uint8_t type];
}
implementation
{
! async command msp430adc12_channel_config_t Msp430Adc12Config.getChannelSettings[uint8_t type]() {
! msp430adc12_channel_config_t config;
! if(type < SENSOR_SENTINEL) {
! config = sensorconfigurations[type];
! } else {
! config = sensorconfigurations[SENSOR_SENTINEL];
! }
! return config;
! }
}
--- 44,57 ----
#include <sensors.h>
module SensorSettingsC {
! provides interface AdcConfigure<const msp430adc12_channel_config_t*> as AdcConfigure[uint8_t type];
}
implementation
{
! async command const msp430adc12_channel_config_t* AdcConfigure.getConfiguration[uint8_t type]() {
! if (type < SENSOR_SENTINEL)
! return &sensorconfigurations[type];
! else
! return &sensorconfigurations[SENSOR_SENTINEL];
! }
}
Index: TempExtSensorC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors/TempExtSensorC.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** TempExtSensorC.nc 31 Jan 2006 18:53:36 -0000 1.1.2.3
--- TempExtSensorC.nc 9 Oct 2006 13:34:42 -0000 1.1.2.4
***************
*** 58,66 ****
components new AdcReadClientC() as AdcReadClient;
Read = AdcReadClient;
! AdcReadClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[TEMP_SENSOR_DEFAULT];
components new AdcReadNowClientC() as AdcReadNowClient;
ReadNow = AdcReadNowClient;
ReadNowResource = AdcReadNowClient;
! AdcReadNowClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[TEMP_SENSOR_DEFAULT];
}
--- 58,66 ----
components new AdcReadClientC() as AdcReadClient;
Read = AdcReadClient;
! AdcReadClient.AdcConfigure -> Settings.AdcConfigure[TEMP_SENSOR_DEFAULT];
components new AdcReadNowClientC() as AdcReadNowClient;
ReadNow = AdcReadNowClient;
ReadNowResource = AdcReadNowClient;
! AdcReadNowClient.AdcConfigure -> Settings.AdcConfigure[TEMP_SENSOR_DEFAULT];
}
More information about the Tinyos-2-commits
mailing list