From 6533852538e884e928d3eb24f6deec7a9d8df2c7 Mon Sep 17 00:00:00 2001 From: sksat Date: Mon, 30 Oct 2023 13:53:42 +0900 Subject: [PATCH 1/2] fix remove BootLoader / ReProgramming dir in sync with mobc example script --- examples/subobc/sync_with_mobc_example.bat | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/subobc/sync_with_mobc_example.bat b/examples/subobc/sync_with_mobc_example.bat index cc005ea46..fb2f1fe2b 100644 --- a/examples/subobc/sync_with_mobc_example.bat +++ b/examples/subobc/sync_with_mobc_example.bat @@ -7,9 +7,7 @@ echo sync with mobc sample... echo. call :sync_dir ".\src\s2e_mockup\" "..\mobc\src\s2e_mockup\" -call :sync_dir ".\src\src_user\BootLoader\" "..\mobc\src\src_user\BootLoader\" call :sync_dir ".\src\src_user\library\" "..\mobc\src\src_user\library\" -call :sync_dir ".\src\src_user\ReProgramming\" "..\mobc\src\src_user\ReProgramming\" call :sync_dir ".\src\src_user\script\" "..\mobc\src\src_user\script\" call :sync_dir ".\src\src_user\settings\tlm_cmd\ccsds\" "..\mobc\src\src_user\settings\tlm_cmd\ccsds\" From 532f6f74ea175350c1e46f88c809ae8950ecb57d Mon Sep 17 00:00:00 2001 From: sksat Date: Mon, 30 Oct 2023 13:56:51 +0900 Subject: [PATCH 2/2] fix tlm-cmd-db ignore in pre-commit hooks --- script/git_hooks/pre-commit | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script/git_hooks/pre-commit b/script/git_hooks/pre-commit index 4d6dc3400..69bfb7b17 100755 --- a/script/git_hooks/pre-commit +++ b/script/git_hooks/pre-commit @@ -9,12 +9,12 @@ my $DEBUG = 0; my $err_flag = 0; my @Targets = ( - "examples/mobc/src/src_user/settings/tlm_cmd/DataBase/CMD_DB/SAMPLE_MOBC_CMD_DB.xlsm", - "examples/mobc/src/src_user/settings/tlm_cmd/DataBase/TLM_DB/SAMPLE_MOBC_TLM_DB.xlsm", + "examples/mobc/tlm-cmd-db/CMD_DB/SAMPLE_MOBC_CMD_DB.xlsm", + "examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB.xlsm", "examples/mobc/src/src_user/settings/sils_define.h", "examples/mobc/src/src_user/settings/build_settings.h", - "examples/subobc/src/src_user/settings/tlm_cmd/DataBase/CMD_DB/SAMPLE_AOBC_CMD_DB.xlsm", - "examples/subobc/src/src_user/settings/tlm_cmd/DataBase/TLM_DB/SAMPLE_AOBC_TLM_DB.xlsm", + "examples/subobc/tlm-cmd-db/CMD_DB/SAMPLE_AOBC_CMD_DB.xlsm", + "examples/subobc/tlm-cmd-db/TLM_DB/SAMPLE_AOBC_TLM_DB.xlsm", "examples/subobc/src/src_user/settings/sils_define.h", "examples/subobc/src/src_user/settings/build_settings.h", );