Skip to content

Commit

Permalink
Separate TIMG into timer0, (timer1), wdt (esp-rs#104)
Browse files Browse the repository at this point in the history
* Separate TIMG into timer0, (timer1), wdt
* Apply suggestions from code review
* Remove left-over code
* Ignore settings.json
  • Loading branch information
bjoernQ authored Jul 20, 2022
1 parent 907d43e commit 147d8de
Show file tree
Hide file tree
Showing 71 changed files with 1,319 additions and 397 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ Cargo.lock

# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb

# Other
**/settings.json
23 changes: 23 additions & 0 deletions esp-hal-common/.vscode/esp32.settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"rust-analyzer.cargo.features": [
"esp32"
],
"rust-analyzer.cargo.allFeatures": false,
"editor.formatOnSave": false,
"rust-analyzer.checkOnSave.allTargets": true,
"rust-analyzer.checkOnSave.allFeatures": false,
"rust-analyzer.checkOnSave.overrideCommand": [
"cargo",
"check",
"--features",
"esp32",
"--message-format=json",
"-Z",
"build-std=core",
"--target",
"xtensa-esp32-none-elf",
"--examples",
"--lib",
],
"rust-analyzer.cargo.buildScripts.enable": false
}
File renamed without changes.
23 changes: 23 additions & 0 deletions esp-hal-common/.vscode/esp32s2.settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"rust-analyzer.cargo.features": [
"esp32s2"
],
"rust-analyzer.cargo.allFeatures": false,
"editor.formatOnSave": false,
"rust-analyzer.checkOnSave.allTargets": true,
"rust-analyzer.checkOnSave.allFeatures": false,
"rust-analyzer.checkOnSave.overrideCommand": [
"cargo",
"check",
"--features",
"esp32s2",
"--message-format=json",
"-Z",
"build-std=core",
"--target",
"xtensa-esp32s2-none-elf",
"--examples",
"--lib",
],
"rust-analyzer.cargo.buildScripts.enable": false
}
23 changes: 23 additions & 0 deletions esp-hal-common/.vscode/esp32s3.settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"rust-analyzer.cargo.features": [
"esp32s3"
],
"rust-analyzer.cargo.allFeatures": false,
"editor.formatOnSave": false,
"rust-analyzer.checkOnSave.allTargets": true,
"rust-analyzer.checkOnSave.allFeatures": false,
"rust-analyzer.checkOnSave.overrideCommand": [
"cargo",
"check",
"--features",
"esp32s3",
"--message-format=json",
"-Z",
"build-std=core",
"--target",
"xtensa-esp32s3-none-elf",
"--examples",
"--lib",
],
"rust-analyzer.cargo.buildScripts.enable": false
}
8 changes: 4 additions & 4 deletions esp-hal-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ smart-leds-trait = { version = "0.2.1", optional = true }
#
# Please note: for now we use git-dependencies from the `with_source` branch however we pin the dependency
# to specific commits.
esp32_pac = { package = "esp32", git = "https://github.com/esp-rs/esp-pacs.git", rev = "f5905f30f4796ed4da8fe333b6ed9700901c515b", optional = true }
esp32c3_pac = { package = "esp32c3", git = "https://github.com/esp-rs/esp-pacs.git", rev = "f5905f30f4796ed4da8fe333b6ed9700901c515b", optional = true }
esp32s2_pac = { package = "esp32s2", git = "https://github.com/esp-rs/esp-pacs.git", rev = "f5905f30f4796ed4da8fe333b6ed9700901c515b", optional = true }
esp32s3_pac = { package = "esp32s3", git = "https://github.com/esp-rs/esp-pacs.git", rev = "f5905f30f4796ed4da8fe333b6ed9700901c515b", optional = true }
esp32_pac = { package = "esp32", git = "https://github.com/esp-rs/esp-pacs.git", rev = "148dbb843cba3c311364aa994b8f3f773d15b04f", optional = true }
esp32c3_pac = { package = "esp32c3", git = "https://github.com/esp-rs/esp-pacs.git", rev = "148dbb843cba3c311364aa994b8f3f773d15b04f", optional = true }
esp32s2_pac = { package = "esp32s2", git = "https://github.com/esp-rs/esp-pacs.git", rev = "148dbb843cba3c311364aa994b8f3f773d15b04f", optional = true }
esp32s3_pac = { package = "esp32s3", git = "https://github.com/esp-rs/esp-pacs.git", rev = "148dbb843cba3c311364aa994b8f3f773d15b04f", optional = true }

[features]
esp32 = [ "esp32_pac/rt", "xtensa", "dual_core", "xtensa-lx-rt/esp32", "xtensa-lx/esp32", "smartled"]
Expand Down
Loading

0 comments on commit 147d8de

Please sign in to comment.