From 05b68927cdf89743fdd00ba318dcdc679dcdd954 Mon Sep 17 00:00:00 2001 From: "DESKTOP-9KCKBM4\\pff" Date: Sun, 25 Feb 2018 17:15:12 +0200 Subject: [PATCH 1/3] fix Blackbox logging rate over 8kHz #415 --- src/js/tabs/onboard_logging.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/tabs/onboard_logging.js b/src/js/tabs/onboard_logging.js index 848afd2b..ba239775 100644 --- a/src/js/tabs/onboard_logging.js +++ b/src/js/tabs/onboard_logging.js @@ -180,7 +180,7 @@ TABS.onboard_logging.initialize = function (callback) { // Offer a reasonable choice of logging rates (if people want weird steps they can use CLI) var loggingRates = []; - var pidRate = 8000 / PID_ADVANCED_CONFIG.gyro_sync_denom / PID_ADVANCED_CONFIG.pid_process_denom; + var pidRate = 32000 / PID_ADVANCED_CONFIG.gyro_sync_denom / PID_ADVANCED_CONFIG.pid_process_denom; if (semver.gte(CONFIG.apiVersion, "1.36.0")) { loggingRates = [ From d5a55fc3d8fa24b42cf8b24030de0bcd93af64d0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-9KCKBM4\\pff" Date: Mon, 26 Feb 2018 08:14:58 +0200 Subject: [PATCH 2/3] check gyro32 flag to set pidratebase value --- src/js/tabs/onboard_logging.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/js/tabs/onboard_logging.js b/src/js/tabs/onboard_logging.js index ba239775..c1f70b00 100644 --- a/src/js/tabs/onboard_logging.js +++ b/src/js/tabs/onboard_logging.js @@ -180,7 +180,12 @@ TABS.onboard_logging.initialize = function (callback) { // Offer a reasonable choice of logging rates (if people want weird steps they can use CLI) var loggingRates = []; - var pidRate = 32000 / PID_ADVANCED_CONFIG.gyro_sync_denom / PID_ADVANCED_CONFIG.pid_process_denom; + var pidRateBase = 8000; + + if (PID_ADVANCED_CONFIG.gyroUse32kHz !== 0) pidRateBase = 32000; + + var pidRate = pidRateBase / PID_ADVANCED_CONFIG.gyro_sync_denom / + PID_ADVANCED_CONFIG.pid_process_denom; if (semver.gte(CONFIG.apiVersion, "1.36.0")) { loggingRates = [ From 188a19dc8acbd8d3c27501e9414f109d966b4bd9 Mon Sep 17 00:00:00 2001 From: "DESKTOP-9KCKBM4\\pff" Date: Mon, 26 Feb 2018 09:53:55 +0200 Subject: [PATCH 3/3] fix style --- src/js/tabs/onboard_logging.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js/tabs/onboard_logging.js b/src/js/tabs/onboard_logging.js index c1f70b00..c8ead739 100644 --- a/src/js/tabs/onboard_logging.js +++ b/src/js/tabs/onboard_logging.js @@ -182,7 +182,9 @@ TABS.onboard_logging.initialize = function (callback) { var loggingRates = []; var pidRateBase = 8000; - if (PID_ADVANCED_CONFIG.gyroUse32kHz !== 0) pidRateBase = 32000; + if (PID_ADVANCED_CONFIG.gyroUse32kHz !== 0) { + pidRateBase = 32000; + } var pidRate = pidRateBase / PID_ADVANCED_CONFIG.gyro_sync_denom / PID_ADVANCED_CONFIG.pid_process_denom;