From 1cf2a401827dca5524b7fdbaafae31834f6bae28 Mon Sep 17 00:00:00 2001 From: Silvano Seva Date: Thu, 19 Nov 2020 18:24:28 +0100 Subject: [PATCH] Changed names of source files for MDx drivers to comply to new naming convention --- meson.build | 22 +++++++++---------- .../ADC/{ADC1_MDxx380.c => ADC1_MDx.c} | 2 +- .../ADC/{ADC1_MDxx380.h => ADC1_MDx.h} | 0 .../{HX83XX_MDxx380.c => HX83XX_MDx.c} | 0 .../{keyboard_MDxx380.c => keyboard_MDx.c} | 0 ...enerator_MDxx380.c => toneGenerator_MDx.c} | 2 +- ...enerator_MDxx380.h => toneGenerator_MDx.h} | 0 platform/targets/MD-380/platform.c | 2 +- platform/targets/MD-390/platform.c | 2 +- platform/targets/MD-UV380/platform.c | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) rename platform/drivers/ADC/{ADC1_MDxx380.c => ADC1_MDx.c} (99%) rename platform/drivers/ADC/{ADC1_MDxx380.h => ADC1_MDx.h} (100%) rename platform/drivers/display/{HX83XX_MDxx380.c => HX83XX_MDx.c} (100%) rename platform/drivers/keyboard/{keyboard_MDxx380.c => keyboard_MDx.c} (100%) rename platform/drivers/tones/{toneGenerator_MDxx380.c => toneGenerator_MDx.c} (99%) rename platform/drivers/tones/{toneGenerator_MDxx380.h => toneGenerator_MDx.h} (100%) diff --git a/meson.build b/meson.build index 588038f2..6d73855e 100644 --- a/meson.build +++ b/meson.build @@ -134,10 +134,10 @@ else endif ## TYT MD380 -md380_src = src + stm32f405_src + ['platform/drivers/display/HX83XX_MDxx380.c', - 'platform/drivers/keyboard/keyboard_MDxx380.c', - 'platform/drivers/ADC/ADC1_MDxx380.c', - 'platform/drivers/tones/toneGenerator_MDxx380.c', +md380_src = src + stm32f405_src + ['platform/drivers/display/HX83XX_MDx.c', + 'platform/drivers/keyboard/keyboard_MDx.c', + 'platform/drivers/ADC/ADC1_MDx.c', + 'platform/drivers/tones/toneGenerator_MDx.c', 'platform/targets/MD-380/platform.c', 'openrtx/src/graphics/graphics_rgb565.c'] @@ -146,10 +146,10 @@ md380_def = def + stm32f405_def ## TYT MD390 -md390_src = src + stm32f405_src + ['platform/drivers/display/HX83XX_MDxx380.c', - 'platform/drivers/keyboard/keyboard_MDxx380.c', - 'platform/drivers/ADC/ADC1_MDxx380.c', - 'platform/drivers/tones/toneGenerator_MDxx380.c', +md390_src = src + stm32f405_src + ['platform/drivers/display/HX83XX_MDx.c', + 'platform/drivers/keyboard/keyboard_MDx.c', + 'platform/drivers/ADC/ADC1_MDx.c', + 'platform/drivers/tones/toneGenerator_MDx.c', 'platform/targets/MD-390/platform.c', 'openrtx/src/graphics/graphics_rgb565.c'] @@ -159,9 +159,9 @@ md390_def = def + stm32f405_def ## TYT MD-UV380 -mduv380_src = src + stm32f405_src + ['platform/drivers/display/HX83XX_MDxx380.c', - 'platform/drivers/keyboard/keyboard_MDxx380.c', - 'platform/drivers/ADC/ADC1_MDxx380.c', +mduv380_src = src + stm32f405_src + ['platform/drivers/display/HX83XX_MDx.c', + 'platform/drivers/keyboard/keyboard_MDx.c', + 'platform/drivers/ADC/ADC1_MDx.c', 'platform/targets/MD-UV380/platform.c', 'openrtx/src/graphics/graphics_rgb565.c'] diff --git a/platform/drivers/ADC/ADC1_MDxx380.c b/platform/drivers/ADC/ADC1_MDx.c similarity index 99% rename from platform/drivers/ADC/ADC1_MDxx380.c rename to platform/drivers/ADC/ADC1_MDx.c index edf2f627..61d33265 100644 --- a/platform/drivers/ADC/ADC1_MDxx380.c +++ b/platform/drivers/ADC/ADC1_MDx.c @@ -17,7 +17,7 @@ #include #include "hwconfig.h" -#include "ADC1_MDxx380.h" +#include "ADC1_MDx.h" uint16_t measurements[4]; diff --git a/platform/drivers/ADC/ADC1_MDxx380.h b/platform/drivers/ADC/ADC1_MDx.h similarity index 100% rename from platform/drivers/ADC/ADC1_MDxx380.h rename to platform/drivers/ADC/ADC1_MDx.h diff --git a/platform/drivers/display/HX83XX_MDxx380.c b/platform/drivers/display/HX83XX_MDx.c similarity index 100% rename from platform/drivers/display/HX83XX_MDxx380.c rename to platform/drivers/display/HX83XX_MDx.c diff --git a/platform/drivers/keyboard/keyboard_MDxx380.c b/platform/drivers/keyboard/keyboard_MDx.c similarity index 100% rename from platform/drivers/keyboard/keyboard_MDxx380.c rename to platform/drivers/keyboard/keyboard_MDx.c diff --git a/platform/drivers/tones/toneGenerator_MDxx380.c b/platform/drivers/tones/toneGenerator_MDx.c similarity index 99% rename from platform/drivers/tones/toneGenerator_MDxx380.c rename to platform/drivers/tones/toneGenerator_MDx.c index fcb50c69..eecbb3be 100644 --- a/platform/drivers/tones/toneGenerator_MDxx380.c +++ b/platform/drivers/tones/toneGenerator_MDx.c @@ -18,7 +18,7 @@ * along with this program; if not, see * ***************************************************************************/ -#include "toneGenerator_MDxx380.h" +#include "toneGenerator_MDx.h" #include #include diff --git a/platform/drivers/tones/toneGenerator_MDxx380.h b/platform/drivers/tones/toneGenerator_MDx.h similarity index 100% rename from platform/drivers/tones/toneGenerator_MDxx380.h rename to platform/drivers/tones/toneGenerator_MDx.h diff --git a/platform/targets/MD-380/platform.c b/platform/targets/MD-380/platform.c index 48ef48d0..e5cda1ae 100644 --- a/platform/targets/MD-380/platform.c +++ b/platform/targets/MD-380/platform.c @@ -20,7 +20,7 @@ #include #include #include "hwconfig.h" -#include "ADC1_MDxx380.h" +#include "ADC1_MDx.h" void platform_init() { diff --git a/platform/targets/MD-390/platform.c b/platform/targets/MD-390/platform.c index 48ef48d0..e5cda1ae 100644 --- a/platform/targets/MD-390/platform.c +++ b/platform/targets/MD-390/platform.c @@ -20,7 +20,7 @@ #include #include #include "hwconfig.h" -#include "ADC1_MDxx380.h" +#include "ADC1_MDx.h" void platform_init() { diff --git a/platform/targets/MD-UV380/platform.c b/platform/targets/MD-UV380/platform.c index 939f2de4..72ec8808 100644 --- a/platform/targets/MD-UV380/platform.c +++ b/platform/targets/MD-UV380/platform.c @@ -21,7 +21,7 @@ #include #include #include "hwconfig.h" -#include "ADC1_MDxx380.h" +#include "ADC1_MDx.h" #ifdef ENABLE_BKLIGHT_DIMMING void TIM1_TRG_COM_TIM11_IRQHandler()