Add: インクルードガードを追加

yushin-ito · Dec 4, 2023 · a4e5382 · a4e5382
1 parent 0543085
commit a4e5382
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 37 deletions.
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "M5Battery",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "An M5Stack library for displaying battery charge.",
   "keywords": "esp32, m5stack, m5stickc, m5stickc-plus",
   "repository": {

diff --git a/src/M5Battery.cpp b/src/M5Battery.cpp
@@ -1,6 +1,6 @@
 #include "M5Battery.h"
 
-TaskHandle_t drawTaskHandle;
+static TaskHandle_t drawTaskHandle;
 
 Context::Context(M5Battery* bat) {
     _bat = bat;
@@ -10,7 +10,7 @@ M5Battery* Context::getBattery() {
     return _bat;
 }
 
-void drawLoop(void* args) {
+static void drawLoop(void* args) {
     Context* ctx = reinterpret_cast<Context*>(args);
     M5Battery* bat = ctx->getBattery();
 

diff --git a/src/M5Battery.h b/src/M5Battery.h
@@ -1,3 +1,5 @@
+#ifndef M5Battery_H
+#define M5Battery_H
 #include <M5Unified.h>
 
 class M5Battery {
@@ -21,7 +23,7 @@ class M5Battery {
 
 public:
   M5Battery();
-  void setPosition(int32_t x, int32_t y);  
+  void setPosition(int32_t x, int32_t y);
   void setRotation(uint8_t rotation);
   void setSize(size_t size);
   void setBgColor(uint32_t color);
@@ -38,11 +40,17 @@ class M5Battery {
   bool isCharging();
 };
 
+#endif // M5Battery_H
+
+#ifndef CONTEXT_H
+#define CONTEXT_H
+
 class Context {
 private:
   M5Battery* _bat;
 
 public:
   Context(M5Battery* bat);
   M5Battery* getBattery();
-};
+};
+#endif // CONTEXT_H
diff --git a/src/main.cpp b/src/main.cpp