Tidying
This commit is contained in:
@@ -45,7 +45,7 @@ ACTION=="add", ATTR{idVendor}=="04d8", ATTR{idProduct}=="9019", MODE="0666"
|
|||||||
# WCH-LinkE
|
# WCH-LinkE
|
||||||
ACTION=="add", ATTR{idVendor}=="1a86", ATTR{idProduct}=="8010", MODE="0666"
|
ACTION=="add", ATTR{idVendor}=="1a86", ATTR{idProduct}=="8010", MODE="0666"
|
||||||
|
|
||||||
# WCH-LinkE IAP mode
|
# WCH-LinkE (IAP mode)
|
||||||
ACTION=="add", ATTR{idVendor}=="4348", ATTR{idProduct}=="55e0", MODE="0666"
|
ACTION=="add", ATTR{idVendor}=="4348", ATTR{idProduct}=="55e0", MODE="0666"
|
||||||
|
|
||||||
LABEL="bloom_end"
|
LABEL="bloom_end"
|
||||||
|
|||||||
@@ -37,14 +37,12 @@ int Application::run() {
|
|||||||
const auto commandHandlerIt = commandHandlersByCommandName.find(firstArg);
|
const auto commandHandlerIt = commandHandlersByCommandName.find(firstArg);
|
||||||
|
|
||||||
if (commandHandlerIt != commandHandlersByCommandName.end()) {
|
if (commandHandlerIt != commandHandlersByCommandName.end()) {
|
||||||
// User has passed an argument that maps to a command callback - invoke the callback and shutdown
|
|
||||||
const auto returnValue = commandHandlerIt->second();
|
const auto returnValue = commandHandlerIt->second();
|
||||||
|
|
||||||
this->shutdown();
|
this->shutdown();
|
||||||
return returnValue;
|
return returnValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the first argument didn't map to a command, we assume it's an environment name
|
|
||||||
this->selectedEnvironmentName = std::move(firstArg);
|
this->selectedEnvironmentName = std::move(firstArg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -74,15 +74,6 @@
|
|||||||
|
|
||||||
namespace DebugServer::Gdb
|
namespace DebugServer::Gdb
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
* The GdbRspDebugServer is an implementation of the GDB Remote Serial Protocol.
|
|
||||||
*
|
|
||||||
* This server employs TCP/IP sockets to interface with GDB clients. The listening address and port can be
|
|
||||||
* configured in the user's project config file.
|
|
||||||
*
|
|
||||||
* See https://sourceware.org/gdb/onlinedocs/gdb/Remote-Protocol.html for more info on the GDB Remote Serial
|
|
||||||
* Protocol.
|
|
||||||
*/
|
|
||||||
template<
|
template<
|
||||||
typename GdbTargetDescriptorType,
|
typename GdbTargetDescriptorType,
|
||||||
typename DebugSessionType,
|
typename DebugSessionType,
|
||||||
@@ -288,10 +279,10 @@ namespace DebugServer::Gdb
|
|||||||
Logger::debug("GDB RSP interrupted");
|
Logger::debug("GDB RSP interrupted");
|
||||||
return;
|
return;
|
||||||
|
|
||||||
} catch (const ::Exceptions::FatalErrorException& exception) {
|
} catch (const ::Exceptions::FatalErrorException&) {
|
||||||
Logger::error("Fatal error occurred - closing connection");
|
Logger::error("Fatal error occurred - closing connection");
|
||||||
this->endDebugSession();
|
this->endDebugSession();
|
||||||
throw exception;
|
throw;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -567,9 +558,9 @@ namespace DebugServer::Gdb
|
|||||||
Logger::debug("GDB RSP interrupted");
|
Logger::debug("GDB RSP interrupted");
|
||||||
return;
|
return;
|
||||||
|
|
||||||
} catch (const ::Exceptions::FatalErrorException& exception) {
|
} catch (const ::Exceptions::FatalErrorException&) {
|
||||||
this->endDebugSession();
|
this->endDebugSession();
|
||||||
throw exception;
|
throw;
|
||||||
|
|
||||||
} catch (const ::Exceptions::Exception& exception) {
|
} catch (const ::Exceptions::Exception& exception) {
|
||||||
Logger::error("Failed to handle target execution state changed event - " + exception.getMessage());
|
Logger::error("Failed to handle target execution state changed event - " + exception.getMessage());
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#include "WchLinkBase.hpp"
|
#include "WchLinkBase.hpp"
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
|
#include <array>
|
||||||
|
|
||||||
#include "Protocols/WchLink/WchLinkInterface.hpp"
|
#include "Protocols/WchLink/WchLinkInterface.hpp"
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,5 @@
|
|||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
#include "Application.hpp"
|
#include "Application.hpp"
|
||||||
|
|
||||||
int main(int argc, char* argv[]) {
|
int main(int argc, char* argv[]) {
|
||||||
auto application = Application(std::vector<std::string>(argv, argv + argc));
|
return Application{{argv, argv + argc}}.run();
|
||||||
return application.run();
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user