From 11c102715ea7ea827c23dae84e4da5445ce3a8b8 Mon Sep 17 00:00:00 2001
From: ShigemoriHakura <62388797+ShigemoriHakura@users.noreply.github.com>
Date: Sat, 22 Apr 2023 14:33:10 +0800
Subject: [PATCH] for vscode makefile and pyinstaller gitignore

---
 .../nrf52_sdk/components/toolchain/gcc/Makefile.common    | 2 +-
 firmware/nrf52_sdk/integration/nrfx/nrfx_config.h         | 2 +-
 software/.gitignore                                       | 3 ++-
 software/script/chameleon_cli_unit.py                     | 8 ++++----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/firmware/nrf52_sdk/components/toolchain/gcc/Makefile.common b/firmware/nrf52_sdk/components/toolchain/gcc/Makefile.common
index 773c2b9..e3c4935 100644
--- a/firmware/nrf52_sdk/components/toolchain/gcc/Makefile.common
+++ b/firmware/nrf52_sdk/components/toolchain/gcc/Makefile.common
@@ -251,7 +251,7 @@ all: $(TARGETS)
 
 # Create build directories
 $(OUTPUT_DIRECTORY):
-	$(MK) $@
+#	$(MK) -p $@ 
 $(OUTPUT_DIRECTORY)/%/.: | $(OUTPUT_DIRECTORY)
 	cd $(OUTPUT_DIRECTORY) && $(MK) $*
 
diff --git a/firmware/nrf52_sdk/integration/nrfx/nrfx_config.h b/firmware/nrf52_sdk/integration/nrfx/nrfx_config.h
index 02e7bda..f65d967 100644
--- a/firmware/nrf52_sdk/integration/nrfx/nrfx_config.h
+++ b/firmware/nrf52_sdk/integration/nrfx/nrfx_config.h
@@ -42,6 +42,6 @@
 #define NRFX_CONFIG_H__
 
 // TODO - temporary redirection
-#include <sdk_config.h>
+#include "sdk_config.h"
 
 #endif // NRFX_CONFIG_H__
diff --git a/software/.gitignore b/software/.gitignore
index 33cbdb5..d28da88 100644
--- a/software/.gitignore
+++ b/software/.gitignore
@@ -3,4 +3,5 @@ bin/
 # 忽略vscode的文件夹
 script/__pycache__
 # 忽略编译输出文件夹
-src/out
\ No newline at end of file
+src/out
+script/
\ No newline at end of file
diff --git a/software/script/chameleon_cli_unit.py b/software/script/chameleon_cli_unit.py
index a8f48a4..dd480a8 100644
--- a/software/script/chameleon_cli_unit.py
+++ b/software/script/chameleon_cli_unit.py
@@ -85,7 +85,7 @@ class BaseCLIUnit:
         raise NotImplementedError("Please implement this")
 
     @staticmethod
-    def sub_process(cmd, cwd=os.path.abspath("../bin/"), ):
+    def sub_process(cmd, cwd=os.path.abspath("/bin/"), ):
         class ShadowProcess:
             def __init__(self):
                 self.time_start = timeit.default_timer()
@@ -745,7 +745,7 @@ class SlotIndexRequireUint(DeviceRequiredUnit):
         parser.add_argument('-s', "--slot", type=int, required=True,
                             help="Slot index", metavar="number", choices=slot_choices)
         return parser
-    
+
 class SenseTypeRequireUint(DeviceRequiredUnit):
 
     def args_parser(self) -> ArgumentParserNoExit or None:
@@ -907,7 +907,7 @@ class HWSlotOpenAll(DeviceRequiredUnit):
 
     def args_parser(self) -> ArgumentParserNoExit or None:
         return None
-    
+
     # hw slot openall
     def on_exec(self, args: argparse.Namespace):
         # what type you need set to default?
@@ -938,7 +938,7 @@ class HWDFU(DeviceRequiredUnit):
 
     def args_parser(self) -> ArgumentParserNoExit or None:
         return None
-    
+
     # hw dfu
     def on_exec(self, args: argparse.Namespace):
         print("Application restarting...")