From aaf6d7963314c1fcb86b84442cd3d960bc87297b Mon Sep 17 00:00:00 2001
From: lonkaars <loek@pipeframe.xyz>
Date: Tue, 10 May 2022 13:20:42 +0200
Subject: added clang-tidy to make format

---
 client/makefile | 1 +
 robot/consts.h  | 4 ++--
 robot/makefile  | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/makefile b/client/makefile
index dcba6f3..23d5ce6 100644
--- a/client/makefile
+++ b/client/makefile
@@ -21,6 +21,7 @@ clean:
 
 format:
 	clang-format -i $(SOURCES) $(HEADERS)
+	clang-tidy --fix-errors $(SOURCES) $(HEADERS)
 
 compile_commands: clean
 	bear -- make
diff --git a/robot/consts.h b/robot/consts.h
index 6530528..1195422 100644
--- a/robot/consts.h
+++ b/robot/consts.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#ifndef BUILD_STR
+#ifndef W2_BUILD_STR
 // should be defined with -DBUILD_STR in makefile
-#define BUILD_STR ("????????")
+#define W2_BUILD_STR ("????????")
 #endif
 
 #define W2_MAX_MODULE_CYCLE_MS (20)
diff --git a/robot/makefile b/robot/makefile
index 8ddcb28..598e0fa 100644
--- a/robot/makefile
+++ b/robot/makefile
@@ -19,7 +19,7 @@ CC=avr-gcc
 OBJ2HEX=avr-objcopy
 
 BUILD_STR=$(shell git update-index -q --refresh; git describe --tags --dirty='*' --broken='x' | cut -c1-20)
-CFLAGS += -DBUILD_STR="$(BUILD_STR)"
+CFLAGS += -DW2_BUILD_STR="$(BUILD_STR)"
 
 all: out.hex
 
@@ -41,6 +41,7 @@ flash: out.hex
 
 format:
 	clang-format -i $(SOURCES) $(HEADERS)
+	clang-tidy --fix-errors $(SOURCES) $(HEADERS)
 
 compile_commands: clean
 	bear -- make
-- 
cgit v1.2.3