Brewery/gravitymon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unused code

Browse Source
This commit is contained in:
Magnus Persson 2022-01-08 23:42:44 +01:00
parent 4731569b75
commit 3b3ee5bbf9
6 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/config.cpp
View File

@ -74,8 +74,6 @@ void Config::createJson(DynamicJsonDocument& doc) {
doc[CFG_PARAM_PUSH_INFLUXDB2_BUCKET] = getInfluxDb2PushBucket();
doc[CFG_PARAM_PUSH_INFLUXDB2_AUTH] = getInfluxDb2PushToken();
doc[CFG_PARAM_SLEEP_INTERVAL] = getSleepInterval();
// doc[ CFG_PARAM_PUSH_INTERVAL ] = getSleepInterval(); //
// TODO: @deprecated
doc[CFG_PARAM_VOLTAGEFACTOR] = getVoltageFactor();
doc[CFG_PARAM_GRAVITY_FORMULA] = getGravityFormula();
doc[CFG_PARAM_GRAVITY_FORMAT] = String(getGravityFormat());
@ -209,9 +207,6 @@ bool Config::loadFile() {
setInfluxDb2PushToken(doc[CFG_PARAM_PUSH_INFLUXDB2_AUTH]);
if (!doc[CFG_PARAM_SLEEP_INTERVAL].isNull())
setSleepInterval(doc[CFG_PARAM_SLEEP_INTERVAL].as<int>());
if (!doc[CFG_PARAM_PUSH_INTERVAL].isNull()) // TODO: @deprecated
setSleepInterval(
doc[CFG_PARAM_PUSH_INTERVAL].as<int>()); // TODO: @deprecated
if (!doc[CFG_PARAM_VOLTAGEFACTOR].isNull())
setVoltageFactor(doc[CFG_PARAM_VOLTAGEFACTOR].as<float>());
if (!doc[CFG_PARAM_GRAVITY_FORMULA].isNull())
@ -314,10 +309,6 @@ void Config::debug() {
Log.verbose(F("CFG : InfluxDb2; '%s', '%s', '%s', '%s'." CR),
getInfluxDb2PushUrl(), getInfluxDb2PushOrg(),
getInfluxDb2PushBucket(), getInfluxDb2PushToken());
// Log.verbose(F("CFG : Accel offset\t%d\t%d\t%d" CR), gyroCalibration.ax,
// gyroCalibration.ay, gyroCalibration.az ); Log.verbose(F("CFG : Gyro offset
// \t%d\t%d\t%d" CR), gyroCalibration.gx, gyroCalibration.gy,
// gyroCalibration.gz );
#endif
}

2
src/config.hpp
View File

@ -58,8 +58,6 @@ SOFTWARE.
#define CFG_PARAM_PUSH_INFLUXDB2_BUCKET "influxdb2-bucket" // URL
#define CFG_PARAM_PUSH_INFLUXDB2_AUTH "influxdb2-auth" // URL
#define CFG_PARAM_SLEEP_INTERVAL "sleep-interval" // Sleep interval
// TODO: @deprecated setting
#define CFG_PARAM_PUSH_INTERVAL "push-interval" // Time between push
#define CFG_PARAM_TEMPFORMAT "temp-format" // C or F
#define CFG_PARAM_VOLTAGEFACTOR \
"voltage-factor" // Factor to calculate the battery voltage

13
src/gyro.cpp
View File

@ -58,9 +58,6 @@ bool GyroSensor::setup() {
// Configure the sensor
accelgyro.setTempSensorEnabled(true);
// accelgyro.setFullScaleAccelRange(MPU6050_ACCEL_FS_2); // Set in
// .initalize() accelgyro.setFullScaleGyroRange(MPU6050_GYRO_FS_250); //
// Set in .initalize()
accelgyro.setDLPFMode(MPU6050_DLPF_BW_5);
#if defined(GYRO_USE_INTERRUPT)
// Alternative method to read data, let the MPU signal when sampling is
@ -110,7 +107,6 @@ void GyroSensor::readSensor(RawGyroData &raw, const int noIterations,
// Set some initial values
#if defined(GYRO_SHOW_MINMAX)
RawGyroData min, max;
// accelgyro.getRotation( &min.gx, &min.gy, &min.gz );
accelgyro.getAcceleration(&min.ax, &min.ay, &min.az);
min.temp = accelgyro.getTemperature();
max = min;
@ -122,8 +118,6 @@ void GyroSensor::readSensor(RawGyroData &raw, const int noIterations,
}
#endif
// accelgyro.getRotation( &raw.gx, &raw.gy, &raw.gz );
// accelgyro.getAcceleration( &raw.ax, &raw.ay, &raw.az );
accelgyro.getMotion6(&raw.ax, &raw.ay, &raw.az, &raw.gx, &raw.gy, &raw.gz);
raw.temp = accelgyro.getTemperature();
@ -205,10 +199,6 @@ float GyroSensor::calculateAngle(RawGyroData &raw) {
// Source: https://www.nxp.com/docs/en/application-note/AN3461.pdf
float v = (acos(ay / sqrt(ax * ax + ay * ay + az * az)) * 180.0 / PI);
// Log.notice(F("GYRO: angle = %F." CR), v );
// double v = (acos( raw.az / sqrt( raw.ax*raw.ax + raw.ay*raw.ay +
// raw.az*raw.az ) ) *180.0 / PI); Log.notice(F("GYRO: angle = %F." CR), v );
#if LOG_LEVEL == 6 && !defined(GYRO_DISABLE_LOGGING)
Log.verbose(F("GYRO: angle = %F." CR), v);
#endif
@ -360,9 +350,6 @@ void GyroSensor::debug() {
Log.verbose(F("GYRO: Debug - Rate %d." CR), accelgyro.getRate());
Log.verbose(F("GYRO: Debug - Gyro range %d." CR),
accelgyro.getFullScaleGyroRange());
// Log.verbose(F("GYRO: Debug - I2C bypass %s." CR),
// accelgyro.getI2CBypassEnabled()?"on":"off" ); Log.verbose(F("GYRO: Debug -
// I2C master %s." CR), accelgyro.getI2CMasterModeEnabled()?"on":"off" );
Log.verbose(F("GYRO: Debug - Acc FactX %d." CR),
accelgyro.getAccelXSelfTestFactoryTrim());
Log.verbose(F("GYRO: Debug - Acc FactY %d." CR),

2
src/helper.cpp
View File

@ -166,8 +166,6 @@ void PerfLogging::print() {
PerfEntry* pe = first;
while (pe != 0) {
// Log.notice( F("PERF: %s=%l ms (%l, %l)" CR), pe->key, (pe->end -
// pe->start), pe->start, pe->end );
Log.notice(F("PERF: %s %ums" CR), pe->key, pe->max);
pe = pe->next;
}

1
src/main.cpp
View File

@ -89,7 +89,6 @@ void checkSleepMode(float angle, float volt) {
: true;
// sleep mode active when flat
// sleepModeActive = ( angle<85 && angle>5 ) ? true : false;
Log.notice(F("MAIN: Deep sleep mode %s (angle=%F volt=%F)." CR),
sleepModeActive ? "true" : "false", angle, volt);
}

7
src/tempsensor.cpp
View File

@ -96,9 +96,8 @@ float TempSensor::getValue() {
#if defined(USE_GYRO_TEMP)
// When using the gyro temperature only the first read value will be accurate
// so we will use this for processing. LOG_PERF_START("temp-get");
// so we will use this for processing.
float c = myGyro.getInitialSensorTempC();
// LOG_PERF_STOP("temp-get");
hasSensor = true;
return c;
#if LOG_LEVEL == 6 && !defined(TSEN_DISABLE_LOGGING)
@ -112,16 +111,12 @@ float TempSensor::getValue() {
}
// Read the sensors
// LOG_PERF_START("temp-request");
mySensors.requestTemperatures();
// LOG_PERF_STOP("temp-request");
float c = 0;
if (mySensors.getDS18Count() >= 1) {
// LOG_PERF_START("temp-get");
c = mySensors.getTempCByIndex(0);
// LOG_PERF_STOP("temp-get");
#if LOG_LEVEL == 6 && !defined(TSEN_DISABLE_LOGGING)
Log.verbose(F("TSEN: Reciving temp value for sensor %F C." CR), c);