tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-10 14:03:39 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

main: check for error after starting the OCD daemon

Browse Source 
This replaces a panic with an informative error message if the right
tool (such as OpenOCD) is not installed.
This commit is contained in:
Ayke van Laethem
2020-02-24 15:05:48 +01:00
committed by Daniel Esteban
parent e83d1a02b6
commit b3d3debd4c
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main.go
+12 -3
View File
@@ -335,7 +335,10 @@ func FlashGDB(pkgName string, ocdOutput bool, options *compileopts.Options) erro
// GDB (to break the currently executing program). // GDB (to break the currently executing program).
setCommandAsDaemon(daemon) setCommandAsDaemon(daemon)
// Start now, and kill it on exit. // Start now, and kill it on exit.
daemon.Start() err = daemon.Start()
if err != nil {
return &commandError{"failed to run", daemon.Path, err}
}
defer func() { defer func() {
daemon.Process.Signal(os.Interrupt) daemon.Process.Signal(os.Interrupt)
// Maybe we should send a .Kill() after x seconds? // Maybe we should send a .Kill() after x seconds?
@@ -360,7 +363,10 @@ func FlashGDB(pkgName string, ocdOutput bool, options *compileopts.Options) erro
// GDB (to break the currently executing program). // GDB (to break the currently executing program).
setCommandAsDaemon(daemon) setCommandAsDaemon(daemon)
// Start now, and kill it on exit. // Start now, and kill it on exit.
daemon.Start() err = daemon.Start()
if err != nil {
return &commandError{"failed to run", daemon.Path, err}
}
defer func() { defer func() {
daemon.Process.Signal(os.Interrupt) daemon.Process.Signal(os.Interrupt)
// Maybe we should send a .Kill() after x seconds? // Maybe we should send a .Kill() after x seconds?
@@ -380,7 +386,10 @@ func FlashGDB(pkgName string, ocdOutput bool, options *compileopts.Options) erro
setCommandAsDaemon(daemon) setCommandAsDaemon(daemon)
// Start now, and kill it on exit. // Start now, and kill it on exit.
daemon.Start() err = daemon.Start()
if err != nil {
return &commandError{"failed to run", daemon.Path, err}
}
defer func() { defer func() {
daemon.Process.Signal(os.Interrupt) daemon.Process.Signal(os.Interrupt)
// Maybe we should send a .Kill() after x seconds? // Maybe we should send a .Kill() after x seconds?