Compare commits

...
Sign in to create a new pull request.

5 commits

Author SHA1 Message Date
8fbbb04bbc rename idea files, rename project 2024-11-26 21:59:19 +03:00
Данила Горнушко
fe5646b52a update esp-hal + minor refactoring 2024-10-30 11:52:17 +03:00
Данила Горнушко
fe2fca247b added more channels, still works! 2024-10-30 11:47:52 +03:00
Данила Горнушко
0fa92e9d4e rtt works! 2024-10-30 11:46:01 +03:00
Данила Горнушко
348ecf7403 test 2024-10-30 11:36:37 +03:00
9 changed files with 189 additions and 359 deletions

1
.gitignore vendored
View file

@ -2,6 +2,7 @@
# will have compiled files and executables
debug/
target/
trouble
# These are backup files generated by rustfmt
**/*.rs.bk

View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="EMPTY_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

8
.idea/modules.xml generated
View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/esp_hal_probe.iml" filepath="$PROJECT_DIR$/.idea/esp_hal_probe.iml" />
</modules>
</component>
</project>

6
.idea/vcs.xml generated
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

201
.idea/workspace.xml generated
View file

@ -1,201 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="ALL" />
</component>
<component name="CargoProjects">
<cargoProject FILE="$PROJECT_DIR$/Cargo.toml" />
</component>
<component name="ChangeListManager">
<list default="true" id="7b22105a-0bfb-4392-932c-cec93348d8e9" name="Changes" comment="rustfmt">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/main.rs" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="RsBuildProfile:dev" />
<component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="ble_test" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="MacroExpansionManager">
<option name="directoryName" value="c4jj78ke" />
</component>
<component name="ProblemsViewState">
<option name="selectedTabId" value="CurrentFile" />
</component>
<component name="ProjectColorInfo">{
&quot;customColor&quot;: &quot;&quot;,
&quot;associatedIndex&quot;: 8
}</component>
<component name="ProjectId" id="2llP8G0IC1fHEwEaTUqH1GY9b72" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.rust.reset.selective.auto.import": "true",
"git-widget-placeholder": "main",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"org.rust.cargo.project.model.PROJECT_DISCOVERY": "true",
"org.rust.cargo.project.model.impl.CargoExternalSystemProjectAware.subscribe.first.balloon": "",
"org.rust.first.attach.projects": "true",
"settings.editor.selected.configurable": "language.rust",
"vue.rearranger.settings.migration": "true"
}
}]]></component>
<component name="RsExternalLinterProjectSettings">
<option name="channel" value="nightly" />
</component>
<component name="RunManager" selected="Cargo.Run esp_hal_probe">
<configuration name="Run esp_hal_probe" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
<option name="buildProfileId" value="dev" />
<option name="command" value="run --package esp_hal_probe --bin esp_hal_probe" />
<option name="workingDirectory" value="file://$PROJECT_DIR$" />
<envs />
<option name="emulateTerminal" value="true" />
<option name="channel" value="DEFAULT" />
<option name="requiredFeatures" value="true" />
<option name="allFeatures" value="false" />
<option name="withSudo" value="false" />
<option name="buildTarget" value="REMOTE" />
<option name="backtrace" value="SHORT" />
<option name="isRedirectInput" value="false" />
<option name="redirectInputPath" value="" />
<method v="2">
<option name="CARGO.BUILD_TASK_PROVIDER" enabled="true" />
</method>
</configuration>
<configuration name="Test esp_hal_probe" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
<option name="command" value="test --workspace" />
<option name="workingDirectory" value="file://$PROJECT_DIR$" />
<envs />
<option name="emulateTerminal" value="true" />
<option name="channel" value="DEFAULT" />
<option name="requiredFeatures" value="true" />
<option name="allFeatures" value="false" />
<option name="withSudo" value="false" />
<option name="buildTarget" value="REMOTE" />
<option name="backtrace" value="SHORT" />
<option name="isRedirectInput" value="false" />
<option name="redirectInputPath" value="" />
<method v="2">
<option name="CARGO.BUILD_TASK_PROVIDER" enabled="true" />
</method>
</configuration>
</component>
<component name="RustProjectSettings">
<option name="toolchainHomeDirectory" value="$USER_HOME$/.cargo/bin" />
</component>
<component name="RustfmtProjectSettings">
<option name="useRustfmt" value="true" />
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="7b22105a-0bfb-4392-932c-cec93348d8e9" name="Changes" comment="" />
<created>1725751529946</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1725751529946</updated>
<workItem from="1725751530671" duration="64000" />
<workItem from="1725752698276" duration="5000" />
<workItem from="1725758634613" duration="2173000" />
</task>
<task id="LOCAL-00001" summary="latest stable esp-hal + hello world">
<option name="closed" value="true" />
<created>1725758678966</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1725758678966</updated>
</task>
<task id="LOCAL-00002" summary="latest git version of esp-hal + fix RustRover warnings + probe-rs&#10;use this command for installing working probe-rs:&#10;```&#10;cargo install probe-rs-tools \&#10; --git https://github.com/probe-rs/probe-rs \&#10; --rev 9bde591 --force --locked&#10;```">
<option name="closed" value="true" />
<created>1725759926412</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1725759926413</updated>
</task>
<task id="LOCAL-00003" summary="Remove static_cell dependency&#10;&#10;Removed the static_cell dependency from Cargo.toml and Cargo.lock. Also cleaned up comments and metadata in main.rs and updated .idea project settings.">
<option name="closed" value="true" />
<created>1725760460967</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1725760460968</updated>
</task>
<task id="LOCAL-00004" summary="Remove outdated comments and update task metadata&#10;&#10;Removed obsolete comments from `.vscode/settings.json` and updated task metadata in `.idea/workspace.xml`. These changes include the removal of the static_cell dependency and cleanup of various project settings.">
<option name="closed" value="true" />
<created>1725760510812</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1725760510812</updated>
</task>
<task id="LOCAL-00005" summary="Update comments and task metadata&#10;&#10;Removed outdated comments from `.vscode/settings.json` and updated task metadata in `.idea/workspace.xml`. These updates also include the removal of the static_cell dependency and general cleanup of project settings.">
<option name="closed" value="true" />
<created>1725760534919</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1725760534919</updated>
</task>
<task id="LOCAL-00006" summary="Fix typo and update task metadata&#10;&#10;Corrected a typo in a comment in `main.rs` from &quot;full time&quot; to &quot;full type&quot;. Updated task metadata and comments in `.idea/workspace.xml` to reflect changes and ensure consistency.">
<option name="closed" value="true" />
<created>1725760574384</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1725760574384</updated>
</task>
<task id="LOCAL-00007" summary="rustfmt">
<option name="closed" value="true" />
<created>1725760714925</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1725760714925</updated>
</task>
<option name="localTasksCounter" value="8" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State />
</value>
</entry>
</map>
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="latest stable esp-hal + hello world" />
<MESSAGE value="latest git version of esp-hal + fix RustRover warnings + probe-rs&#10;use this command for installing working probe-rs:&#10;```&#10;cargo install probe-rs-tools \&#10; --git https://github.com/probe-rs/probe-rs \&#10; --rev 9bde591 --force --locked&#10;```" />
<MESSAGE value="Remove static_cell dependency&#10;&#10;Removed the static_cell dependency from Cargo.toml and Cargo.lock. Also cleaned up comments and metadata in main.rs and updated .idea project settings." />
<MESSAGE value="Remove outdated comments and update task metadata&#10;&#10;Removed obsolete comments from `.vscode/settings.json` and updated task metadata in `.idea/workspace.xml`. These changes include the removal of the static_cell dependency and cleanup of various project settings." />
<MESSAGE value="Update comments and task metadata&#10;&#10;Removed outdated comments from `.vscode/settings.json` and updated task metadata in `.idea/workspace.xml`. These updates also include the removal of the static_cell dependency and general cleanup of project settings." />
<MESSAGE value="Fix typo and update task metadata&#10;&#10;Corrected a typo in a comment in `main.rs` from &quot;full time&quot; to &quot;full type&quot;. Updated task metadata and comments in `.idea/workspace.xml` to reflect changes and ensure consistency." />
<MESSAGE value="rustfmt" />
<option name="LAST_COMMIT_MESSAGE" value="rustfmt" />
</component>
</project>

224
Cargo.lock generated
View file

@ -4,15 +4,15 @@ version = 3
[[package]]
name = "anyhow"
version = "1.0.87"
version = "1.0.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8"
checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8"
[[package]]
name = "autocfg"
version = "1.3.0"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "bare-metal"
@ -49,9 +49,9 @@ checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
[[package]]
name = "bytemuck"
version = "1.18.0"
version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
[[package]]
name = "byteorder"
@ -76,9 +76,9 @@ dependencies = [
[[package]]
name = "critical-section"
version = "1.1.3"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f64009896348fc5af4222e9cf7d7d82a95a256c634ebcf61c53e4ea461422242"
checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
[[package]]
name = "darling"
@ -101,7 +101,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim",
"syn 2.0.77",
"syn 2.0.85",
]
[[package]]
@ -112,7 +112,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core",
"quote",
"syn 2.0.77",
"syn 2.0.85",
]
[[package]]
@ -135,7 +135,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
"syn 2.0.77",
"syn 2.0.85",
]
[[package]]
@ -147,16 +147,6 @@ dependencies = [
"thiserror",
]
[[package]]
name = "defmt-rtt"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bab697b3dbbc1750b7c8b821aa6f6e7f2480b47a99bc057a2ed7b170ebef0c51"
dependencies = [
"critical-section",
"defmt",
]
[[package]]
name = "delegate"
version = "0.12.0"
@ -165,7 +155,7 @@ checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.77",
"syn 2.0.85",
]
[[package]]
@ -179,9 +169,9 @@ dependencies = [
[[package]]
name = "embassy-executor"
version = "0.6.0"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09ed0e24bdd4a5f4ff1b72ee4f264b1d23e179ea71a77d984b5fd24877a2bbe1"
checksum = "0fd0a2386252214d31d22400730e28e9c6bc62b346df62802e30a0bb3677e43b"
dependencies = [
"critical-section",
"defmt",
@ -191,14 +181,14 @@ dependencies = [
[[package]]
name = "embassy-executor-macros"
version = "0.5.0"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d4d4c0c34b32c2c653c9eecce1cefaf8539dd9a54e61deb5499254f01e2fcac2"
checksum = "c853e6bcad2d1c0811f4de404cef87363a1fa2535430cf76824c163cf75689ba"
dependencies = [
"darling",
"proc-macro2",
"quote",
"syn 2.0.77",
"syn 2.0.85",
]
[[package]]
@ -332,7 +322,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
"syn 2.0.77",
"syn 2.0.85",
]
[[package]]
@ -353,7 +343,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
"syn 2.0.77",
"syn 2.0.85",
]
[[package]]
@ -364,8 +354,8 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "esp-backtrace"
version = "0.14.1"
source = "git+https://github.com/esp-rs/esp-hal?rev=f2e0211c1b7b0c181374c0e85ac209fa3ddca796#f2e0211c1b7b0c181374c0e85ac209fa3ddca796"
version = "0.14.2"
source = "git+https://github.com/esp-rs/esp-hal?rev=b7224ef4c934f02e2dd229d1ceed024a132784d4#b7224ef4c934f02e2dd229d1ceed024a132784d4"
dependencies = [
"defmt",
"esp-build",
@ -375,17 +365,25 @@ dependencies = [
[[package]]
name = "esp-build"
version = "0.1.0"
source = "git+https://github.com/esp-rs/esp-hal?rev=f2e0211c1b7b0c181374c0e85ac209fa3ddca796#f2e0211c1b7b0c181374c0e85ac209fa3ddca796"
source = "git+https://github.com/esp-rs/esp-hal?rev=b7224ef4c934f02e2dd229d1ceed024a132784d4#b7224ef4c934f02e2dd229d1ceed024a132784d4"
dependencies = [
"quote",
"syn 2.0.77",
"syn 2.0.85",
"termcolor",
]
[[package]]
name = "esp-config"
version = "0.1.0"
source = "git+https://github.com/esp-rs/esp-hal?rev=b7224ef4c934f02e2dd229d1ceed024a132784d4#b7224ef4c934f02e2dd229d1ceed024a132784d4"
dependencies = [
"document-features",
]
[[package]]
name = "esp-hal"
version = "0.20.1"
source = "git+https://github.com/esp-rs/esp-hal?rev=f2e0211c1b7b0c181374c0e85ac209fa3ddca796#f2e0211c1b7b0c181374c0e85ac209fa3ddca796"
version = "0.21.1"
source = "git+https://github.com/esp-rs/esp-hal?rev=b7224ef4c934f02e2dd229d1ceed024a132784d4#b7224ef4c934f02e2dd229d1ceed024a132784d4"
dependencies = [
"basic-toml",
"bitfield",
@ -408,6 +406,7 @@ dependencies = [
"embedded-io-async",
"enumset",
"esp-build",
"esp-config",
"esp-hal-procmacros",
"esp-metadata",
"esp-riscv-rt",
@ -433,10 +432,9 @@ dependencies = [
[[package]]
name = "esp-hal-embassy"
version = "0.3.0"
source = "git+https://github.com/esp-rs/esp-hal?rev=f2e0211c1b7b0c181374c0e85ac209fa3ddca796#f2e0211c1b7b0c181374c0e85ac209fa3ddca796"
version = "0.4.0"
source = "git+https://github.com/esp-rs/esp-hal?rev=b7224ef4c934f02e2dd229d1ceed024a132784d4#b7224ef4c934f02e2dd229d1ceed024a132784d4"
dependencies = [
"cfg-if",
"critical-section",
"defmt",
"document-features",
@ -452,8 +450,8 @@ dependencies = [
[[package]]
name = "esp-hal-procmacros"
version = "0.13.0"
source = "git+https://github.com/esp-rs/esp-hal?rev=f2e0211c1b7b0c181374c0e85ac209fa3ddca796#f2e0211c1b7b0c181374c0e85ac209fa3ddca796"
version = "0.14.0"
source = "git+https://github.com/esp-rs/esp-hal?rev=b7224ef4c934f02e2dd229d1ceed024a132784d4#b7224ef4c934f02e2dd229d1ceed024a132784d4"
dependencies = [
"darling",
"document-features",
@ -462,13 +460,13 @@ dependencies = [
"proc-macro-error2",
"proc-macro2",
"quote",
"syn 2.0.77",
"syn 2.0.85",
]
[[package]]
name = "esp-metadata"
version = "0.3.0"
source = "git+https://github.com/esp-rs/esp-hal?rev=f2e0211c1b7b0c181374c0e85ac209fa3ddca796#f2e0211c1b7b0c181374c0e85ac209fa3ddca796"
version = "0.4.0"
source = "git+https://github.com/esp-rs/esp-hal?rev=b7224ef4c934f02e2dd229d1ceed024a132784d4#b7224ef4c934f02e2dd229d1ceed024a132784d4"
dependencies = [
"anyhow",
"basic-toml",
@ -478,16 +476,17 @@ dependencies = [
[[package]]
name = "esp-println"
version = "0.11.0"
source = "git+https://github.com/esp-rs/esp-hal?rev=f2e0211c1b7b0c181374c0e85ac209fa3ddca796#f2e0211c1b7b0c181374c0e85ac209fa3ddca796"
version = "0.12.0"
source = "git+https://github.com/esp-rs/esp-hal?rev=b7224ef4c934f02e2dd229d1ceed024a132784d4#b7224ef4c934f02e2dd229d1ceed024a132784d4"
dependencies = [
"esp-build",
"log",
]
[[package]]
name = "esp-riscv-rt"
version = "0.9.0"
source = "git+https://github.com/esp-rs/esp-hal?rev=f2e0211c1b7b0c181374c0e85ac209fa3ddca796#f2e0211c1b7b0c181374c0e85ac209fa3ddca796"
source = "git+https://github.com/esp-rs/esp-hal?rev=b7224ef4c934f02e2dd229d1ceed024a132784d4#b7224ef4c934f02e2dd229d1ceed024a132784d4"
dependencies = [
"document-features",
"riscv",
@ -497,8 +496,7 @@ dependencies = [
[[package]]
name = "esp32"
version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85287b57fae3e318b62fd860787b1ac85a5e7bf91ad43eb66837c5e567218009"
source = "git+https://github.com/esp-rs/esp-pacs.git?rev=48fd400#48fd400637ee4cd128a5299c5f789cdd46242b1a"
dependencies = [
"critical-section",
"defmt",
@ -509,8 +507,7 @@ dependencies = [
[[package]]
name = "esp32c2"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f9216c7ca4aefe4723d38a765e27801c4e92dec792870403466fc9adb438056"
source = "git+https://github.com/esp-rs/esp-pacs.git?rev=48fd400#48fd400637ee4cd128a5299c5f789cdd46242b1a"
dependencies = [
"critical-section",
"defmt",
@ -520,8 +517,7 @@ dependencies = [
[[package]]
name = "esp32c3"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3922cd13da83d070892c47e66f005856c62510952198c3008bc4f3b79f3e9623"
source = "git+https://github.com/esp-rs/esp-pacs.git?rev=48fd400#48fd400637ee4cd128a5299c5f789cdd46242b1a"
dependencies = [
"critical-section",
"defmt",
@ -531,8 +527,7 @@ dependencies = [
[[package]]
name = "esp32c6"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0c05e230022cf5a8d10e9bcdc4878c0886a3a5701a96d6763cb42562e42ecd7"
source = "git+https://github.com/esp-rs/esp-pacs.git?rev=48fd400#48fd400637ee4cd128a5299c5f789cdd46242b1a"
dependencies = [
"critical-section",
"defmt",
@ -542,8 +537,7 @@ dependencies = [
[[package]]
name = "esp32h2"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b05edd3bb766f66180b49c53b3503cf41b72936912a9552462a6a233ccdcac4"
source = "git+https://github.com/esp-rs/esp-pacs.git?rev=48fd400#48fd400637ee4cd128a5299c5f789cdd46242b1a"
dependencies = [
"critical-section",
"defmt",
@ -553,8 +547,7 @@ dependencies = [
[[package]]
name = "esp32s2"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9cc0ce1947afdcc4cb74dc8955e1575fcfa38931e0282ed171811dde0afc0fc6"
source = "git+https://github.com/esp-rs/esp-pacs.git?rev=48fd400#48fd400637ee4cd128a5299c5f789cdd46242b1a"
dependencies = [
"critical-section",
"defmt",
@ -565,8 +558,7 @@ dependencies = [
[[package]]
name = "esp32s3"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eae51703c44196b924910bd8ea7285e5a234d1a5aebcd0b60a997cd5081eb002"
source = "git+https://github.com/esp-rs/esp-pacs.git?rev=48fd400#48fd400637ee4cd128a5299c5f789cdd46242b1a"
dependencies = [
"critical-section",
"defmt",
@ -579,12 +571,12 @@ name = "esp_hal_probe"
version = "0.1.0"
dependencies = [
"defmt",
"defmt-rtt",
"embassy-executor",
"embassy-time",
"esp-backtrace",
"esp-hal",
"esp-hal-embassy",
"rtt-target",
]
[[package]]
@ -605,21 +597,21 @@ dependencies = [
[[package]]
name = "futures-core"
version = "0.3.30"
version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
[[package]]
name = "futures-task"
version = "0.3.30"
version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
[[package]]
name = "futures-util"
version = "0.3.30"
version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
dependencies = [
"futures-core",
"futures-task",
@ -644,9 +636,9 @@ dependencies = [
[[package]]
name = "hashbrown"
version = "0.14.5"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
[[package]]
name = "heapless"
@ -672,9 +664,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
[[package]]
name = "indexmap"
version = "2.5.0"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [
"equivalent",
"hashbrown",
@ -699,6 +691,12 @@ dependencies = [
"scopeguard",
]
[[package]]
name = "log"
version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
[[package]]
name = "memchr"
version = "2.7.4"
@ -707,9 +705,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
[[package]]
name = "minijinja"
version = "2.2.0"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d7d3e3a3eece1fa4618237ad41e1de855ced47eab705cec1c9a920e1d1c5aad"
checksum = "c9ca8daf4b0b4029777f1bc6e1aedd1aec7b74c276a43bc6f620a8e1a1c0a90e"
dependencies = [
"serde",
]
@ -752,9 +750,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
[[package]]
name = "pin-project-lite"
version = "0.2.14"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
[[package]]
name = "pin-utils"
@ -764,9 +762,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
[[package]]
name = "portable-atomic"
version = "1.7.0"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
[[package]]
name = "proc-macro-crate"
@ -820,14 +818,14 @@ dependencies = [
"proc-macro-error-attr2",
"proc-macro2",
"quote",
"syn 2.0.77",
"syn 2.0.85",
]
[[package]]
name = "proc-macro2"
version = "1.0.86"
version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
dependencies = [
"unicode-ident",
]
@ -865,20 +863,31 @@ dependencies = [
[[package]]
name = "riscv-rt-macros"
version = "0.2.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8d100d466dbb76681ef6a9386f3da9abc570d57394e86da0ba5af8c4408486d"
checksum = "30f19a85fe107b65031e0ba8ec60c34c2494069fe910d6c297f5e7cb5a6f76d0"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
"syn 2.0.85",
]
[[package]]
name = "rtt-target"
version = "0.6.0"
source = "git+https://github.com/probe-rs/rtt-target#5b7603b6114bb08385f71674b9d962471c221681"
dependencies = [
"critical-section",
"defmt",
"portable-atomic",
"ufmt-write",
]
[[package]]
name = "rustversion"
version = "1.0.17"
version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
[[package]]
name = "scopeguard"
@ -888,29 +897,29 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "serde"
version = "1.0.210"
version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.210"
version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.77",
"syn 2.0.85",
]
[[package]]
name = "serde_spanned"
version = "0.6.7"
version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
dependencies = [
"serde",
]
@ -964,7 +973,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.77",
"syn 2.0.85",
]
[[package]]
@ -974,15 +983,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]]
name = "syn"
version = "2.0.77"
version = "2.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
dependencies = [
"proc-macro2",
"quote",
@ -1000,22 +1008,22 @@ dependencies = [
[[package]]
name = "thiserror"
version = "1.0.63"
version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.63"
version = "1.0.65"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.77",
"syn 2.0.85",
]
[[package]]
@ -1041,9 +1049,9 @@ dependencies = [
[[package]]
name = "toml_edit"
version = "0.22.20"
version = "0.22.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
dependencies = [
"indexmap",
"serde",
@ -1166,9 +1174,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
version = "0.6.18"
version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
dependencies = [
"memchr",
]
@ -1187,7 +1195,7 @@ dependencies = [
[[package]]
name = "xtensa-lx-rt"
version = "0.17.1"
source = "git+https://github.com/esp-rs/esp-hal?rev=f2e0211c1b7b0c181374c0e85ac209fa3ddca796#f2e0211c1b7b0c181374c0e85ac209fa3ddca796"
source = "git+https://github.com/esp-rs/esp-hal?rev=b7224ef4c934f02e2dd229d1ceed024a132784d4#b7224ef4c934f02e2dd229d1ceed024a132784d4"
dependencies = [
"anyhow",
"bare-metal",
@ -1205,10 +1213,10 @@ dependencies = [
[[package]]
name = "xtensa-lx-rt-proc-macros"
version = "0.2.2"
source = "git+https://github.com/esp-rs/esp-hal?rev=f2e0211c1b7b0c181374c0e85ac209fa3ddca796#f2e0211c1b7b0c181374c0e85ac209fa3ddca796"
source = "git+https://github.com/esp-rs/esp-hal?rev=b7224ef4c934f02e2dd229d1ceed024a132784d4#b7224ef4c934f02e2dd229d1ceed024a132784d4"
dependencies = [
"darling",
"proc-macro2",
"quote",
"syn 2.0.77",
"syn 2.0.85",
]

View file

@ -1,34 +1,36 @@
[package]
name = "esp_hal_probe"
version = "0.1.0"
edition = "2021"
name = "esp_hal_snippets"
version = "0.1.0"
edition = "2021"
rust-version = "1.76.0"
[dependencies]
embassy-executor = { version = "0.6.1", features = ["defmt"] }
embassy-time = { version = "0.3", features = ["generic-queue-8"] }
esp-hal = { version = "0.21.1", features = ["defmt", "esp32c3"] }
esp-hal-embassy = { version = "0.4", features = ["defmt", "esp32c3"] }
defmt = "0.3"
defmt-rtt = "0.4"
embassy-executor = { version = "0.6", features = ["defmt"] }
embassy-time = { version = "0.3", features = ["generic-queue-8"] }
esp-backtrace = { version = "0.14", features = [
"esp32c3",
esp-backtrace = { version = "0.14.2", features = [
"defmt",
"esp32c3",
"exception-handler",
"panic-handler",
] }
esp-hal = { version = "0.20", features = ["esp32c3", "defmt"] }
esp-hal-embassy = { version = "0.3", features = ["esp32c3", "defmt"] }
rtt-target = { git = "https://github.com/probe-rs/rtt-target", features = [
"defmt",
] }
[profile.release]
codegen-units = 1
debug = 2
codegen-units = 1
debug = 2
debug-assertions = false
incremental = false
opt-level = 3
lto = 'fat'
overflow-checks = false
incremental = false
opt-level = 3
lto = 'fat'
overflow-checks = false
[patch.crates-io]
esp-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "f2e0211c1b7b0c181374c0e85ac209fa3ddca796" }
esp-hal-embassy = { git = "https://github.com/esp-rs/esp-hal", rev = "f2e0211c1b7b0c181374c0e85ac209fa3ddca796" }
esp-backtrace = { git = "https://github.com/esp-rs/esp-hal", rev = "f2e0211c1b7b0c181374c0e85ac209fa3ddca796" }
esp-hal = { git = "https://github.com/esp-rs/esp-hal", rev = "b7224ef4c934f02e2dd229d1ceed024a132784d4" }
esp-hal-embassy = { git = "https://github.com/esp-rs/esp-hal", rev = "b7224ef4c934f02e2dd229d1ceed024a132784d4" }
esp-backtrace = { git = "https://github.com/esp-rs/esp-hal", rev = "b7224ef4c934f02e2dd229d1ceed024a132784d4" }

22
Embed.toml Normal file
View file

@ -0,0 +1,22 @@
[default.general]
chip = "esp32c3"
[default.flashing]
enabled = true
[default.probe]
protocol = "Jtag"
[default.rtt]
enabled = true
up_channels = [
{ channel = 0, mode = "BlockIfFull", format = "Defmt", show_location = true, show_timestamps = true },
{ channel = 1, mode = "BlockIfFull", format = "String", show_timestamps = false },
{ channel = 2, mode = "BlockIfFull", format = "BinaryLE", show_timestamps = false, socket = "127.0.0.1:12346" },
]
down_channels = [{ channel = 0, mode = "BlockIfFull" }]
tabs = [
{ up_channel = 0, name = "Logs" },
{ up_channel = 1, down_channel = 0, name = "Terminal" },
{ up_channel = 2, name = "wav", hide = true },
]

View file

@ -4,9 +4,10 @@
use defmt::info;
use embassy_executor::Spawner;
use embassy_time::{Duration, Timer};
use esp_hal::{peripherals::TIMG0, timer::timg::TimerGroup, Blocking};
#[allow(unused)]
use {defmt_rtt as _, esp_backtrace as _};
use esp_backtrace as _;
use esp_hal::timer::timg::TimerGroup;
use rtt_target::{rtt_init, ChannelMode::*};
#[embassy_executor::task]
async fn run() {
@ -18,11 +19,33 @@ async fn run() {
#[esp_hal_embassy::main]
async fn main(spawner: Spawner) {
info!("Before peripheral init");
let peripherals = esp_hal::init(esp_hal::Config::default());
let channels = rtt_init! {
up: {
0: {
size: 1024,
name: "defmt",
}
1: {
size: 1024,
mode: BlockIfFull,
}
2: {
size: 4096,
mode: BlockIfFull,
}
}
down: {
0: {
size: 1024,
mode: BlockIfFull,
}
}
};
rtt_target::set_defmt_channel(channels.up.0);
rtt_target::set_print_channel(channels.up.1);
info!("Init!");
// RustRover shows error if I don't write full type here, that's weird
let timg0: TimerGroup<TIMG0, Blocking> = TimerGroup::new(peripherals.TIMG0);
let timg0 = TimerGroup::new(peripherals.TIMG0);
esp_hal_embassy::init(timg0.timer0);
spawner.spawn(run()).ok();