Merge pull request #26 from IvanArkhipov1999/some-fixes

Some fixes
IvanArkhipov1999 · Mar 30, 2024 · 2373ba7 · 2373ba7
2 parents 93f3429 + 31aef81
commit 2373ba7
Show file tree

Hide file tree

Showing 11 changed files with 805 additions and 11 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -31,7 +31,6 @@ jobs:
       - name: Fmt
         run: cargo fmt --all -- --check
 
-# TODO: change to cargo build --example
   xtensa-esp32-rust-example:
     runs-on: ubuntu-latest
     steps:

diff --git a/.gitignore b/.gitignore
@@ -4,8 +4,9 @@ debug/
 target/
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# For examples Cargo.lock is in gitignore. For Martos and c-libraries it is in repository.
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
-Cargo.lock
+examples/**/Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ma_rtos"
+name = "martos"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ In its current version, Martos features a basic task manager and timer counter.
 To develop software in Rust, you have the option to incorporate the Martos as a dependency:
 ```
 [dependencies]
-ma_rtos = { git = "https://github.com/IvanArkhipov1999/Martos" }
+martos = { git = "https://github.com/IvanArkhipov1999/Martos" }
 ```
 
 You can explore a variety of Rust examples showcasing different architectures in the ['examples/rust-examples'](https://github.com/IvanArkhipov1999/Martos/tree/main/examples/rust-examples) directory.