Merge pull request esp-rs#24 from arjanmels/feature-exceptions

Feature exceptions

Author: MabezDev

.gitignore

@@ -1,4 +1,5 @@
 /target
+procmacros/target
 **/*.rs.bk
 Cargo.lock
 .vscode/.cortex-debug*

.vscode/launch.json

@@ -5,41 +5,65 @@
     "version": "0.2.0",
     "configurations": [
         {
+            // more info at: https://github.com/Marus/cortex-debug/blob/master/package.json
+            "name": "Attach",
             "type": "cortex-debug",
+            "request": "attach", // attach instead of launch, because otherwise flash write is attempted, but fails
             "cwd": "${workspaceRoot}",
-            "executable": "target/xtensa-esp32-none-elf/debug/examples/${input:example}",
-            "name": "debug-with-svd",
-            "request": "launch",
+            "executable": "target/current.elf",
             "servertype": "openocd",
             "interface": "jtag",
             "svdFile": "../esp32/svd/esp32.svd",
-            // complains about not allowed,
-            // but it does work.. https://github.com/Marus/cortex-debug/issues/111#issuecomment-504778053
-            "serverpath": "${env:HOME}/programs/openocd-esp32/bin/openocd",
-            // for this to work you will have to run `ln -s xtensa-esp32-elf-gdb arm-none-eabi-gdb`
-            "toolchainPath": "${env:HOME}/programs/xtensa-esp32-elf/bin",
+            "toolchainPrefix": "xtensa-esp32-elf",
+            "openOCDPreConfigLaunchCommands": [
+                "set ESP_RTOS none"
+            ],
             "configFiles": [
                 "board/esp32-wrover-kit-3.3v.cfg"
             ],
+            "overrideAttachCommands": [
+                "set remote hardware-watchpoint-limit 2",
+                "mon halt",
+                "flushregs"
+            ],
+            "overrideRestartCommands": [
+                "mon reset halt",
+                "flushregs",
+                "c",
+            ]
         },
-    ],
-    "inputs": [
-        // requires Tasks Shell Input extension
         {
-            "id": "example",
-            "type": "command",
-            "command": "shellCommand.execute",
-            "args": {
-                "command": "egrep '\\[\\[example\\]\\]|name[ \t]+=' Cargo.toml | egrep '\\[\\[example\\]\\]' -A1 | egrep 'name[ \t]*=' | sed -E 's/name[ \t]*=[ \t]*//; s/\"//g'",
-                "cwd": "${workspaceFolder}/../esp32-hal"
-            }
+            // more info at: https://github.com/Marus/cortex-debug/blob/master/package.json
+            "name": "Flash & Launch",
+            "type": "cortex-debug",
+            "preLaunchTask": "Build Example",
+            "request": "launch", // attach instead of launch, because otherwise flash write is attempted, but fails
+            "cwd": "${workspaceRoot}",
+            "executable": "target/current.elf",
+            "servertype": "openocd",
+            "interface": "jtag",
+            "svdFile": "../esp32/svd/esp32.svd",
+            "toolchainPrefix": "xtensa-esp32-elf",
+            "openOCDPreConfigLaunchCommands": [
+                "set ESP_RTOS none"
+            ],
+            "configFiles": [
+                "board/esp32-wrover-kit-3.3v.cfg"
+            ],
+            "overrideLaunchCommands": [
+                "mon program_esp32 target/current.bin 0x10000 verify reset hex",
+                "flushregs",
+            ],
+            "postStartSessionCommands": [
+                "thb main",
+                "continue"
+            ],
+            "overrideRestartCommands": [
+                "mon program_esp32 target/current.bin 0x10000 verify reset hex",
+                "flushregs",
+                "thb main",
+                "continue",
+            ]
         },
-        // alternatively type in manually
-        {
-            "id": "examplePrompt",
-            "description": "Example:",
-            "default": "serial",
-            "type": "promptString"
-        }
     ]
 }

.vscode/tasks.json

@@ -4,9 +4,28 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "cargo xbuild --examples",
+            "label": "Build and Flash Example",
             "type": "shell",
-            "command": "cargo xbuild --examples",
+            "runOptions": {"reevaluateOnRerun": false},
+            "command": "./flash -t --example ${input:example}",
+            "problemMatcher": {
+                "base": "$rustc",
+                "fileLocation": [
+                    "relative"
+                ]
+            },
+            "group": "build",
+            "presentation": {
+                "reveal": "silent",
+                "panel": "shared",
+                "clear": true
+            },
+        },
+        {
+            "label": "Build Example",
+            "type": "shell",
+            "runOptions": {"reevaluateOnRerun": false},
+            "command": "./flash -s --example ${input:example}",
             "problemMatcher": {
                 "base": "$rustc",
                 "fileLocation": [
@@ -24,25 +43,26 @@
             }
         },
         {
-            "label": "cargo xdoc --open",
+            "label": "Compile All Examples",
             "type": "shell",
-            "command": "cargo xdoc --open",
+            "command": "cargo xbuild --examples",
             "problemMatcher": {
                 "base": "$rustc",
                 "fileLocation": [
                     "relative"
                 ]
             },
+            "group": "build",
             "presentation": {
-                "reveal": "silent",
+                "reveal": "always",
                 "panel": "shared",
                 "clear": true
             }
         },
         {
-            "label": "flash example",
+            "label": "Build Documentation",
             "type": "shell",
-            "command": "./flash -b 912600 -p /dev/ttyUSB1 -t ${input:example}",
+            "command": "cargo xdoc --open --all-features",
             "problemMatcher": {
                 "base": "$rustc",
                 "fileLocation": [
@@ -55,7 +75,7 @@
                 "panel": "shared",
                 "clear": true
             }
-        }
+        },
     ],
     "inputs": [
         // requires Tasks Shell Input extension
@@ -64,7 +84,7 @@
             "type": "command",
             "command": "shellCommand.execute",
             "args": {
-                "command": "egrep '\\[\\[example\\]\\]|name[ \t]+=' Cargo.toml | egrep '\\[\\[example\\]\\]' -A1 | egrep 'name[ \t]*=' | sed -E 's/name[ \t]*=[ \t]*//; s/\"//g'",
+                "command": "cargo check --offline --example 2>&1 |egrep '^ '| sed -E 's/[ \t]*//g'",
                 "cwd": "${workspaceFolder}/../esp32-hal"
             }
         },

Cargo.toml

@@ -4,25 +4,46 @@ version = "0.1.0"
 authors = ["Scott Mabin <[email protected]>", "Arjan Mels <[email protected]>"]
 edition = "2018"
 
+
+# Allow overriding of memcpy, memset, etc.
+[package.metadata.cargo-xbuild]
+memcpy = false
+
+
+[features]
+default=["mem"]
+
+# Place program completely in ram (needed when e.g. using only ROM bootloader, or for debugging)
+all_in_ram=[]
+
+# Allow use of external ram. Needs customized bootloader.
+external_ram=["esp32-hal-proc-macros/external_ram"]
+
+# Add support for Global Allocator
+alloc=["linked_list_allocator"]
+
+# Define memcpy, memset etc. as replacement of standard functions
+mem=[]
+
+
 [dependencies]
-xtensa-lx6-rt = { git = "https://github.com/esp-rs/xtensa-lx6-rt.git", rev = "62229c1" }
-esp32 = { version = "0.3.0" }
+esp32-hal-proc-macros = { path = "procmacros" }
+
+xtensa-lx6-rt = { version = "0.1.0" }
+esp32 = { version = "0.4.0" }
+bare-metal = "0.2"
 nb = "0.1.2"
 spin = "0.5.2"
 embedded-hal = { version = "0.2.3", features = ["unproven"] }
+linked_list_allocator = { version = "0.8.4", optional = true, default-features = false, features = ["alloc_ref"] }
 
 [dev-dependencies]
 panic-halt = "0.2.0"
-spin = "0.5"
-
-[[example]]
-name = "blinky"
-
-[[example]]
-name = "serial"
 
 [[example]]
-name = "rtccntl"
+name = "alloc"
+required-features = ["alloc"]
 
 [[example]]
-name = "multicore"
+name = "mem"
+required-features = ["alloc"]

build.rs

@@ -10,6 +10,16 @@ fn main() {
         .unwrap()
         .write_all(include_bytes!("memory.x"))
         .unwrap();
+
+    File::create(out.join("alias.x"))
+        .unwrap()
+        .write_all(if cfg!(feature = "all_in_ram") {
+            include_bytes!("ram.x")
+        } else {
+            include_bytes!("rom.x")
+        })
+        .unwrap();
+
     println!("cargo:rustc-link-search={}", out.display());
 
     // Only re-run the build script when memory.x is changed,