WIP

schilkp · Nov 18, 2024 · 76c44cd · 76c44cd
1 parent 63fe71b
commit 76c44cd
Show file tree

Hide file tree

Showing 37 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/ci-conv.yml b/.github/workflows/ci-conv.yml
@@ -1,4 +1,4 @@
-name: ci-conv
+name: ci-tools
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  conv-cargo-test:
+  tools-cargo-test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -20,10 +20,10 @@ jobs:
         run:  sudo apt-get install protobuf-compiler
 
       - name: Cargo Test
-        working-directory: ${{github.workspace}}/conv/
+        working-directory: ${{github.workspace}}/tools/
         run: cargo test --all
 
-  conv-fmt-check:
+  tools-fmt-check:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -32,10 +32,10 @@ jobs:
           toolchain: stable
           components: rustfmt
       - name: Format Check
-        working-directory: ${{github.workspace}}/conv/
+        working-directory: ${{github.workspace}}/tools/
         run: cargo fmt -- --check
 
-  conv-clippy-check:
+  tools-clippy-check:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -48,5 +48,5 @@ jobs:
         run:  sudo apt-get install protobuf-compiler
 
       - name: Lint
-        working-directory: ${{github.workspace}}/conv/
+        working-directory: ${{github.workspace}}/tools/
         run: cargo clippy --all-features -- -D warnings
diff --git a/README.md b/README.md
@@ -31,15 +31,15 @@ The documentation for Tonbandgerät can be found in the `docs/` folder and compi
 by running `mdbook build` in `docs/`. The latest version of the documentation can also be viewed online [here](https://schilk.co/Tonbandgeraet/docs/index.html).
 
 ## Trace Converter + Viewing
-The trace converter is written in rust, can be found [here](https://github.com/schilkp/Tonbandgeraet/tree/main/conv). For convenience, there is
+The trace converter is written in rust, can be found [here](https://github.com/schilkp/Tonbandgeraet/tree/main/tools). For convenience, there is
 also a WASM version with web frontend, which runs in the browser and can be found [here](https://schilk.co/Tonbandgeraet/).
 
 ## Licensing
 The [target tracer sources](https://github.com/schilkp/Tonbandgeraet/tree/main/tband) and [documentation](https://github.com/schilkp/Tonbandgeraet/tree/main/docs) are
 released under the [MIT License](https://github.com/schilkp/Tonbandgeraet/blob/main/tband/LICENSE). All conversion and
-analysis tools, such as the [decoder and converter](https://github.com/schilkp/Tonbandgeraet/tree/main/conv/tband-conv),
-the [CLI](https://github.com/schilkp/Tonbandgeraet/tree/main/conv/tband-cli), and the
-[web converter](https://github.com/schilkp/Tonbandgeraet/tree/main/web) are released under the [GNU GPL3 License](https://github.com/schilkp/Tonbandgeraet/blob/main/conv/tband-cli/LICENSE).
+analysis tools, such as the [decoder and converter](https://github.com/schilkp/Tonbandgeraet/tree/main/tools/tband-conv),
+the [CLI](https://github.com/schilkp/Tonbandgeraet/tree/main/tools/tband-cli), and the
+[web converter](https://github.com/schilkp/Tonbandgeraet/tree/main/web) are released under the [GNU GPL3 License](https://github.com/schilkp/Tonbandgeraet/blob/main/tools/tband-cli/LICENSE).
 
 ---
 ## Status

diff --git a/codegen/codegen/__main__.py b/codegen/codegen/__main__.py
@@ -169,13 +169,13 @@ def main():
     )
     gen_c_tests.gen(groups, c_test_file)
 
-    rs_crate_dir = abspath(join(script_loc, "..", "..", "conv", "tband-conv"))
+    rs_crate_dir = abspath(join(script_loc, "..", "..", "tools", "tband-conv"))
     rs_decoder_file = abspath(
         join(
             script_loc,
             "..",
             "..",
-            "conv",
+            "tools",
             "tband-conv",
             "src",
             "decode",

diff --git a/docs/doc/tband_cli.md b/docs/doc/tband_cli.md
@@ -5,7 +5,7 @@
 The trace converter and CLI is written in rust 🦀. To compile and run `tband-cli` locally, first you
 need to [download and install rust](https://www.rust-lang.org/learn/get-started) if you don't already have it.
 
-Then, open the [`./conv/tband-cli`](https://github.com/schilkp/Tonbandgeraet/tree/main/conv/tband-cli) folder.
+Then, open the [`./tools/tband-cli`](https://github.com/schilkp/Tonbandgeraet/tree/main/tools/tband-cli) folder.
 
 Now you have two options. To compile & install `tband-cli`, run:
 

diff --git a/docs/update_cli_help.bash b/docs/update_cli_help.bash
@@ -6,7 +6,7 @@ cd "$(dirname "$0")"
 script_dir="$(pwd)"
 
 # Grab jelp messages
-cd ../conv/
+cd ../tools/
 main_help=$(cargo run -- --help)
 conv_help=$(cargo run -- conv --help)
 dump_help=$(cargo run -- dump --help)

diff --git a/tests/baremetal_integration/test.bash b/tests/baremetal_integration/test.bash
@@ -18,7 +18,7 @@ cd "$script_dir"
 
 echo "Dumping trace.."
 cd "$script_dir"
-cd ../../conv/tband-cli
+cd ../../tools/tband-cli
 cargo run -- dump --format bin --mode bare-metal "${script_dir}"/trace.bin > "${script_dir}/dump"
 
 cd "$script_dir"

diff --git a/conv/Cargo.lock → tools/Cargo.lock b/conv/Cargo.lock → tools/Cargo.lock
diff --git a/conv/Cargo.toml → tools/Cargo.toml b/conv/Cargo.toml → tools/Cargo.toml
diff --git a/conv/rustfmt.toml → tools/rustfmt.toml b/conv/rustfmt.toml → tools/rustfmt.toml
diff --git a/conv/synthetto/Cargo.toml → tools/synthetto/Cargo.toml b/conv/synthetto/Cargo.toml → tools/synthetto/Cargo.toml
diff --git a/conv/synthetto/build.rs → tools/synthetto/build.rs b/conv/synthetto/build.rs → tools/synthetto/build.rs
diff --git a/conv/synthetto/src/lib.rs → tools/synthetto/src/lib.rs b/conv/synthetto/src/lib.rs → tools/synthetto/src/lib.rs
diff --git a/conv/synthetto/src/perfetto_trace.proto → tools/synthetto/src/perfetto_trace.proto b/conv/synthetto/src/perfetto_trace.proto → tools/synthetto/src/perfetto_trace.proto
diff --git a/...ynthetto/src/perfetto_trace_minimal.proto → ...ynthetto/src/perfetto_trace_minimal.proto b/...ynthetto/src/perfetto_trace_minimal.proto → ...ynthetto/src/perfetto_trace_minimal.proto
diff --git a/conv/tband-cli/Cargo.toml → tools/tband-cli/Cargo.toml b/conv/tband-cli/Cargo.toml → tools/tband-cli/Cargo.toml
diff --git a/conv/tband-cli/LICENSE → tools/tband-cli/LICENSE b/conv/tband-cli/LICENSE → tools/tband-cli/LICENSE
diff --git a/conv/tband-cli/src/cli/cmd_completion.rs → tools/tband-cli/src/cli/cmd_completion.rs b/conv/tband-cli/src/cli/cmd_completion.rs → tools/tband-cli/src/cli/cmd_completion.rs
diff --git a/conv/tband-cli/src/cli/cmd_convert.rs → tools/tband-cli/src/cli/cmd_convert.rs b/conv/tband-cli/src/cli/cmd_convert.rs → tools/tband-cli/src/cli/cmd_convert.rs
diff --git a/conv/tband-cli/src/cli/cmd_dump.rs → tools/tband-cli/src/cli/cmd_dump.rs b/conv/tband-cli/src/cli/cmd_dump.rs → tools/tband-cli/src/cli/cmd_dump.rs
diff --git a/conv/tband-cli/src/cli/cmd_serve.rs → tools/tband-cli/src/cli/cmd_serve.rs b/conv/tband-cli/src/cli/cmd_serve.rs → tools/tband-cli/src/cli/cmd_serve.rs
diff --git a/conv/tband-cli/src/cli/mod.rs → tools/tband-cli/src/cli/mod.rs b/conv/tband-cli/src/cli/mod.rs → tools/tband-cli/src/cli/mod.rs
diff --git a/conv/tband-cli/src/main.rs → tools/tband-cli/src/main.rs b/conv/tband-cli/src/main.rs → tools/tband-cli/src/main.rs
diff --git a/conv/tband-cli/src/open.rs → tools/tband-cli/src/open.rs b/conv/tband-cli/src/open.rs → tools/tband-cli/src/open.rs
diff --git a/conv/tband-conv/Cargo.toml → tools/tband-conv/Cargo.toml b/conv/tband-conv/Cargo.toml → tools/tband-conv/Cargo.toml
diff --git a/conv/tband-conv/LICENSE → tools/tband-conv/LICENSE b/conv/tband-conv/LICENSE → tools/tband-conv/LICENSE
diff --git a/conv/tband-conv/src/decode/cobs.rs → tools/tband-conv/src/decode/cobs.rs b/conv/tband-conv/src/decode/cobs.rs → tools/tband-conv/src/decode/cobs.rs
diff --git a/conv/tband-conv/src/decode/evts.rs → tools/tband-conv/src/decode/evts.rs b/conv/tband-conv/src/decode/evts.rs → tools/tband-conv/src/decode/evts.rs
diff --git a/conv/tband-conv/src/decode/mod.rs → tools/tband-conv/src/decode/mod.rs b/conv/tband-conv/src/decode/mod.rs → tools/tband-conv/src/decode/mod.rs
diff --git a/conv/tband-conv/src/lib.rs → tools/tband-conv/src/lib.rs b/conv/tband-conv/src/lib.rs → tools/tband-conv/src/lib.rs
diff --git a/conv/tband-conv/src/trace/base/mod.rs → tools/tband-conv/src/trace/base/mod.rs b/conv/tband-conv/src/trace/base/mod.rs → tools/tband-conv/src/trace/base/mod.rs
diff --git a/conv/tband-conv/src/trace/convert.rs → tools/tband-conv/src/trace/convert.rs b/conv/tband-conv/src/trace/convert.rs → tools/tband-conv/src/trace/convert.rs
diff --git a/.../tband-conv/src/trace/freertos/convert.rs → .../tband-conv/src/trace/freertos/convert.rs b/.../tband-conv/src/trace/freertos/convert.rs → .../tband-conv/src/trace/freertos/convert.rs
diff --git a/...v/src/trace/freertos/generate_perfetto.rs → ...v/src/trace/freertos/generate_perfetto.rs b/...v/src/trace/freertos/generate_perfetto.rs → ...v/src/trace/freertos/generate_perfetto.rs
diff --git a/conv/tband-conv/src/trace/freertos/mod.rs → tools/tband-conv/src/trace/freertos/mod.rs b/conv/tband-conv/src/trace/freertos/mod.rs → tools/tband-conv/src/trace/freertos/mod.rs
diff --git a/...tband-conv/src/trace/generate_perfetto.rs → ...tband-conv/src/trace/generate_perfetto.rs b/...tband-conv/src/trace/generate_perfetto.rs → ...tband-conv/src/trace/generate_perfetto.rs
diff --git a/conv/tband-conv/src/trace/mod.rs → tools/tband-conv/src/trace/mod.rs b/conv/tband-conv/src/trace/mod.rs → tools/tband-conv/src/trace/mod.rs
diff --git a/web/tband-wasm/Cargo.toml b/web/tband-wasm/Cargo.toml
@@ -15,7 +15,7 @@ wasm-bindgen = { version = "0.2.84"}
 # code size when deploying.
 # console_error_panic_hook = { version = "0.1.7", optional = true }
 
-tband_conv = { path = "../../conv/tband-conv" }
+tband_conv = { path = "../../tools/tband-conv" }
 log = { version = "0.4.21", features = ["std"] }
 console_log = "1.0.0"
 web-sys = { version = "0.3.69", features = ["Document", "Window", "Element", "HtmlElement", "HtmlDivElement", "CustomEvent", "CustomEventInit"] }