Tidying
This commit is contained in:
@@ -1118,12 +1118,12 @@ void EdbgAvr8Interface::activatePhysical(bool applyExternalReset) {
|
|||||||
if (response.getResponseId() == Avr8ResponseId::FAILED) {
|
if (response.getResponseId() == Avr8ResponseId::FAILED) {
|
||||||
if (!applyExternalReset) {
|
if (!applyExternalReset) {
|
||||||
// Try again with external reset applied
|
// Try again with external reset applied
|
||||||
Logger::debug("Failed to activate physical interface on AVR8 target - retrying with external reset applied.");
|
Logger::debug("Failed to activate physical interface on AVR8 target "
|
||||||
|
"- retrying with external reset applied.");
|
||||||
return this->activatePhysical(true);
|
return this->activatePhysical(true);
|
||||||
|
|
||||||
} else {
|
|
||||||
throw Avr8CommandFailure("AVR8 Activate physical interface command failed", response);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
throw Avr8CommandFailure("AVR8 Activate physical interface command failed", response);
|
||||||
}
|
}
|
||||||
|
|
||||||
this->physicalInterfaceActivated = true;
|
this->physicalInterfaceActivated = true;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace Bloom::Events
|
|||||||
class BreakpointRemovedOnTarget: public Event
|
class BreakpointRemovedOnTarget: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::BREAKPOINT_REMOVED_ON_TARGET;
|
static constexpr EventType type = EventType::BREAKPOINT_REMOVED_ON_TARGET;
|
||||||
static inline const std::string name = "BreakpointRemovedOnTarget";
|
static inline const std::string name = "BreakpointRemovedOnTarget";
|
||||||
|
|
||||||
[[nodiscard]] EventType getType() const override {
|
[[nodiscard]] EventType getType() const override {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace Bloom::Events
|
|||||||
class BreakpointSetOnTarget: public Event
|
class BreakpointSetOnTarget: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::BREAKPOINT_SET_ON_TARGET;
|
static constexpr EventType type = EventType::BREAKPOINT_SET_ON_TARGET;
|
||||||
static inline const std::string name = "BreakpointSetOnTarget";
|
static inline const std::string name = "BreakpointSetOnTarget";
|
||||||
|
|
||||||
[[nodiscard]] EventType getType() const override {
|
[[nodiscard]] EventType getType() const override {
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ namespace Bloom::Events
|
|||||||
class DebugServerThreadStateChanged: public Event
|
class DebugServerThreadStateChanged: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::DEBUG_SERVER_THREAD_STATE_CHANGED;
|
static constexpr EventType type = EventType::DEBUG_SERVER_THREAD_STATE_CHANGED;
|
||||||
static inline const std::string name = "DebugServerThreadStateChanged";
|
static inline const std::string name = "DebugServerThreadStateChanged";
|
||||||
|
|
||||||
explicit DebugServerThreadStateChanged(ThreadState state): state(state) {};
|
explicit DebugServerThreadStateChanged(ThreadState state): state(state) {};
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace Bloom::Events
|
|||||||
class DebugSessionFinished: public Event
|
class DebugSessionFinished: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::DEBUG_SESSION_FINISHED;
|
static constexpr EventType type = EventType::DEBUG_SESSION_FINISHED;
|
||||||
static inline const std::string name = "DebugSessionFinished";
|
static inline const std::string name = "DebugSessionFinished";
|
||||||
|
|
||||||
[[nodiscard]] EventType getType() const override {
|
[[nodiscard]] EventType getType() const override {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace Bloom::Events
|
|||||||
class DebugSessionStarted: public Event
|
class DebugSessionStarted: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::DEBUG_SESSION_STARTED;
|
static constexpr EventType type = EventType::DEBUG_SESSION_STARTED;
|
||||||
static inline const std::string name = "DebugSessionStarted";
|
static inline const std::string name = "DebugSessionStarted";
|
||||||
|
|
||||||
[[nodiscard]] EventType getType() const override {
|
[[nodiscard]] EventType getType() const override {
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ namespace Bloom::Events
|
|||||||
QDateTime createdTimestamp = DateTime::currentDateTime();
|
QDateTime createdTimestamp = DateTime::currentDateTime();
|
||||||
std::optional<int> correlationId;
|
std::optional<int> correlationId;
|
||||||
|
|
||||||
static inline EventType type = EventType::GENERIC;
|
static constexpr EventType type = EventType::GENERIC;
|
||||||
static inline const std::string name = "GenericEvent";
|
static inline const std::string name = "GenericEvent";
|
||||||
|
|
||||||
[[nodiscard]] virtual std::string getName() const {
|
[[nodiscard]] virtual std::string getName() const {
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ namespace Bloom::Events
|
|||||||
public:
|
public:
|
||||||
using TargetControllerResponseType = TargetDescriptorExtracted;
|
using TargetControllerResponseType = TargetDescriptorExtracted;
|
||||||
|
|
||||||
static inline EventType type = EventType::EXTRACT_TARGET_DESCRIPTOR;
|
static constexpr EventType type = EventType::EXTRACT_TARGET_DESCRIPTOR;
|
||||||
static inline const std::string name = "ExtractTargetDescriptor";
|
static inline const std::string name = "ExtractTargetDescriptor";
|
||||||
|
|
||||||
[[nodiscard]] EventType getType() const override {
|
[[nodiscard]] EventType getType() const override {
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ namespace Bloom::Events
|
|||||||
public:
|
public:
|
||||||
explicit InsightThreadStateChanged(ThreadState state): state(state) {};
|
explicit InsightThreadStateChanged(ThreadState state): state(state) {};
|
||||||
|
|
||||||
static inline EventType type = EventType::INSIGHT_THREAD_STATE_CHANGED;
|
static constexpr EventType type = EventType::INSIGHT_THREAD_STATE_CHANGED;
|
||||||
static inline const std::string name = "InsightThreadStateChanged";
|
static inline const std::string name = "InsightThreadStateChanged";
|
||||||
|
|
||||||
[[nodiscard]] EventType getType() const override {
|
[[nodiscard]] EventType getType() const override {
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ namespace Bloom::Events
|
|||||||
class MemoryRetrievedFromTarget: public Event
|
class MemoryRetrievedFromTarget: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::MEMORY_RETRIEVED_FROM_TARGET;
|
static constexpr EventType type = EventType::MEMORY_RETRIEVED_FROM_TARGET;
|
||||||
static inline const std::string name = "MemoryRetrievedFromTarget";
|
static inline const std::string name = "MemoryRetrievedFromTarget";
|
||||||
Targets::TargetMemoryBuffer data;
|
Targets::TargetMemoryBuffer data;
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ namespace Bloom::Events
|
|||||||
class MemoryWrittenToTarget: public Event
|
class MemoryWrittenToTarget: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::MEMORY_WRITTEN_TO_TARGET;
|
static constexpr EventType type = EventType::MEMORY_WRITTEN_TO_TARGET;
|
||||||
static inline const std::string name = "MemoryWrittenToTarget";
|
static inline const std::string name = "MemoryWrittenToTarget";
|
||||||
|
|
||||||
MemoryWrittenToTarget() = default;
|
MemoryWrittenToTarget() = default;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace Bloom::Events
|
|||||||
class ProgramCounterSetOnTarget: public Event
|
class ProgramCounterSetOnTarget: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::PROGRAM_COUNTER_SET_ON_TARGET;
|
static constexpr EventType type = EventType::PROGRAM_COUNTER_SET_ON_TARGET;
|
||||||
static inline const std::string name = "ProgramCounterSetOnTarget";
|
static inline const std::string name = "ProgramCounterSetOnTarget";
|
||||||
|
|
||||||
[[nodiscard]] EventType getType() const override {
|
[[nodiscard]] EventType getType() const override {
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ namespace Bloom::Events
|
|||||||
class RegistersRetrievedFromTarget: public Event
|
class RegistersRetrievedFromTarget: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::REGISTERS_RETRIEVED_FROM_TARGET;
|
static constexpr EventType type = EventType::REGISTERS_RETRIEVED_FROM_TARGET;
|
||||||
static inline const std::string name = "RegistersRetrievedFromTarget";
|
static inline const std::string name = "RegistersRetrievedFromTarget";
|
||||||
Targets::TargetRegisters registers;
|
Targets::TargetRegisters registers;
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ namespace Bloom::Events
|
|||||||
class RegistersWrittenToTarget: public Event
|
class RegistersWrittenToTarget: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::REGISTERS_WRITTEN_TO_TARGET;
|
static constexpr EventType type = EventType::REGISTERS_WRITTEN_TO_TARGET;
|
||||||
static inline const std::string name = "RegistersWrittenToTarget";
|
static inline const std::string name = "RegistersWrittenToTarget";
|
||||||
|
|
||||||
Targets::TargetRegisters registers;
|
Targets::TargetRegisters registers;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ namespace Bloom::Events
|
|||||||
public:
|
public:
|
||||||
using TargetControllerResponseType = BreakpointRemovedOnTarget;
|
using TargetControllerResponseType = BreakpointRemovedOnTarget;
|
||||||
|
|
||||||
static inline EventType type = EventType::REMOVE_BREAKPOINT_ON_TARGET;
|
static constexpr EventType type = EventType::REMOVE_BREAKPOINT_ON_TARGET;
|
||||||
static inline const std::string name = "RemoveBreakpointOnTarget";
|
static inline const std::string name = "RemoveBreakpointOnTarget";
|
||||||
Targets::TargetBreakpoint breakpoint;
|
Targets::TargetBreakpoint breakpoint;
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ namespace Bloom::Events
|
|||||||
public:
|
public:
|
||||||
using TargetControllerResponseType = TargetControllerStateReported;
|
using TargetControllerResponseType = TargetControllerStateReported;
|
||||||
|
|
||||||
static inline EventType type = EventType::REPORT_TARGET_CONTROLLER_STATE;
|
static constexpr EventType type = EventType::REPORT_TARGET_CONTROLLER_STATE;
|
||||||
static inline const std::string name = "ReportTargetControllerState";
|
static inline const std::string name = "ReportTargetControllerState";
|
||||||
|
|
||||||
ReportTargetControllerState() {};
|
ReportTargetControllerState() {};
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace Bloom::Events
|
|||||||
class ResetTarget: public Event
|
class ResetTarget: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::RESET_TARGET;
|
static constexpr EventType type = EventType::RESET_TARGET;
|
||||||
static inline const std::string name = "ResetTargetEvent";
|
static inline const std::string name = "ResetTargetEvent";
|
||||||
|
|
||||||
[[nodiscard]] EventType getType() const override {
|
[[nodiscard]] EventType getType() const override {
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ namespace Bloom::Events
|
|||||||
public:
|
public:
|
||||||
using TargetControllerResponseType = TargetExecutionResumed;
|
using TargetControllerResponseType = TargetExecutionResumed;
|
||||||
|
|
||||||
static inline EventType type = EventType::RESUME_TARGET_EXECUTION;
|
static constexpr EventType type = EventType::RESUME_TARGET_EXECUTION;
|
||||||
static inline const std::string name = "ResumeTargetExecutionEvent";
|
static inline const std::string name = "ResumeTargetExecutionEvent";
|
||||||
std::optional<std::uint32_t> fromProgramCounter;
|
std::optional<std::uint32_t> fromProgramCounter;
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ namespace Bloom::Events
|
|||||||
public:
|
public:
|
||||||
using TargetControllerResponseType = MemoryRetrievedFromTarget;
|
using TargetControllerResponseType = MemoryRetrievedFromTarget;
|
||||||
|
|
||||||
static inline EventType type = EventType::RETRIEVE_MEMORY_FROM_TARGET;
|
static constexpr EventType type = EventType::RETRIEVE_MEMORY_FROM_TARGET;
|
||||||
static inline const std::string name = "RetrieveMemoryFromTarget";
|
static inline const std::string name = "RetrieveMemoryFromTarget";
|
||||||
Targets::TargetMemoryType memoryType = Targets::TargetMemoryType::RAM;
|
Targets::TargetMemoryType memoryType = Targets::TargetMemoryType::RAM;
|
||||||
std::uint32_t startAddress = 0;
|
std::uint32_t startAddress = 0;
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ namespace Bloom::Events
|
|||||||
public:
|
public:
|
||||||
using TargetControllerResponseType = RegistersRetrievedFromTarget;
|
using TargetControllerResponseType = RegistersRetrievedFromTarget;
|
||||||
|
|
||||||
static inline EventType type = EventType::RETRIEVE_REGISTERS_FROM_TARGET;
|
static constexpr EventType type = EventType::RETRIEVE_REGISTERS_FROM_TARGET;
|
||||||
static inline const std::string name = "RetrieveRegistersFromTarget";
|
static inline const std::string name = "RetrieveRegistersFromTarget";
|
||||||
Targets::TargetRegisterDescriptors descriptors;
|
Targets::TargetRegisterDescriptors descriptors;
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ namespace Bloom::Events
|
|||||||
public:
|
public:
|
||||||
using TargetControllerResponseType = StackPointerRetrievedFromTarget;
|
using TargetControllerResponseType = StackPointerRetrievedFromTarget;
|
||||||
|
|
||||||
static inline EventType type = EventType::RETRIEVE_STACK_POINTER_FROM_TARGET;
|
static constexpr EventType type = EventType::RETRIEVE_STACK_POINTER_FROM_TARGET;
|
||||||
static inline const std::string name = "RetrieveStackPointerFromTarget";
|
static inline const std::string name = "RetrieveStackPointerFromTarget";
|
||||||
|
|
||||||
[[nodiscard]] EventType getType() const override {
|
[[nodiscard]] EventType getType() const override {
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ namespace Bloom::Events
|
|||||||
public:
|
public:
|
||||||
using TargetControllerResponseType = TargetPinStatesRetrieved;
|
using TargetControllerResponseType = TargetPinStatesRetrieved;
|
||||||
|
|
||||||
static inline EventType type = EventType::RETRIEVE_TARGET_PIN_STATES;
|
static constexpr EventType type = EventType::RETRIEVE_TARGET_PIN_STATES;
|
||||||
static inline const std::string name = "RetrieveTargetPinStates";
|
static inline const std::string name = "RetrieveTargetPinStates";
|
||||||
int variantId = 0;
|
int variantId = 0;
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ namespace Bloom::Events
|
|||||||
public:
|
public:
|
||||||
using TargetControllerResponseType = BreakpointSetOnTarget;
|
using TargetControllerResponseType = BreakpointSetOnTarget;
|
||||||
|
|
||||||
static inline EventType type = EventType::SET_BREAKPOINT_ON_TARGET;
|
static constexpr EventType type = EventType::SET_BREAKPOINT_ON_TARGET;
|
||||||
static inline const std::string name = "SetBreakpointOnTarget";
|
static inline const std::string name = "SetBreakpointOnTarget";
|
||||||
Targets::TargetBreakpoint breakpoint;
|
Targets::TargetBreakpoint breakpoint;
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ namespace Bloom::Events
|
|||||||
public:
|
public:
|
||||||
using TargetControllerResponseType = ProgramCounterSetOnTarget;
|
using TargetControllerResponseType = ProgramCounterSetOnTarget;
|
||||||
|
|
||||||
static inline EventType type = EventType::SET_PROGRAM_COUNTER_ON_TARGET;
|
static constexpr EventType type = EventType::SET_PROGRAM_COUNTER_ON_TARGET;
|
||||||
static inline const std::string name = "SetProgramCounterOnTarget";
|
static inline const std::string name = "SetProgramCounterOnTarget";
|
||||||
std::uint32_t address = 0;
|
std::uint32_t address = 0;
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ namespace Bloom::Events
|
|||||||
public:
|
public:
|
||||||
using TargetControllerResponseType = TargetPinStatesRetrieved;
|
using TargetControllerResponseType = TargetPinStatesRetrieved;
|
||||||
|
|
||||||
static inline EventType type = EventType::SET_TARGET_PIN_STATE;
|
static constexpr EventType type = EventType::SET_TARGET_PIN_STATE;
|
||||||
static inline const std::string name = "SetTargetPinState";
|
static inline const std::string name = "SetTargetPinState";
|
||||||
Targets::TargetPinDescriptor pinDescriptor;
|
Targets::TargetPinDescriptor pinDescriptor;
|
||||||
Targets::TargetPinState pinState;
|
Targets::TargetPinState pinState;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace Bloom::Events
|
|||||||
class ShutdownApplication: public Event
|
class ShutdownApplication: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::SHUTDOWN_APPLICATION;
|
static constexpr EventType type = EventType::SHUTDOWN_APPLICATION;
|
||||||
static inline const std::string name = "ShutdownApplicationEvent";
|
static inline const std::string name = "ShutdownApplicationEvent";
|
||||||
|
|
||||||
[[nodiscard]] EventType getType() const override {
|
[[nodiscard]] EventType getType() const override {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace Bloom::Events
|
|||||||
class ShutdownDebugServer: public Event
|
class ShutdownDebugServer: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::SHUTDOWN_DEBUG_SERVER;
|
static constexpr EventType type = EventType::SHUTDOWN_DEBUG_SERVER;
|
||||||
static inline const std::string name = "ShutdownDebugServer";
|
static inline const std::string name = "ShutdownDebugServer";
|
||||||
|
|
||||||
[[nodiscard]] EventType getType() const override {
|
[[nodiscard]] EventType getType() const override {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace Bloom::Events
|
|||||||
class ShutdownTargetController: public Event
|
class ShutdownTargetController: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::SHUTDOWN_TARGET_CONTROLLER;
|
static constexpr EventType type = EventType::SHUTDOWN_TARGET_CONTROLLER;
|
||||||
static inline const std::string name = "ShutdownTargetControllerEvent";
|
static inline const std::string name = "ShutdownTargetControllerEvent";
|
||||||
|
|
||||||
[[nodiscard]] EventType getType() const override {
|
[[nodiscard]] EventType getType() const override {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace Bloom::Events
|
|||||||
class StackPointerRetrievedFromTarget: public Event
|
class StackPointerRetrievedFromTarget: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::STACK_POINTER_RETRIEVED_FROM_TARGET;
|
static constexpr EventType type = EventType::STACK_POINTER_RETRIEVED_FROM_TARGET;
|
||||||
static inline const std::string name = "StackPointerRetrievedFromTarget";
|
static inline const std::string name = "StackPointerRetrievedFromTarget";
|
||||||
std::uint32_t stackPointer = 0;
|
std::uint32_t stackPointer = 0;
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ namespace Bloom::Events
|
|||||||
public:
|
public:
|
||||||
using TargetControllerResponseType = TargetExecutionResumed;
|
using TargetControllerResponseType = TargetExecutionResumed;
|
||||||
|
|
||||||
static inline EventType type = EventType::STEP_TARGET_EXECUTION;
|
static constexpr EventType type = EventType::STEP_TARGET_EXECUTION;
|
||||||
static inline const std::string name = "StepTargetExecution";
|
static inline const std::string name = "StepTargetExecution";
|
||||||
std::optional<std::uint32_t> fromProgramCounter;
|
std::optional<std::uint32_t> fromProgramCounter;
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ namespace Bloom::Events
|
|||||||
public:
|
public:
|
||||||
using TargetControllerResponseType = TargetExecutionStopped;
|
using TargetControllerResponseType = TargetExecutionStopped;
|
||||||
|
|
||||||
static inline EventType type = EventType::STOP_TARGET_EXECUTION;
|
static constexpr EventType type = EventType::STOP_TARGET_EXECUTION;
|
||||||
static inline const std::string name = "StopTargetExecution";
|
static inline const std::string name = "StopTargetExecution";
|
||||||
|
|
||||||
[[nodiscard]] EventType getType() const override {
|
[[nodiscard]] EventType getType() const override {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace Bloom::Events
|
|||||||
class TargetControllerErrorOccurred: public Event
|
class TargetControllerErrorOccurred: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::TARGET_CONTROLLER_ERROR_OCCURRED;
|
static constexpr EventType type = EventType::TARGET_CONTROLLER_ERROR_OCCURRED;
|
||||||
static inline const std::string name = "TargetControllerErrorOccurred";
|
static inline const std::string name = "TargetControllerErrorOccurred";
|
||||||
|
|
||||||
std::string errorMessage;
|
std::string errorMessage;
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ namespace Bloom::Events
|
|||||||
class TargetControllerStateReported: public Event
|
class TargetControllerStateReported: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::TARGET_CONTROLLER_STATE_REPORTED;
|
static constexpr EventType type = EventType::TARGET_CONTROLLER_STATE_REPORTED;
|
||||||
static inline const std::string name = "TargetControllerStateReported";
|
static inline const std::string name = "TargetControllerStateReported";
|
||||||
|
|
||||||
TargetControllerState state;
|
TargetControllerState state;
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ namespace Bloom::Events
|
|||||||
class TargetControllerThreadStateChanged: public Event
|
class TargetControllerThreadStateChanged: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::TARGET_CONTROLLER_THREAD_STATE_CHANGED;
|
static constexpr EventType type = EventType::TARGET_CONTROLLER_THREAD_STATE_CHANGED;
|
||||||
static inline const std::string name = "TargetControllerThreadStateChanged";
|
static inline const std::string name = "TargetControllerThreadStateChanged";
|
||||||
|
|
||||||
explicit TargetControllerThreadStateChanged(ThreadState state): state(state) {};
|
explicit TargetControllerThreadStateChanged(ThreadState state): state(state) {};
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ namespace Bloom::Events
|
|||||||
class TargetDescriptorExtracted: public Event
|
class TargetDescriptorExtracted: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::TARGET_DESCRIPTOR_EXTRACTED;
|
static constexpr EventType type = EventType::TARGET_DESCRIPTOR_EXTRACTED;
|
||||||
static inline const std::string name = "TargetDescriptorExtracted";
|
static inline const std::string name = "TargetDescriptorExtracted";
|
||||||
Targets::TargetDescriptor targetDescriptor;
|
Targets::TargetDescriptor targetDescriptor;
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ namespace Bloom::Events
|
|||||||
class TargetExecutionResumed: public Event
|
class TargetExecutionResumed: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::TARGET_EXECUTION_RESUMED;
|
static constexpr EventType type = EventType::TARGET_EXECUTION_RESUMED;
|
||||||
static inline const std::string name = "TargetExecutionResumed";
|
static inline const std::string name = "TargetExecutionResumed";
|
||||||
|
|
||||||
TargetExecutionResumed() = default;
|
TargetExecutionResumed() = default;
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ namespace Bloom::Events
|
|||||||
class TargetExecutionStopped: public Event
|
class TargetExecutionStopped: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::TARGET_EXECUTION_STOPPED;
|
static constexpr EventType type = EventType::TARGET_EXECUTION_STOPPED;
|
||||||
static inline const std::string name = "TargetExecutionStopped";
|
static inline const std::string name = "TargetExecutionStopped";
|
||||||
std::uint32_t programCounter;
|
std::uint32_t programCounter;
|
||||||
Targets::TargetBreakCause breakCause;
|
Targets::TargetBreakCause breakCause;
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ namespace Bloom::Events
|
|||||||
class TargetPinStatesRetrieved: public Event
|
class TargetPinStatesRetrieved: public Event
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static inline EventType type = EventType::TARGET_PIN_STATES_RETRIEVED;
|
static constexpr EventType type = EventType::TARGET_PIN_STATES_RETRIEVED;
|
||||||
static inline const std::string name = "TargetPinStatesRetrieved";
|
static inline const std::string name = "TargetPinStatesRetrieved";
|
||||||
int variantId = 0;
|
int variantId = 0;
|
||||||
std::map<int, Targets::TargetPinState> pinSatesByNumber;
|
std::map<int, Targets::TargetPinState> pinSatesByNumber;
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ namespace Bloom::Events
|
|||||||
public:
|
public:
|
||||||
using TargetControllerResponseType = MemoryWrittenToTarget;
|
using TargetControllerResponseType = MemoryWrittenToTarget;
|
||||||
|
|
||||||
static inline EventType type = EventType::WRITE_MEMORY_TO_TARGET;
|
static constexpr EventType type = EventType::WRITE_MEMORY_TO_TARGET;
|
||||||
static inline const std::string name = "WriteMemoryToTarget";
|
static inline const std::string name = "WriteMemoryToTarget";
|
||||||
Targets::TargetMemoryType memoryType = Targets::TargetMemoryType::RAM;
|
Targets::TargetMemoryType memoryType = Targets::TargetMemoryType::RAM;
|
||||||
std::uint32_t startAddress = 0;
|
std::uint32_t startAddress = 0;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ namespace Bloom::Events
|
|||||||
public:
|
public:
|
||||||
using TargetControllerResponseType = RegistersWrittenToTarget;
|
using TargetControllerResponseType = RegistersWrittenToTarget;
|
||||||
|
|
||||||
static inline EventType type = EventType::WRITE_REGISTERS_TO_TARGET;
|
static constexpr EventType type = EventType::WRITE_REGISTERS_TO_TARGET;
|
||||||
static inline const std::string name = "WriteRegistersToTarget";
|
static inline const std::string name = "WriteRegistersToTarget";
|
||||||
Targets::TargetRegisters registers;
|
Targets::TargetRegisters registers;
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ namespace Bloom
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
InsightWorkerTaskState state;
|
InsightWorkerTaskState state = InsightWorkerTaskState::CREATED;
|
||||||
|
|
||||||
InsightWorkerTask(): QObject(nullptr) {};
|
InsightWorkerTask(): QObject(nullptr) {};
|
||||||
|
|
||||||
|
|||||||
@@ -203,7 +203,7 @@ TargetRegisters Avr8::readRegisters(TargetRegisterDescriptors descriptors) {
|
|||||||
TargetRegisters registers;
|
TargetRegisters registers;
|
||||||
|
|
||||||
for (auto registerDescriptorIt = descriptors.begin(); registerDescriptorIt != descriptors.end();) {
|
for (auto registerDescriptorIt = descriptors.begin(); registerDescriptorIt != descriptors.end();) {
|
||||||
auto& descriptor = *registerDescriptorIt;
|
const auto& descriptor = *registerDescriptorIt;
|
||||||
|
|
||||||
if (descriptor.type == TargetRegisterType::PROGRAM_COUNTER) {
|
if (descriptor.type == TargetRegisterType::PROGRAM_COUNTER) {
|
||||||
registers.push_back(this->getProgramCounterRegister());
|
registers.push_back(this->getProgramCounterRegister());
|
||||||
|
|||||||
Reference in New Issue
Block a user