diff --git a/code-generator/settings_mobc.json b/code-generator/settings_mobc.json index 040d2fca7..d0cf749e8 100644 --- a/code-generator/settings_mobc.json +++ b/code-generator/settings_mobc.json @@ -1,6 +1,6 @@ { "path_to_src" : "../examples/mobc/src/", - "path_to_db" : "../examples/mobc/src/src_user/settings/tlm_cmd/data_base/", + "path_to_db" : "../examples/mobc/tlm-cmd-db/", "db_prefix" : "SAMPLE_MOBC", "tlm_id_range" : ["0x00", "0x100"], "is_cmd_prefixed_in_db" : 0, @@ -15,7 +15,7 @@ "tlm_id_range" : ["0x90", "0xc0"], "is_cmd_prefixed_in_db" : 0, "input_file_encoding" : "utf-8", - "path_to_db" : "../examples/subobc/src/src_user/settings/tlm_cmd/data_base/", + "path_to_db" : "../examples/subobc/tlm-cmd-db/", "max_tlm_num" : 256, "driver_path" : "aocs/", "driver_type" : "AOBC_Driver", diff --git a/code-generator/settings_subobc.json b/code-generator/settings_subobc.json index 5f2348d96..449afb8a8 100644 --- a/code-generator/settings_subobc.json +++ b/code-generator/settings_subobc.json @@ -1,6 +1,6 @@ { "path_to_src" : "../examples/subobc/src/", - "path_to_db" : "../examples/subobc/src/src_user/settings/tlm_cmd/data_base/", + "path_to_db" : "../examples/subobc/tlm-cmd-db/", "db_prefix" : "SAMPLE_AOBC", "tlm_id_range" : ["0x00", "0x100"], "is_cmd_prefixed_in_db" : 0, diff --git a/examples/mobc/package.json b/examples/mobc/package.json index 14bbda54c..57c05c232 100644 --- a/examples/mobc/package.json +++ b/examples/mobc/package.json @@ -1,13 +1,13 @@ { "name": "c2a-example-mobc", "scripts": { - "build:tlmcmddb": "tlmcmddb-cli bundle --pretty src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data src/src_user/settings/tlm_cmd/data_base/CMD_DB tlmcmddb.json", + "build:tlmcmddb": "tlmcmddb-cli bundle --pretty tlm-cmd-db/TLM_DB/calced_data tlm-cmd-db/CMD_DB tlmcmddb.json", "run:c2a": "cargo run", "run:gaia": "tmtc-c2a --satconfig satconfig.json --tlmcmddb tlmcmddb.json", "run:kble": "bash -c 'while :; do kble -s <(jrsonnet spaghetti.jsonnet); sleep 1; done'", "run-all": "run-p run:*", "devtools:sils": "run-s build:* run-all", - "build:tlmcmddb-sub": "tlmcmddb-cli bundle --pretty ../subobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data ../subobc/src/src_user/settings/tlm_cmd/data_base/CMD_DB tlmcmddb-subobc.json", + "build:tlmcmddb-sub": "tlmcmddb-cli bundle --pretty ../subobc/tlm-cmd-db/TLM_DB/calced_data ../subobc/tlm-cmd-db/CMD_DB tlmcmddb-subobc.json", "tlmcmddb-merge": "tlmcmddb-cli merge --pretty --output tlmcmddb.json tlmcmddb.json tlmcmddb-subobc.json", "run-subobc:c2a-subobc": "env UART_KBLE_PORT=9697 cargo run --manifest-path ../subobc/Cargo.toml", "run-subobc:c2a": "run-s run:c2a", diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/CMDFILE/sample.ops b/examples/mobc/tlm-cmd-db/CMDFILE/sample.ops similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/CMDFILE/sample.ops rename to examples/mobc/tlm-cmd-db/CMDFILE/sample.ops diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/CMD_DB/SAMPLE_MOBC_CMD_DB.xlsm b/examples/mobc/tlm-cmd-db/CMD_DB/SAMPLE_MOBC_CMD_DB.xlsm similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/CMD_DB/SAMPLE_MOBC_CMD_DB.xlsm rename to examples/mobc/tlm-cmd-db/CMD_DB/SAMPLE_MOBC_CMD_DB.xlsm diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/CMD_DB/SAMPLE_MOBC_CMD_DB_BCT.csv b/examples/mobc/tlm-cmd-db/CMD_DB/SAMPLE_MOBC_CMD_DB_BCT.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/CMD_DB/SAMPLE_MOBC_CMD_DB_BCT.csv rename to examples/mobc/tlm-cmd-db/CMD_DB/SAMPLE_MOBC_CMD_DB_BCT.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/CMD_DB/SAMPLE_MOBC_CMD_DB_CMD_DB.csv b/examples/mobc/tlm-cmd-db/CMD_DB/SAMPLE_MOBC_CMD_DB_CMD_DB.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/CMD_DB/SAMPLE_MOBC_CMD_DB_CMD_DB.csv rename to examples/mobc/tlm-cmd-db/CMD_DB/SAMPLE_MOBC_CMD_DB_CMD_DB.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/CMD_DB/SAMPLE_MOBC_CMD_DB_Utility.csv b/examples/mobc/tlm-cmd-db/CMD_DB/SAMPLE_MOBC_CMD_DB_Utility.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/CMD_DB/SAMPLE_MOBC_CMD_DB_Utility.csv rename to examples/mobc/tlm-cmd-db/CMD_DB/SAMPLE_MOBC_CMD_DB_Utility.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB.xlsm b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB.xlsm similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB.xlsm rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB.xlsm diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_AM.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_AM.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_AM.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_AM.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_APP_TIME.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_APP_TIME.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_APP_TIME.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_APP_TIME.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_BL.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_BL.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_BL.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_BL.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_CA.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_CA.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_CA.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_CA.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_CDIS.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_CDIS.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_CDIS.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_CDIS.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_DCU.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_DCU.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_DCU.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_DCU.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_EH.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_EH.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_EH.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_EH.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_EH_INDEX.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_EH_INDEX.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_EH_INDEX.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_EH_INDEX.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_EH_LOG.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_EH_LOG.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_EH_LOG.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_EH_LOG.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_EH_RULE.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_EH_RULE.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_EH_RULE.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_EH_RULE.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_EL.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_EL.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_EL.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_EL.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_EL_CLOG.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_EL_CLOG.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_EL_CLOG.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_EL_CLOG.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_EL_TLOG.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_EL_TLOG.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_EL_TLOG.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_EL_TLOG.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_GIT_REV.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_GIT_REV.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_GIT_REV.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_GIT_REV.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_GS.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_GS.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_GS.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_GS.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_HK.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_HK.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_HK.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_HK.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_MEM.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_MEM.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_MEM.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_MEM.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_MM.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_MM.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_MM.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_MM.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_MOBC.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_MOBC.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_MOBC.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_MOBC.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_TF.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_TF.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_TF.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_TF.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_TL.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_TL.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_TL.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_TL.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_TLM_MGR1.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_TLM_MGR1.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_TLM_MGR1.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_TLM_MGR1.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_TLM_MGR2.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_TLM_MGR2.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_TLM_MGR2.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_TLM_MGR2.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_UART_TEST.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_UART_TEST.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_MOBC_TLM_DB_UART_TEST.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_UART_TEST.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/.gitkeep b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/.gitkeep similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/.gitkeep rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/.gitkeep diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_AM.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_AM.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_AM.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_AM.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_APP_TIME.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_APP_TIME.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_APP_TIME.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_APP_TIME.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_BL.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_BL.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_BL.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_BL.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_CA.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_CA.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_CA.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_CA.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_CDIS.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_CDIS.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_CDIS.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_CDIS.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_DCU.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_DCU.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_DCU.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_DCU.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EH.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EH.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EH.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EH.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EH_INDEX.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EH_INDEX.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EH_INDEX.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EH_INDEX.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EH_LOG.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EH_LOG.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EH_LOG.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EH_LOG.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EH_RULE.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EH_RULE.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EH_RULE.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EH_RULE.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EL.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EL.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EL.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EL.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EL_CLOG.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EL_CLOG.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EL_CLOG.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EL_CLOG.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EL_TLOG.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EL_TLOG.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EL_TLOG.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_EL_TLOG.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_GIT_REV.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_GIT_REV.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_GIT_REV.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_GIT_REV.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_GS.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_GS.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_GS.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_GS.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_HK.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_HK.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_HK.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_HK.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_MEM.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_MEM.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_MEM.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_MEM.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_MM.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_MM.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_MM.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_MM.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_MOBC.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_MOBC.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_MOBC.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_MOBC.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_TF.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_TF.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_TF.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_TF.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_TL.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_TL.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_TL.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_TL.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_TLM_MGR1.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_TLM_MGR1.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_TLM_MGR1.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_TLM_MGR1.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_TLM_MGR2.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_TLM_MGR2.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_TLM_MGR2.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_TLM_MGR2.csv diff --git a/examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_UART_TEST.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_UART_TEST.csv similarity index 100% rename from examples/mobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_UART_TEST.csv rename to examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_UART_TEST.csv diff --git a/examples/subobc/package.json b/examples/subobc/package.json index 6a7b9aa06..7c44b40be 100644 --- a/examples/subobc/package.json +++ b/examples/subobc/package.json @@ -1,7 +1,7 @@ { "name": "c2a-example-subobc", "scripts": { - "build:tlmcmddb": "tlmcmddb-cli bundle --pretty src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data src/src_user/settings/tlm_cmd/data_base/CMD_DB tlmcmddb.json", + "build:tlmcmddb": "tlmcmddb-cli bundle --pretty tlm-cmd-db/TLM_DB/calced_data tlm-cmd-db/CMD_DB tlmcmddb.json", "run:c2a": "cargo run", "run:gaia": "tmtc-c2a --satconfig satconfig.json --tlmcmddb tlmcmddb.json", "run:kble": "bash -c 'while :; do kble -s <(jrsonnet spaghetti.jsonnet); sleep 1; done'", diff --git a/examples/subobc/src/src_user/settings/tlm_cmd/data_base/CMDFILE/sample.ops b/examples/subobc/tlm-cmd-db/CMDFILE/sample.ops similarity index 100% rename from examples/subobc/src/src_user/settings/tlm_cmd/data_base/CMDFILE/sample.ops rename to examples/subobc/tlm-cmd-db/CMDFILE/sample.ops diff --git a/examples/subobc/src/src_user/settings/tlm_cmd/data_base/CMD_DB/SAMPLE_AOBC_CMD_DB.xlsm b/examples/subobc/tlm-cmd-db/CMD_DB/SAMPLE_AOBC_CMD_DB.xlsm similarity index 100% rename from examples/subobc/src/src_user/settings/tlm_cmd/data_base/CMD_DB/SAMPLE_AOBC_CMD_DB.xlsm rename to examples/subobc/tlm-cmd-db/CMD_DB/SAMPLE_AOBC_CMD_DB.xlsm diff --git a/examples/subobc/src/src_user/settings/tlm_cmd/data_base/CMD_DB/SAMPLE_AOBC_CMD_DB_BCT.csv b/examples/subobc/tlm-cmd-db/CMD_DB/SAMPLE_AOBC_CMD_DB_BCT.csv similarity index 100% rename from examples/subobc/src/src_user/settings/tlm_cmd/data_base/CMD_DB/SAMPLE_AOBC_CMD_DB_BCT.csv rename to examples/subobc/tlm-cmd-db/CMD_DB/SAMPLE_AOBC_CMD_DB_BCT.csv diff --git a/examples/subobc/src/src_user/settings/tlm_cmd/data_base/CMD_DB/SAMPLE_AOBC_CMD_DB_CMD_DB.csv b/examples/subobc/tlm-cmd-db/CMD_DB/SAMPLE_AOBC_CMD_DB_CMD_DB.csv similarity index 100% rename from examples/subobc/src/src_user/settings/tlm_cmd/data_base/CMD_DB/SAMPLE_AOBC_CMD_DB_CMD_DB.csv rename to examples/subobc/tlm-cmd-db/CMD_DB/SAMPLE_AOBC_CMD_DB_CMD_DB.csv diff --git a/examples/subobc/src/src_user/settings/tlm_cmd/data_base/CMD_DB/SAMPLE_AOBC_CMD_DB_Utility.csv b/examples/subobc/tlm-cmd-db/CMD_DB/SAMPLE_AOBC_CMD_DB_Utility.csv similarity index 100% rename from examples/subobc/src/src_user/settings/tlm_cmd/data_base/CMD_DB/SAMPLE_AOBC_CMD_DB_Utility.csv rename to examples/subobc/tlm-cmd-db/CMD_DB/SAMPLE_AOBC_CMD_DB_Utility.csv diff --git a/examples/subobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_AOBC_TLM_DB.xlsm b/examples/subobc/tlm-cmd-db/TLM_DB/SAMPLE_AOBC_TLM_DB.xlsm similarity index 100% rename from examples/subobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_AOBC_TLM_DB.xlsm rename to examples/subobc/tlm-cmd-db/TLM_DB/SAMPLE_AOBC_TLM_DB.xlsm diff --git a/examples/subobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_AOBC.csv b/examples/subobc/tlm-cmd-db/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_AOBC.csv similarity index 100% rename from examples/subobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_AOBC.csv rename to examples/subobc/tlm-cmd-db/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_AOBC.csv diff --git a/examples/subobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv b/examples/subobc/tlm-cmd-db/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv similarity index 100% rename from examples/subobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv rename to examples/subobc/tlm-cmd-db/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv diff --git a/examples/subobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/.gitkeep b/examples/subobc/tlm-cmd-db/TLM_DB/calced_data/.gitkeep similarity index 100% rename from examples/subobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/.gitkeep rename to examples/subobc/tlm-cmd-db/TLM_DB/calced_data/.gitkeep diff --git a/examples/subobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_AOBC.csv b/examples/subobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_AOBC.csv similarity index 100% rename from examples/subobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_AOBC.csv rename to examples/subobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_AOBC.csv diff --git a/examples/subobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv b/examples/subobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv similarity index 100% rename from examples/subobc/src/src_user/settings/tlm_cmd/data_base/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv rename to examples/subobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv diff --git a/script/migration/v4-move-db-dir.sh b/script/migration/v4-move-db-dir.sh new file mode 100755 index 000000000..fd92e73dc --- /dev/null +++ b/script/migration/v4-move-db-dir.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +mv ./src/src_user/settings/tlm_cmd/data_base ./tlm-cmd-db + +find . -name "*" -not -path "*/.git/*" -type f -print0 | xargs -0 sed -i -e "s#src/src_user/settings/tlm_cmd/data_base#tlm-cmd-db#g"