Merge pull request #4 from ElectronicCats/dev

Release v1.1.0.0
ElectronicCats · Aug 1, 2024 · f679a77 · f679a77
2 parents 914ffb2 + 931c058
commit f679a77
Show file tree

Hide file tree

Showing 3,619 changed files with 919,917 additions and 21,083 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,16 @@
+---
+# options: https://clang.llvm.org/docs/ClangFormatStyleOptions.html
+BasedOnStyle: chromium
+IndentWidth: 2
+# Must be 80 characters or less!
+# ColumnLimit: 80
+# does (int) x instead of (int)x
+SpaceAfterCStyleCast: true
+# spaces, not tabs!
+UseTab: Never
+# 
+AlignTrailingComments: true
+#  #define SHORT_NAME       42
+#  #define LONGER_NAME      0x007f   # does nice spacing for macros
+AlignConsecutiveMacros: Consecutive
+IndentPPDirectives: BeforeHash
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ _autosave-*
 *-save.pro
 *-save.kicad_pcb
 fp-info-cache
+hardware/**/~*.lck
 
 # Netlist files (exported from Eeschema)
 *.net
@@ -34,9 +35,17 @@ hardware/minino-backups/
 # Firmware binaries
 /**/build/
 /**/managed_components/
+/**/build_files/
+/**/build_files.tgz
+/**/build_files.zip
+
+# IDF sdkconfig
+/**/sdkconfig
+/**/sdkconfig.old
+/**/dependencies.lock
 
 # CPL file in csv
 minino-all-pos.csv
 
 # Gerber
-/**/MININO_GERBER
+/**/MININO_GERBER
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -10,9 +10,11 @@ repos:
     -   id: clang-format
         types_or: [c++, c]
         args: ['--style=file']
+        exclude: ^firmware/components/openthread
 -   repo: https://github.com/compilerla/conventional-pre-commit
     rev: v3.2.0
     hooks:
     -   id: conventional-pre-commit
         stages: [commit-msg]
-        args: []
+        args: []
+        exclude: ^firmware/components/openthread
diff --git a/examples/Arduino/Menu/DetectAirTags.h b/examples/Arduino/Menu/DetectAirTags.h
diff --git a/examples/Arduino/Menu/DetectAirTags.ino b/examples/Arduino/Menu/DetectAirTags.ino
diff --git a/examples/Arduino/Menu/Keyboard.cpp b/examples/Arduino/Menu/Keyboard.cpp
diff --git a/examples/Arduino/Menu/Keyboard.h b/examples/Arduino/Menu/Keyboard.h
diff --git a/examples/Arduino/Menu/Layer.h b/examples/Arduino/Menu/Layer.h
diff --git a/examples/Arduino/Menu/Makefile b/examples/Arduino/Menu/Makefile
diff --git a/examples/Arduino/Menu/Menu.ino b/examples/Arduino/Menu/Menu.ino