From 56cd730ad4f70ffdd9ca143ca0d77cf48345cfc0 Mon Sep 17 00:00:00 2001 From: Magnus Persson Date: Fri, 29 Apr 2022 06:56:38 +0200 Subject: [PATCH] Removed gyro delay from api --- src/config.cpp | 6 +++--- src/resources.hpp | 2 +- src/webserver.cpp | 8 ++++---- test/adv.json | 1 - 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/config.cpp b/src/config.cpp index 6164e39..eed1152 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -379,7 +379,7 @@ bool AdvancedConfig::saveFile() { DynamicJsonDocument doc(512); doc[PARAM_HW_GYRO_READ_COUNT] = this->getGyroReadCount(); - doc[PARAM_HW_GYRO_READ_DELAY] = this->getGyroReadDelay(); + // doc[PARAM_HW_GYRO_READ_DELAY] = this->getGyroReadDelay(); doc[PARAM_HW_GYRO_MOVING_THREASHOLD] = this->getGyroSensorMovingThreashold(); doc[PARAM_HW_FORMULA_DEVIATION] = this->getMaxFormulaCreationDeviation(); doc[PARAM_HW_WIFI_PORTAL_TIMEOUT] = this->getWifiPortalTimeout(); @@ -449,8 +449,8 @@ bool AdvancedConfig::loadFile() { if (!doc[PARAM_HW_GYRO_READ_COUNT].isNull()) this->setGyroReadCount(doc[PARAM_HW_GYRO_READ_COUNT].as()); - if (!doc[PARAM_HW_GYRO_READ_DELAY].isNull()) - this->setGyroReadDelay(doc[PARAM_HW_GYRO_READ_DELAY].as()); + // if (!doc[PARAM_HW_GYRO_READ_DELAY].isNull()) + // this->setGyroReadDelay(doc[PARAM_HW_GYRO_READ_DELAY].as()); if (!doc[PARAM_HW_GYRO_MOVING_THREASHOLD].isNull()) this->setGyroSensorMovingThreashold( doc[PARAM_HW_GYRO_MOVING_THREASHOLD].as()); diff --git a/src/resources.hpp b/src/resources.hpp index f8ccb8a..65fdc52 100644 --- a/src/resources.hpp +++ b/src/resources.hpp @@ -77,7 +77,7 @@ SOFTWARE. #define PARAM_PLATFORM "platform" #define PARAM_BLE "ble" #define PARAM_HW_GYRO_READ_COUNT "gyro-read-count" -#define PARAM_HW_GYRO_READ_DELAY "gyro-read-delay" +// #define PARAM_HW_GYRO_READ_DELAY "gyro-read-delay" #define PARAM_HW_GYRO_MOVING_THREASHOLD "gyro-moving-threashold" #define PARAM_HW_FORMULA_DEVIATION "formula-max-deviation" #define PARAM_HW_FORMULA_CALIBRATION_TEMP "formula-calibration-temp" diff --git a/src/webserver.cpp b/src/webserver.cpp index b5e4def..0affbf5 100644 --- a/src/webserver.cpp +++ b/src/webserver.cpp @@ -647,9 +647,9 @@ void WebServerHandler::webHandleConfigAdvancedWrite() { if (_server->hasArg(PARAM_HW_GYRO_READ_COUNT)) myAdvancedConfig.setGyroReadCount( _server->arg(PARAM_HW_GYRO_READ_COUNT).toInt()); - if (_server->hasArg(PARAM_HW_GYRO_READ_DELAY)) - myAdvancedConfig.setGyroReadDelay( - _server->arg(PARAM_HW_GYRO_READ_DELAY).toInt()); + // if (_server->hasArg(PARAM_HW_GYRO_READ_DELAY)) + // myAdvancedConfig.setGyroReadDelay( + // _server->arg(PARAM_HW_GYRO_READ_DELAY).toInt()); if (_server->hasArg(PARAM_HW_GYRO_MOVING_THREASHOLD)) myAdvancedConfig.setGyroSensorMovingThreashold( _server->arg(PARAM_HW_GYRO_MOVING_THREASHOLD).toInt()); @@ -700,7 +700,7 @@ void WebServerHandler::webHandleConfigAdvancedRead() { DynamicJsonDocument doc(512); doc[PARAM_HW_GYRO_READ_COUNT] = myAdvancedConfig.getGyroReadCount(); - doc[PARAM_HW_GYRO_READ_DELAY] = myAdvancedConfig.getGyroReadDelay(); + // doc[PARAM_HW_GYRO_READ_DELAY] = myAdvancedConfig.getGyroReadDelay(); doc[PARAM_HW_GYRO_MOVING_THREASHOLD] = myAdvancedConfig.getGyroSensorMovingThreashold(); doc[PARAM_HW_FORMULA_DEVIATION] = diff --git a/test/adv.json b/test/adv.json index dfda261..160ecf2 100644 --- a/test/adv.json +++ b/test/adv.json @@ -1,6 +1,5 @@ { "gyro-read-count": 51, - "gyro-read-delay": 3151, "gyro-moving-threashold": 501, "formula-max-deviation": 1.7, "wifi-portal-timeout": 121,