Merge pull request #229 from andresovela/master

Update Embed.toml of all examples to new defaults

Author: jonas-schievink

examples/blinky-button-demo/Embed.toml

@@ -41,7 +41,7 @@ log_level = "WARN"
 [default.rtt]
 # Whether or not an RTTUI should be opened after flashing.
 # This is exclusive and cannot be used with GDB at the moment.
-enabled = false
+enabled = true
 # A list of channel associations to be displayed. If left empty, all channels are displayed.
 channels = [
     # { up = 0, down = 0, name = "name", format = "String" }
@@ -60,4 +60,4 @@ log_path = "./logs"
 # This is exclusive and cannot be used with RTT at the moment.
 enabled = false
 # The connection string in host:port format wher the GDB server will open a socket.
-# gdb_connection_string
+# gdb_connection_string

examples/ccm-demo/Embed.toml

@@ -1,44 +1,61 @@
-[probe]
-# The index of the probe in the connected probe list.
-# probe_index = 0
+[default.probe]
+# USB vendor ID
+# usb_vid = "1337"
+# USB product ID
+# usb_pid = "1337"
+# Serial number
+# serial = "12345678"
 # The protocol to be used for communicating with the target.
 protocol = "Swd"
 # The speed in kHz of the data link to the target.
 # speed = 1337
 
-[flashing]
+[default.flashing]
 # Whether or not the target should be flashed.
 enabled = true
-# Whether or not the target should be halted after flashing.
+# Whether or not the target should be halted after reset.
+# DEPRECATED, moved to reset section
 halt_afterwards = false
 # Whether or not bytes erased but not rewritten with data from the ELF
 # should be restored with their contents before erasing.
 restore_unwritten_bytes = false
 # The path where an SVG of the assembled flash layout should be written to.
 # flash_layout_output_path = "out.svg"
 
-[general]
+[default.reset]
+# Whether or not the target should be reset.
+# When flashing is enabled as well, the target will be reset after flashing.
+enabled = true
+# Whether or not the target should be halted after reset.
+halt_afterwards = false
+
+[default.general]
 # The chip name of the chip to be debugged.
-#chip = "nRF52832"
+chip = "nRF52832_xxAA"
 # A list of chip descriptions to be loaded during runtime.
 chip_descriptions = []
-# The default log level to be used.
-log_level = "Warn"
+# The default log level to be used. Possible values are one of:
+#   "OFF", "ERROR", "WARN", "INFO", "DEBUG", "TRACE" 
+log_level = "WARN"
 
-[rtt]
+[default.rtt]
 # Whether or not an RTTUI should be opened after flashing.
 # This is exclusive and cannot be used with GDB at the moment.
 enabled = true
 # A list of channel associations to be displayed. If left empty, all channels are displayed.
 channels = [
-    # { up = 0, down = 0, name = "name" }
+    # { up = 0, down = 0, name = "name", format = "String" }
 ]
 # The duration in ms for which the logger should retry to attach to RTT.
 timeout = 3000
 # Whether timestamps in the RTTUI are enabled
 show_timestamps = true
+# Whether to save rtt history buffer on exit.
+log_enabled = false
+# Where to save rtt history buffer relative to manifest path.
+log_path = "./logs"
 
-[gdb]
+[default.gdb]
 # Whether or not a GDB server should be opened after flashing.
 # This is exclusive and cannot be used with RTT at the moment.
 enabled = false

examples/comp-demo/Embed.toml

@@ -1,6 +1,10 @@
 [default.probe]
-# The index of the probe in the connected probe list.
-# probe_index = 0
+# USB vendor ID
+# usb_vid = "1337"
+# USB product ID
+# usb_pid = "1337"
+# Serial number
+# serial = "12345678"
 # The protocol to be used for communicating with the target.
 protocol = "Swd"
 # The speed in kHz of the data link to the target.
@@ -9,38 +13,51 @@ protocol = "Swd"
 [default.flashing]
 # Whether or not the target should be flashed.
 enabled = true
-# Whether or not the target should be halted after flashing.
+# Whether or not the target should be halted after reset.
+# DEPRECATED, moved to reset section
 halt_afterwards = false
 # Whether or not bytes erased but not rewritten with data from the ELF
 # should be restored with their contents before erasing.
 restore_unwritten_bytes = false
 # The path where an SVG of the assembled flash layout should be written to.
 # flash_layout_output_path = "out.svg"
 
+[default.reset]
+# Whether or not the target should be reset.
+# When flashing is enabled as well, the target will be reset after flashing.
+enabled = true
+# Whether or not the target should be halted after reset.
+halt_afterwards = false
+
 [default.general]
 # The chip name of the chip to be debugged.
 chip = "nRF52840"
 # A list of chip descriptions to be loaded during runtime.
 chip_descriptions = []
-# The default log level to be used.
-log_level = "Warn"
+# The default log level to be used. Possible values are one of:
+#   "OFF", "ERROR", "WARN", "INFO", "DEBUG", "TRACE" 
+log_level = "WARN"
 
 [default.rtt]
 # Whether or not an RTTUI should be opened after flashing.
 # This is exclusive and cannot be used with GDB at the moment.
 enabled = true
 # A list of channel associations to be displayed. If left empty, all channels are displayed.
 channels = [
-    # { up = 0, down = 0, name = "name" }
+    # { up = 0, down = 0, name = "name", format = "String" }
 ]
 # The duration in ms for which the logger should retry to attach to RTT.
 timeout = 3000
 # Whether timestamps in the RTTUI are enabled
 show_timestamps = true
+# Whether to save rtt history buffer on exit.
+log_enabled = false
+# Where to save rtt history buffer relative to manifest path.
+log_path = "./logs"
 
 [default.gdb]
 # Whether or not a GDB server should be opened after flashing.
 # This is exclusive and cannot be used with RTT at the moment.
 enabled = false
 # The connection string in host:port format wher the GDB server will open a socket.
-# gdb_connection_string
+# gdb_connection_string

examples/ecb-demo/Embed.toml

@@ -1,44 +1,61 @@
-[probe]
-# The index of the probe in the connected probe list.
-# probe_index = 0
+[default.probe]
+# USB vendor ID
+# usb_vid = "1337"
+# USB product ID
+# usb_pid = "1337"
+# Serial number
+# serial = "12345678"
 # The protocol to be used for communicating with the target.
 protocol = "Swd"
 # The speed in kHz of the data link to the target.
 # speed = 1337
 
-[flashing]
+[default.flashing]
 # Whether or not the target should be flashed.
 enabled = true
-# Whether or not the target should be halted after flashing.
+# Whether or not the target should be halted after reset.
+# DEPRECATED, moved to reset section
 halt_afterwards = false
 # Whether or not bytes erased but not rewritten with data from the ELF
 # should be restored with their contents before erasing.
 restore_unwritten_bytes = false
 # The path where an SVG of the assembled flash layout should be written to.
 # flash_layout_output_path = "out.svg"
 
-[general]
+[default.reset]
+# Whether or not the target should be reset.
+# When flashing is enabled as well, the target will be reset after flashing.
+enabled = true
+# Whether or not the target should be halted after reset.
+halt_afterwards = false
+
+[default.general]
 # The chip name of the chip to be debugged.
-# chip = "nRF52832"
+chip = "nRF52832_xxAA"
 # A list of chip descriptions to be loaded during runtime.
 chip_descriptions = []
-# The default log level to be used.
-log_level = "Warn"
+# The default log level to be used. Possible values are one of:
+#   "OFF", "ERROR", "WARN", "INFO", "DEBUG", "TRACE" 
+log_level = "WARN"
 
-[rtt]
+[default.rtt]
 # Whether or not an RTTUI should be opened after flashing.
 # This is exclusive and cannot be used with GDB at the moment.
 enabled = true
 # A list of channel associations to be displayed. If left empty, all channels are displayed.
 channels = [
-    # { up = 0, down = 0, name = "name" }
+    # { up = 0, down = 0, name = "name", format = "String" }
 ]
 # The duration in ms for which the logger should retry to attach to RTT.
 timeout = 3000
 # Whether timestamps in the RTTUI are enabled
 show_timestamps = true
+# Whether to save rtt history buffer on exit.
+log_enabled = false
+# Where to save rtt history buffer relative to manifest path.
+log_path = "./logs"
 
-[gdb]
+[default.gdb]
 # Whether or not a GDB server should be opened after flashing.
 # This is exclusive and cannot be used with RTT at the moment.
 enabled = false

examples/gpiote-demo/Embed.toml

@@ -1,44 +1,61 @@
-[probe]
-# The index of the probe in the connected probe list.
-# probe_index = 0
+[default.probe]
+# USB vendor ID
+# usb_vid = "1337"
+# USB product ID
+# usb_pid = "1337"
+# Serial number
+# serial = "12345678"
 # The protocol to be used for communicating with the target.
 protocol = "Swd"
 # The speed in kHz of the data link to the target.
 # speed = 1337
 
-[flashing]
+[default.flashing]
 # Whether or not the target should be flashed.
 enabled = true
-# Whether or not the target should be halted after flashing.
+# Whether or not the target should be halted after reset.
+# DEPRECATED, moved to reset section
 halt_afterwards = false
 # Whether or not bytes erased but not rewritten with data from the ELF
 # should be restored with their contents before erasing.
 restore_unwritten_bytes = false
 # The path where an SVG of the assembled flash layout should be written to.
 # flash_layout_output_path = "out.svg"
 
-[general]
+[default.reset]
+# Whether or not the target should be reset.
+# When flashing is enabled as well, the target will be reset after flashing.
+enabled = true
+# Whether or not the target should be halted after reset.
+halt_afterwards = false
+
+[default.general]
 # The chip name of the chip to be debugged.
 chip = "nRF52840"
 # A list of chip descriptions to be loaded during runtime.
 chip_descriptions = []
-# The default log level to be used.
-log_level = "Warn"
+# The default log level to be used. Possible values are one of:
+#   "OFF", "ERROR", "WARN", "INFO", "DEBUG", "TRACE" 
+log_level = "WARN"
 
-[rtt]
+[default.rtt]
 # Whether or not an RTTUI should be opened after flashing.
 # This is exclusive and cannot be used with GDB at the moment.
 enabled = true
 # A list of channel associations to be displayed. If left empty, all channels are displayed.
 channels = [
-    # { up = 0, down = 0, name = "name" }
+    # { up = 0, down = 0, name = "name", format = "String" }
 ]
 # The duration in ms for which the logger should retry to attach to RTT.
 timeout = 3000
 # Whether timestamps in the RTTUI are enabled
 show_timestamps = true
+# Whether to save rtt history buffer on exit.
+log_enabled = false
+# Where to save rtt history buffer relative to manifest path.
+log_path = "./logs"
 
-[gdb]
+[default.gdb]
 # Whether or not a GDB server should be opened after flashing.
 # This is exclusive and cannot be used with RTT at the moment.
 enabled = false

examples/i2s-controller-demo/Embed.toml

@@ -1,21 +1,63 @@
 [default.probe]
+# USB vendor ID
+# usb_vid = "1337"
+# USB product ID
+# usb_pid = "1337"
+# Serial number
+# serial = "12345678"
+# The protocol to be used for communicating with the target.
 protocol = "Swd"
+# The speed in kHz of the data link to the target.
+# speed = 1337
 
 [default.flashing]
+# Whether or not the target should be flashed.
 enabled = true
+# Whether or not the target should be halted after reset.
+# DEPRECATED, moved to reset section
 halt_afterwards = false
+# Whether or not bytes erased but not rewritten with data from the ELF
+# should be restored with their contents before erasing.
 restore_unwritten_bytes = false
+# The path where an SVG of the assembled flash layout should be written to.
+# flash_layout_output_path = "out.svg"
+
+[default.reset]
+# Whether or not the target should be reset.
+# When flashing is enabled as well, the target will be reset after flashing.
+enabled = true
+# Whether or not the target should be halted after reset.
+halt_afterwards = false
 
 [default.general]
+# The chip name of the chip to be debugged.
 chip = "nRF52840"
+# A list of chip descriptions to be loaded during runtime.
 chip_descriptions = []
-log_level = "Warn"
+# The default log level to be used. Possible values are one of:
+#   "OFF", "ERROR", "WARN", "INFO", "DEBUG", "TRACE" 
+log_level = "WARN"
 
 [default.rtt]
+# Whether or not an RTTUI should be opened after flashing.
+# This is exclusive and cannot be used with GDB at the moment.
 enabled = true
-channels = []
+# A list of channel associations to be displayed. If left empty, all channels are displayed.
+channels = [
+    # { up = 0, down = 0, name = "name", format = "String" }
+]
+# The duration in ms for which the logger should retry to attach to RTT.
 timeout = 3000
+# Whether timestamps in the RTTUI are enabled
 show_timestamps = true
+# Whether to save rtt history buffer on exit.
+log_enabled = false
+# Where to save rtt history buffer relative to manifest path.
+log_path = "./logs"
 
 [default.gdb]
-enabled = false
+# Whether or not a GDB server should be opened after flashing.
+# This is exclusive and cannot be used with RTT at the moment.
+enabled = false
+# The connection string in host:port format wher the GDB server will open a socket.
+# gdb_connection_string