Skip to content

Commit

Permalink
Made buffers slightly smaller to preserve memory.
Browse files Browse the repository at this point in the history
Future changes could include making the buffers dynamically depend
on sensor speed and sample temporal validity.
  • Loading branch information
Timo Rongas committed Aug 24, 2010
1 parent e7dbb83 commit bc3d32a
Show file tree
Hide file tree
Showing 17 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion adaptors/accelerometeradaptor/accelerometeradaptor.cpp
Expand Up @@ -49,7 +49,7 @@ AccelerometerAdaptor::AccelerometerAdaptor(const QString& id) :

setDescription("Input device accelerometer adaptor (lis302d)");

accelerometerBuffer_ = new DeviceAdaptorRingBuffer<OrientationData>(1024);
accelerometerBuffer_ = new DeviceAdaptorRingBuffer<OrientationData>(128);
addAdaptedSensor("accelerometer", "Internal accelerometer coordinates", accelerometerBuffer_);

introduceAvailableDataRange(DataRange(-2048, 2048, 1));
Expand Down
2 changes: 1 addition & 1 deletion adaptors/alsadaptor/alsadaptor.cpp
Expand Up @@ -40,7 +40,7 @@ struct bh1770glc_als {
ALSAdaptor::ALSAdaptor(const QString& id) :
SysfsAdaptor(id, SysfsAdaptor::SelectMode, Config::configuration()->value("als_dev_path").toString())
{
alsBuffer_ = new DeviceAdaptorRingBuffer<TimedUnsigned>(1024);
alsBuffer_ = new DeviceAdaptorRingBuffer<TimedUnsigned>(32);
addAdaptedSensor("als", "Internal ambient light sensor lux values", alsBuffer_);

introduceAvailableDataRange(DataRange(0, 65535, 1));
Expand Down
2 changes: 1 addition & 1 deletion adaptors/magnetometeradaptor/magnetometeradaptor.cpp
Expand Up @@ -52,7 +52,7 @@ MagnetometerAdaptor::MagnetometerAdaptor(const QString& id) :
} else {
sensordLogD() << "Detected magnetometer driver at " << driverHandle;
addPath(driverHandle, 0);
magnetometerBuffer_ = new DeviceAdaptorRingBuffer<TimedXyzData>(1024);
magnetometerBuffer_ = new DeviceAdaptorRingBuffer<TimedXyzData>(128);
addAdaptedSensor("magnetometer", "Internal magnetometer coordinates", magnetometerBuffer_);
}

Expand Down
2 changes: 1 addition & 1 deletion adaptors/mrstaccelerometer/mrstaccelerometeradaptor.cpp
Expand Up @@ -20,7 +20,7 @@ MRSTAccelAdaptor::MRSTAccelAdaptor (const QString& id) :

devId = 0;
addPath (devPath, devId);
buffer = new DeviceAdaptorRingBuffer<OrientationData>(1024);
buffer = new DeviceAdaptorRingBuffer<OrientationData>(128);
addAdaptedSensor("accelerometer", "MRST accelerometer", buffer);
}

Expand Down
2 changes: 1 addition & 1 deletion adaptors/proximityadaptor/proximityadaptor.cpp
Expand Up @@ -44,7 +44,7 @@ ProximityAdaptor::ProximityAdaptor(const QString& id) :
SysfsAdaptor(id, SysfsAdaptor::SelectMode, Config::configuration()->value("proximity_dev_path").toString()),
m_threshold(35)
{
proximityBuffer_ = new DeviceAdaptorRingBuffer<TimedUnsigned>(1024);
proximityBuffer_ = new DeviceAdaptorRingBuffer<TimedUnsigned>(16);
addAdaptedSensor("proximity", "Proximity state", proximityBuffer_);

m_threshold = readThreshold();
Expand Down
2 changes: 1 addition & 1 deletion adaptors/tapadaptor/tapadaptor.cpp
Expand Up @@ -49,7 +49,7 @@ TapAdaptor::TapAdaptor(const QString& id) :
sensordLogW() << "Input device not found.";
}

tapBuffer_ = new DeviceAdaptorRingBuffer<TapData>(1024);
tapBuffer_ = new DeviceAdaptorRingBuffer<TapData>(128);
addAdaptedSensor("tap", "Internal accelerometer tap events", tapBuffer_);

introduceAvailableDataRange(DataRange(0, 2, 1));
Expand Down
2 changes: 1 addition & 1 deletion adaptors/touchadaptor/touchadaptor.cpp
Expand Up @@ -48,7 +48,7 @@ TouchAdaptor::TouchAdaptor(const QString& id) : InputDevAdaptor(id, HARD_MAX_TOU
if (!getInputDevices("touchscreen")) {
sensordLogW() << "Input device not found.";
}
outputBuffer_ = new DeviceAdaptorRingBuffer<TouchData>(1024);
outputBuffer_ = new DeviceAdaptorRingBuffer<TouchData>(128);
addAdaptedSensor("touch", "Touch screen input", outputBuffer_);
}

Expand Down
4 changes: 2 additions & 2 deletions chains/accelerometerchain/accelerometerchain.cpp
Expand Up @@ -52,7 +52,7 @@ AccelerometerChain::AccelerometerChain(const QString& id) :
isValid_ = true;
}

accelerometerReader_ = new BufferReader<AccelerationData>(1024);
accelerometerReader_ = new BufferReader<AccelerationData>(128);

// Get the transformation matrix from config file
QString aconvString = Config::configuration()->value("acc_trans_matrix", "").toString();
Expand All @@ -71,7 +71,7 @@ AccelerometerChain::AccelerometerChain(const QString& id) :
qRegisterMetaType<TMatrix>("TMatrix");
((CoordinateAlignFilter*)accCoordinateAlignFilter_)->setProperty("transMatrix", QVariant::fromValue(TMatrix(aconv_)));

outputBuffer_ = new RingBuffer<AccelerationData>(1024);
outputBuffer_ = new RingBuffer<AccelerationData>(128);
nameOutputBuffer("accelerometer", outputBuffer_);

// Create buffers for filter chain
Expand Down
8 changes: 4 additions & 4 deletions chains/orientationchain/orientationchain.cpp
Expand Up @@ -43,17 +43,17 @@ OrientationChain::OrientationChain(const QString& id) :
isValid_ = true;
}

accelerometerReader_ = new BufferReader<AccelerationData>(1024);
accelerometerReader_ = new BufferReader<AccelerationData>(128);

orientationInterpreterFilter_ = sm.instantiateFilter("orientationinterpreter");

topEdgeOutput_ = new RingBuffer<PoseData>(1024);
topEdgeOutput_ = new RingBuffer<PoseData>(128);
nameOutputBuffer("topedge", topEdgeOutput_);

faceOutput_ = new RingBuffer<PoseData>(1024);
faceOutput_ = new RingBuffer<PoseData>(128);
nameOutputBuffer("face", faceOutput_);

orientationOutput_ = new RingBuffer<PoseData>(1024);
orientationOutput_ = new RingBuffer<PoseData>(128);
nameOutputBuffer("orientation", orientationOutput_);

// Create buffers for filter chain
Expand Down
4 changes: 2 additions & 2 deletions sensors/accelerometersensor/accelerometersensor.cpp
Expand Up @@ -45,9 +45,9 @@ AccelerometerSensorChannel::AccelerometerSensorChannel(const QString& id) :
isValid_ = true;
}

accelerometerReader_ = new BufferReader<AccelerationData>(1024);
accelerometerReader_ = new BufferReader<AccelerationData>(128);

outputBuffer_ = new RingBuffer<AccelerationData>(1024);
outputBuffer_ = new RingBuffer<AccelerationData>(128);

// Create buffers for filter chain
filterBin_ = new Bin;
Expand Down
4 changes: 2 additions & 2 deletions sensors/alssensor/alssensor.cpp
Expand Up @@ -49,9 +49,9 @@ ALSSensorChannel::ALSSensorChannel(const QString& id) :
alsAdaptor_ = sm.requestDeviceAdaptor("alsadaptor");
Q_ASSERT( alsAdaptor_ );

alsReader_ = new BufferReader<TimedUnsigned>(10);
alsReader_ = new BufferReader<TimedUnsigned>(32);

outputBuffer_ = new RingBuffer<TimedUnsigned>(1024);
outputBuffer_ = new RingBuffer<TimedUnsigned>(32);

// Create buffers for filter chain
filterBin_ = new Bin;
Expand Down
4 changes: 2 additions & 2 deletions sensors/compasssensor/compasssensor.cpp
Expand Up @@ -47,9 +47,9 @@ CompassSensorChannel::CompassSensorChannel(const QString& id) :
isValid_ = false;
}

inputReader_ = new BufferReader<CompassData>(10);
inputReader_ = new BufferReader<CompassData>(128);

outputBuffer_ = new RingBuffer<CompassData>(1024);
outputBuffer_ = new RingBuffer<CompassData>(128);

// Create buffers for filter chain
filterBin_ = new Bin;
Expand Down
4 changes: 2 additions & 2 deletions sensors/magnetometersensor/magnetometersensor.cpp
Expand Up @@ -47,7 +47,7 @@ MagnetometerSensorChannel::MagnetometerSensorChannel(const QString& id) :
isValid_ = false;
}

magnetometerReader_ = new BufferReader<CalibratedMagneticFieldData>(1024);
magnetometerReader_ = new BufferReader<CalibratedMagneticFieldData>(128);

scaleFilter_ = NULL;
scaleCoefficient_ = Config::configuration()->value("magnetometer_scale_coefficient", QVariant(300)).toInt();
Expand All @@ -61,7 +61,7 @@ MagnetometerSensorChannel::MagnetometerSensorChannel(const QString& id) :
}
}

outputBuffer_ = new RingBuffer<CalibratedMagneticFieldData>(1024);
outputBuffer_ = new RingBuffer<CalibratedMagneticFieldData>(128);

// Create buffers for filter chain
filterBin_ = new Bin;
Expand Down
4 changes: 2 additions & 2 deletions sensors/orientationsensor/orientationsensor.cpp
Expand Up @@ -46,9 +46,9 @@ OrientationSensorChannel::OrientationSensorChannel(const QString& id) :
}


orientationReader_ = new BufferReader<PoseData>(1024);
orientationReader_ = new BufferReader<PoseData>(128);

outputBuffer_ = new RingBuffer<PoseData>(1024);
outputBuffer_ = new RingBuffer<PoseData>(128);

// Create buffers for filter chain
filterBin_ = new Bin;
Expand Down
4 changes: 2 additions & 2 deletions sensors/proximitysensor/proximitysensor.cpp
Expand Up @@ -40,9 +40,9 @@ ProximitySensorChannel::ProximitySensorChannel(const QString& id) :
proximityAdaptor_ = sm.requestDeviceAdaptor("proximityadaptor");
Q_ASSERT( proximityAdaptor_ );

proximityReader_ = new BufferReader<TimedUnsigned>(10);
proximityReader_ = new BufferReader<TimedUnsigned>(16);

outputBuffer_ = new RingBuffer<TimedUnsigned>(1024);
outputBuffer_ = new RingBuffer<TimedUnsigned>(16);

// Create buffers for filter chain
filterBin_ = new Bin;
Expand Down
6 changes: 3 additions & 3 deletions sensors/rotationsensor/rotationsensor.cpp
Expand Up @@ -46,21 +46,21 @@ RotationSensorChannel::RotationSensorChannel(const QString& id) :
isValid_ = true;
}

accelerometerReader_ = new BufferReader<AccelerationData>(1024);
accelerometerReader_ = new BufferReader<AccelerationData>(128);

compassChain_ = sm.requestChain("compasschain");
if (compassChain_ && compassChain_->isValid()) {
hasZ_ = true;
} else {
sensordLogW() << "Unable to use compass for z-axis rotation.";
}
compassReader_ = new BufferReader<CompassData>(1024);
compassReader_ = new BufferReader<CompassData>(128);


rotationFilter_ = sm.instantiateFilter("rotationfilter");
Q_ASSERT(rotationFilter_);

outputBuffer_ = new RingBuffer<TimedXyzData>(1024);
outputBuffer_ = new RingBuffer<TimedXyzData>(128);

// Create buffers for filter chain
filterBin_ = new Bin;
Expand Down
4 changes: 2 additions & 2 deletions sensors/tapsensor/tapsensor.cpp
Expand Up @@ -39,9 +39,9 @@ TapSensorChannel::TapSensorChannel(const QString& id) :
tapAdaptor_ = sm.requestDeviceAdaptor("tapadaptor");
Q_ASSERT( tapAdaptor_ );

tapReader_ = new BufferReader<TapData>(10);
tapReader_ = new BufferReader<TapData>(128);

outputBuffer_ = new RingBuffer<TapData>(1024);
outputBuffer_ = new RingBuffer<TapData>(128);

// Create buffers for filter chain
filterBin_ = new Bin;
Expand Down

0 comments on commit bc3d32a

Please sign in to comment.