Skip to content

Commit

Permalink
Merge pull request #172 from arkedge/feature/move-tlmcmddb-dir
Browse files Browse the repository at this point in the history
Move tlmcmddb dir
  • Loading branch information
sksat authored Oct 30, 2023
2 parents 48769e4 + e28c5f3 commit dcb1065
Show file tree
Hide file tree
Showing 71 changed files with 11 additions and 6 deletions.
4 changes: 2 additions & 2 deletions code-generator/settings_mobc.json
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion code-generator/settings_subobc.json
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions examples/mobc/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/subobc/package.json
Original file line number Diff line number Diff line change
@@ -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'",
Expand Down
5 changes: 5 additions & 0 deletions script/migration/v4-move-db-dir.sh
Original file line number Diff line number Diff line change
@@ -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"

0 comments on commit dcb1065

Please sign in to comment.