From ba5864dbaf16c74ff769aff3f36214534ee5d98a Mon Sep 17 00:00:00 2001 From: Luca Erbetta <luca.erbetta105@gmail.com> Date: Mon, 1 Apr 2019 21:55:53 +0200 Subject: [PATCH] Final config --- src/boards/HeliTest/config.h | 6 +++--- src/shared/SharedConfig.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/boards/HeliTest/config.h b/src/boards/HeliTest/config.h index 825cb47..0c87b6b 100644 --- a/src/boards/HeliTest/config.h +++ b/src/boards/HeliTest/config.h @@ -35,7 +35,7 @@ namespace RogallinaBoard /* CUTTER */ static const PWMChannel CUTTER_PWM_CHANNEL = PWMChannel::CH2; static const int CUTTER_PWM_FREQ = 450; -static const float CUTTER_PWM_DUTY = 0.25; +static const float CUTTER_PWM_DUTY = 0.07; static const int CUTTER_PWM_DUTY_RESOLUTION = 1024; static const PWM::Timer CUTTER_TIM{ @@ -51,7 +51,7 @@ using CUTTER_CSENSE = miosix::Gpio<GPIOC_BASE, 4>; */ // Time from pin detachment to cutter activation in ms -static const unsigned int FREEFALL_TIME_MS = 3*1000; +static const unsigned int FREEFALL_TIME_MS = 2.9*1000; static const unsigned int TIMEOUT_STOP_CUTTING = 15*1000; static const unsigned int BRIDGE_DISCHARGE_TIME_MS = 30; @@ -69,6 +69,6 @@ static constexpr unsigned char DETACHMENT_PIN_NUM = pin1_num; static const PinObserver::Transition DETACHMENT_PIN_TRANSITION = PinObserver::Transition::RISING_EDGE; -static constexpr unsigned int DETACHMENT_PIN_THRESHOLD = 3; +static constexpr unsigned int DETACHMENT_PIN_THRESHOLD = 5; } // namespace RogallinaBoard \ No newline at end of file diff --git a/src/shared/SharedConfig.h b/src/shared/SharedConfig.h index d178856..26bf02c 100644 --- a/src/shared/SharedConfig.h +++ b/src/shared/SharedConfig.h @@ -36,8 +36,8 @@ // These must not be enabled if not in DEBUG mode #ifdef DEBUG -// #define IGNORE_LOGGER_NOT_WORKING -// #define IGNORE_SENSORS_NOT_WORKING +// #define IGNORE_LOGGER_NOT_WORKING +// #define IGNORE_SENSORS_NOT_WORKING #endif //#define ENABLE_CALIBRATION @@ -46,7 +46,7 @@ */ static const int IMU_SAMPLE_RATE = 150; static const int GPS_SAMPLE_RATE = 5; -static const int PRESS_SAMPLE_RATE = 50; +static const int PRESS_SAMPLE_RATE = 20; static constexpr int ADC_SAMPLE_RATE = 20; -- GitLab