From bbb909a041a23fa81d31e9e0e43aa76d0b6f5034 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Mon, 11 Oct 2021 20:43:08 -0400 Subject: [PATCH] refactoring --- .../boards/hellen/hellen-nb1/knock_config.h | 17 +---------------- .../hellen/hellen121nissan/knock_config.h | 17 +---------------- .../boards/hellen/hellen128/knock_config.h | 17 +---------------- .../config/boards/hellen/hellen_knock_config.h | 16 ++++++++++++++++ 4 files changed, 19 insertions(+), 48 deletions(-) create mode 100644 firmware/config/boards/hellen/hellen_knock_config.h diff --git a/firmware/config/boards/hellen/hellen-nb1/knock_config.h b/firmware/config/boards/hellen/hellen-nb1/knock_config.h index be15db88b1..c885793985 100644 --- a/firmware/config/boards/hellen/hellen-nb1/knock_config.h +++ b/firmware/config/boards/hellen/hellen-nb1/knock_config.h @@ -1,16 +1 @@ -/** - * @file knock_config.h - */ - -#pragma once - -// Knock is on ADC3 -#define KNOCK_ADC ADCD3 - -// knock 1 - pin PF7 -#define KNOCK_ADC_CH1 ADC_CHANNEL_IN5 -#define KNOCK_PIN_CH1 GPIOF_7 - -// Sample rate & time - depends on the exact MCU -#define KNOCK_SAMPLE_TIME ADC_SAMPLE_84 -#define KNOCK_SAMPLE_RATE (STM32_PCLK2 / (4 * (84 + 12))) +#include "hellen_knock_config.h" \ No newline at end of file diff --git a/firmware/config/boards/hellen/hellen121nissan/knock_config.h b/firmware/config/boards/hellen/hellen121nissan/knock_config.h index be15db88b1..c885793985 100644 --- a/firmware/config/boards/hellen/hellen121nissan/knock_config.h +++ b/firmware/config/boards/hellen/hellen121nissan/knock_config.h @@ -1,16 +1 @@ -/** - * @file knock_config.h - */ - -#pragma once - -// Knock is on ADC3 -#define KNOCK_ADC ADCD3 - -// knock 1 - pin PF7 -#define KNOCK_ADC_CH1 ADC_CHANNEL_IN5 -#define KNOCK_PIN_CH1 GPIOF_7 - -// Sample rate & time - depends on the exact MCU -#define KNOCK_SAMPLE_TIME ADC_SAMPLE_84 -#define KNOCK_SAMPLE_RATE (STM32_PCLK2 / (4 * (84 + 12))) +#include "hellen_knock_config.h" \ No newline at end of file diff --git a/firmware/config/boards/hellen/hellen128/knock_config.h b/firmware/config/boards/hellen/hellen128/knock_config.h index be15db88b1..c885793985 100644 --- a/firmware/config/boards/hellen/hellen128/knock_config.h +++ b/firmware/config/boards/hellen/hellen128/knock_config.h @@ -1,16 +1 @@ -/** - * @file knock_config.h - */ - -#pragma once - -// Knock is on ADC3 -#define KNOCK_ADC ADCD3 - -// knock 1 - pin PF7 -#define KNOCK_ADC_CH1 ADC_CHANNEL_IN5 -#define KNOCK_PIN_CH1 GPIOF_7 - -// Sample rate & time - depends on the exact MCU -#define KNOCK_SAMPLE_TIME ADC_SAMPLE_84 -#define KNOCK_SAMPLE_RATE (STM32_PCLK2 / (4 * (84 + 12))) +#include "hellen_knock_config.h" \ No newline at end of file diff --git a/firmware/config/boards/hellen/hellen_knock_config.h b/firmware/config/boards/hellen/hellen_knock_config.h new file mode 100644 index 0000000000..242e11fe18 --- /dev/null +++ b/firmware/config/boards/hellen/hellen_knock_config.h @@ -0,0 +1,16 @@ +/** + * @file hellen_knock_config.h + */ + +#pragma once + +// Knock is on ADC3 +#define KNOCK_ADC ADCD3 + +// knock 1 - pin PF7 +#define KNOCK_ADC_CH1 ADC_CHANNEL_IN5 +#define KNOCK_PIN_CH1 GPIOF_7 + +// Sample rate & time - depends on the exact MCU +#define KNOCK_SAMPLE_TIME ADC_SAMPLE_84 +#define KNOCK_SAMPLE_RATE (STM32_PCLK2 / (4 * (84 + 12)))