From b7a28b0d7aa2ce29c8ed39722a133379844e796d Mon Sep 17 00:00:00 2001 From: GOB Date: Tue, 20 Aug 2024 23:27:32 +0900 Subject: [PATCH] Rename headers --- examples/UnitUnified/Ameter/Ameter.cpp | 3 ++- examples/UnitUnified/Vmeter/Vmeter.cpp | 2 +- src/{M5UnitMETER.h => M5UnitUnifiedMETER.h} | 8 ++++---- src/{M5UnitMETER.hpp => M5UnitUnifiedMETER.hpp} | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) rename src/{M5UnitMETER.h => M5UnitUnifiedMETER.h} (64%) rename src/{M5UnitMETER.hpp => M5UnitUnifiedMETER.hpp} (82%) diff --git a/examples/UnitUnified/Ameter/Ameter.cpp b/examples/UnitUnified/Ameter/Ameter.cpp index c542b4e..99ed440 100644 --- a/examples/UnitUnified/Ameter/Ameter.cpp +++ b/examples/UnitUnified/Ameter/Ameter.cpp @@ -11,10 +11,11 @@ #include #include -#include +#include #if !defined(USING_M5HAL) #include #endif +#include using namespace m5::unit::ads111x; diff --git a/examples/UnitUnified/Vmeter/Vmeter.cpp b/examples/UnitUnified/Vmeter/Vmeter.cpp index b7a91e2..5dfdbd5 100644 --- a/examples/UnitUnified/Vmeter/Vmeter.cpp +++ b/examples/UnitUnified/Vmeter/Vmeter.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #if !defined(USING_M5HAL) #include #endif diff --git a/src/M5UnitMETER.h b/src/M5UnitUnifiedMETER.h similarity index 64% rename from src/M5UnitMETER.h rename to src/M5UnitUnifiedMETER.h index 0024cc9..9b2eedf 100644 --- a/src/M5UnitMETER.h +++ b/src/M5UnitUnifiedMETER.h @@ -4,12 +4,12 @@ * SPDX-License-Identifier: MIT */ /*! - @file M5UnitMETER.h + @file M5UnitUnifiedMETER.h */ -#ifndef M5_UNIT_METER_H -#define M5_UNIT_METER_H +#ifndef M5_UNIT_UNIFIED_METER_H +#define M5_UNIT_UNIFIED_METER_H #ifdef __cplusplus -#include "M5UnitMETER.hpp" +#include "M5UnitUnifiedMETER.hpp" #else #error M5UnitMETER requires a C++ compiler, please change file extension to .cc or .cpp #endif diff --git a/src/M5UnitMETER.hpp b/src/M5UnitUnifiedMETER.hpp similarity index 82% rename from src/M5UnitMETER.hpp rename to src/M5UnitUnifiedMETER.hpp index 8d32b37..5061f80 100644 --- a/src/M5UnitMETER.hpp +++ b/src/M5UnitUnifiedMETER.hpp @@ -4,14 +4,14 @@ * SPDX-License-Identifier: MIT */ /*! - @file M5UnitMETER.hpp + @file M5UnitUnifiedMETER.hpp @brief Main header of M5UnitMETER @mainpage M5UnitMETER Library for UnitMETER using M5UnitUnified. */ -#ifndef M5_UNIT_METER_HPP -#define M5_UNIT_METER_HPP +#ifndef M5_UNIT_UNIFIED_METER_HPP +#define M5_UNIT_UNIFIED_METER_HPP #include "unit/unit_Ameter.hpp" #include "unit/unit_Vmeter.hpp"