This commit is contained in:
Nav
2022-10-12 21:26:09 +01:00
parent 87e230c589
commit 0c1b0211e8
43 changed files with 44 additions and 44 deletions

View File

@@ -11,7 +11,7 @@ namespace Bloom::Events
{
public:
static constexpr EventType type = EventType::DEBUG_SERVER_THREAD_STATE_CHANGED;
static inline const std::string name = "DebugServerThreadStateChanged";
static const inline std::string name = "DebugServerThreadStateChanged";
explicit DebugServerThreadStateChanged(ThreadState state)
: state(state)

View File

@@ -10,7 +10,7 @@ namespace Bloom::Events
{
public:
static constexpr EventType type = EventType::DEBUG_SESSION_FINISHED;
static inline const std::string name = "DebugSessionFinished";
static const inline std::string name = "DebugSessionFinished";
[[nodiscard]] EventType getType() const override {
return DebugSessionFinished::type;

View File

@@ -10,7 +10,7 @@ namespace Bloom::Events
{
public:
static constexpr EventType type = EventType::DEBUG_SESSION_STARTED;
static inline const std::string name = "DebugSessionStarted";
static const inline std::string name = "DebugSessionStarted";
[[nodiscard]] EventType getType() const override {
return DebugSessionStarted::type;

View File

@@ -41,7 +41,7 @@ namespace Bloom::Events
QDateTime createdTimestamp = DateTime::currentDateTime();
static constexpr EventType type = EventType::GENERIC;
static inline const std::string name = "GenericEvent";
static const inline std::string name = "GenericEvent";
Event() = default;
virtual ~Event() = default;

View File

@@ -13,7 +13,7 @@ namespace Bloom::Events
explicit InsightThreadStateChanged(ThreadState state): state(state) {};
static constexpr EventType type = EventType::INSIGHT_THREAD_STATE_CHANGED;
static inline const std::string name = "InsightThreadStateChanged";
static const inline std::string name = "InsightThreadStateChanged";
[[nodiscard]] EventType getType() const override {
return InsightThreadStateChanged::type;

View File

@@ -11,7 +11,7 @@ namespace Bloom::Events
{
public:
static constexpr EventType type = EventType::MEMORY_WRITTEN_TO_TARGET;
static inline const std::string name = "MemoryWrittenToTarget";
static const inline std::string name = "MemoryWrittenToTarget";
Targets::TargetMemoryType memoryType;
Targets::TargetMemoryAddress startAddress;

View File

@@ -10,7 +10,7 @@ namespace Bloom::Events
{
public:
static constexpr EventType type = EventType::PROGRAMMING_MODE_DISABLED;
static inline const std::string name = "ProgrammingModeDisabled";
static const inline std::string name = "ProgrammingModeDisabled";
[[nodiscard]] EventType getType() const override {
return ProgrammingModeDisabled::type;

View File

@@ -10,7 +10,7 @@ namespace Bloom::Events
{
public:
static constexpr EventType type = EventType::PROGRAMMING_MODE_ENABLED;
static inline const std::string name = "ProgrammingModeEnabled";
static const inline std::string name = "ProgrammingModeEnabled";
[[nodiscard]] EventType getType() const override {
return ProgrammingModeEnabled::type;

View File

@@ -11,7 +11,7 @@ namespace Bloom::Events
{
public:
static constexpr EventType type = EventType::REGISTERS_WRITTEN_TO_TARGET;
static inline const std::string name = "RegistersWrittenToTarget";
static const inline std::string name = "RegistersWrittenToTarget";
Targets::TargetRegisters registers;

View File

@@ -10,7 +10,7 @@ namespace Bloom::Events
{
public:
static constexpr EventType type = EventType::SHUTDOWN_APPLICATION;
static inline const std::string name = "ShutdownApplicationEvent";
static const inline std::string name = "ShutdownApplicationEvent";
[[nodiscard]] EventType getType() const override {
return ShutdownApplication::type;

View File

@@ -10,7 +10,7 @@ namespace Bloom::Events
{
public:
static constexpr EventType type = EventType::SHUTDOWN_DEBUG_SERVER;
static inline const std::string name = "ShutdownDebugServer";
static const inline std::string name = "ShutdownDebugServer";
[[nodiscard]] EventType getType() const override {
return ShutdownDebugServer::type;

View File

@@ -10,7 +10,7 @@ namespace Bloom::Events
{
public:
static constexpr EventType type = EventType::SHUTDOWN_TARGET_CONTROLLER;
static inline const std::string name = "ShutdownTargetControllerEvent";
static const inline std::string name = "ShutdownTargetControllerEvent";
[[nodiscard]] EventType getType() const override {
return ShutdownTargetController::type;

View File

@@ -10,7 +10,7 @@ namespace Bloom::Events
{
public:
static constexpr EventType type = EventType::TARGET_CONTROLLER_ERROR_OCCURRED;
static inline const std::string name = "TargetControllerErrorOccurred";
static const inline std::string name = "TargetControllerErrorOccurred";
std::string errorMessage;

View File

@@ -11,7 +11,7 @@ namespace Bloom::Events
{
public:
static constexpr EventType type = EventType::TARGET_CONTROLLER_STATE_CHANGED;
static inline const std::string name = "TargetControllerStateChanged";
static const inline std::string name = "TargetControllerStateChanged";
TargetController::TargetControllerState state;
explicit TargetControllerStateChanged(TargetController::TargetControllerState state)

View File

@@ -11,7 +11,7 @@ namespace Bloom::Events
{
public:
static constexpr EventType type = EventType::TARGET_CONTROLLER_THREAD_STATE_CHANGED;
static inline const std::string name = "TargetControllerThreadStateChanged";
static const inline std::string name = "TargetControllerThreadStateChanged";
explicit TargetControllerThreadStateChanged(ThreadState state)
: state(state)

View File

@@ -10,7 +10,7 @@ namespace Bloom::Events
{
public:
static constexpr EventType type = EventType::TARGET_EXECUTION_RESUMED;
static inline const std::string name = "TargetExecutionResumed";
static const inline std::string name = "TargetExecutionResumed";
bool stepping = false;

View File

@@ -14,7 +14,7 @@ namespace Bloom::Events
{
public:
static constexpr EventType type = EventType::TARGET_EXECUTION_STOPPED;
static inline const std::string name = "TargetExecutionStopped";
static const inline std::string name = "TargetExecutionStopped";
Targets::TargetProgramCounter programCounter;
Targets::TargetBreakCause breakCause;

View File

@@ -10,7 +10,7 @@ namespace Bloom::Events
{
public:
static constexpr EventType type = EventType::TARGET_RESET;
static inline const std::string name = "TargetReset";
static const inline std::string name = "TargetReset";
[[nodiscard]] EventType getType() const override {
return TargetReset::type;

View File

@@ -52,7 +52,7 @@ namespace Bloom::Widgets
QComboBox* dataTypeInput = nullptr;
QComboBox* endiannessInput = nullptr;
static inline const std::map<QString, DataTypeOption> dataTypeOptionsByName = std::map<
static const inline std::map<QString, DataTypeOption> dataTypeOptionsByName = std::map<
QString, DataTypeOption
>({
{"other", DataTypeOption("Other", MemoryRegionDataType::UNKNOWN)},
@@ -61,7 +61,7 @@ namespace Bloom::Widgets
{"ascii", DataTypeOption("ASCII String", MemoryRegionDataType::ASCII_STRING)},
});
static inline const std::map<QString, EndiannessOption> endiannessOptionsByName = std::map<
static const inline std::map<QString, EndiannessOption> endiannessOptionsByName = std::map<
QString, EndiannessOption
>({
{"little", EndiannessOption("Little-endian", Targets::TargetMemoryEndianness::LITTLE)},

View File

@@ -83,7 +83,7 @@ namespace Bloom::Widgets
Label* addressRangeLabel = new Label(this);
Label* timeLabel = new Label(this);
static inline const std::map<QString, AddressRangeTypeOption> addressRangeTypeOptionsByName = std::map<
static const inline std::map<QString, AddressRangeTypeOption> addressRangeTypeOptionsByName = std::map<
QString, AddressRangeTypeOption
>({
{"absolute", AddressRangeTypeOption("Absolute", AddressType::ABSOLUTE)},

View File

@@ -21,7 +21,7 @@ namespace Bloom::TargetController::Commands
CommandIdType id = ++(Command::lastCommandId);
static constexpr CommandType type = CommandType::GENERIC;
static inline const std::string name = "GenericCommand";
static const inline std::string name = "GenericCommand";
Command() = default;
virtual ~Command() = default;

View File

@@ -8,7 +8,7 @@ namespace Bloom::TargetController::Commands
{
public:
static constexpr CommandType type = CommandType::DISABLE_PROGRAMMING_MODE;
static inline const std::string name = "DisableProgrammingMode";
static const inline std::string name = "DisableProgrammingMode";
DisableProgrammingMode() = default;

View File

@@ -8,7 +8,7 @@ namespace Bloom::TargetController::Commands
{
public:
static constexpr CommandType type = CommandType::ENABLE_PROGRAMMING_MODE;
static inline const std::string name = "EnableProgrammingMode";
static const inline std::string name = "EnableProgrammingMode";
EnableProgrammingMode() = default;

View File

@@ -12,7 +12,7 @@ namespace Bloom::TargetController::Commands
using SuccessResponseType = Responses::State;
static constexpr CommandType type = CommandType::GET_STATE;
static inline const std::string name = "GetState";
static const inline std::string name = "GetState";
[[nodiscard]] CommandType getType() const override {
return GetState::type;

View File

@@ -12,7 +12,7 @@ namespace Bloom::TargetController::Commands
using SuccessResponseType = Responses::TargetDescriptor;
static constexpr CommandType type = CommandType::GET_TARGET_DESCRIPTOR;
static inline const std::string name = "GetTargetDescriptor";
static const inline std::string name = "GetTargetDescriptor";
[[nodiscard]] CommandType getType() const override {
return GetTargetDescriptor::type;

View File

@@ -12,7 +12,7 @@ namespace Bloom::TargetController::Commands
using SuccessResponseType = Responses::TargetPinStates;
static constexpr CommandType type = CommandType::GET_TARGET_PIN_STATES;
static inline const std::string name = "GetTargetPinStates";
static const inline std::string name = "GetTargetPinStates";
int variantId = 0;

View File

@@ -12,7 +12,7 @@ namespace Bloom::TargetController::Commands
using SuccessResponseType = Responses::TargetProgramCounter;
static constexpr CommandType type = CommandType::GET_TARGET_PROGRAM_COUNTER;
static inline const std::string name = "GetTargetProgramCounter";
static const inline std::string name = "GetTargetProgramCounter";
[[nodiscard]] CommandType getType() const override {
return GetTargetProgramCounter::type;

View File

@@ -12,7 +12,7 @@ namespace Bloom::TargetController::Commands
using SuccessResponseType = Responses::TargetStackPointer;
static constexpr CommandType type = CommandType::GET_TARGET_STACK_POINTER;
static inline const std::string name = "GetTargetStackPointer";
static const inline std::string name = "GetTargetStackPointer";
[[nodiscard]] CommandType getType() const override {
return GetTargetStackPointer::type;

View File

@@ -11,7 +11,7 @@ namespace Bloom::TargetController::Commands
using SuccessResponseType = Responses::TargetState;
static constexpr CommandType type = CommandType::GET_TARGET_STATE;
static inline const std::string name = "GetTargetState";
static const inline std::string name = "GetTargetState";
[[nodiscard]] CommandType getType() const override {
return GetTargetState::type;

View File

@@ -16,7 +16,7 @@ namespace Bloom::TargetController::Commands
using SuccessResponseType = Responses::TargetMemoryRead;
static constexpr CommandType type = CommandType::READ_TARGET_MEMORY;
static inline const std::string name = "ReadTargetMemory";
static const inline std::string name = "ReadTargetMemory";
Targets::TargetMemoryType memoryType;
Targets::TargetMemoryAddress startAddress;

View File

@@ -13,7 +13,7 @@ namespace Bloom::TargetController::Commands
using SuccessResponseType = Responses::TargetRegistersRead;
static constexpr CommandType type = CommandType::READ_TARGET_REGISTERS;
static inline const std::string name = "ReadTargetRegisters";
static const inline std::string name = "ReadTargetRegisters";
Targets::TargetRegisterDescriptors descriptors;

View File

@@ -10,7 +10,7 @@ namespace Bloom::TargetController::Commands
{
public:
static constexpr CommandType type = CommandType::REMOVE_BREAKPOINT;
static inline const std::string name = "RemoveBreakpoint";
static const inline std::string name = "RemoveBreakpoint";
Targets::TargetBreakpoint breakpoint;

View File

@@ -8,7 +8,7 @@ namespace Bloom::TargetController::Commands
{
public:
static constexpr CommandType type = CommandType::RESET_TARGET;
static inline const std::string name = "ResetTarget";
static const inline std::string name = "ResetTarget";
[[nodiscard]] CommandType getType() const override {
return ResetTarget::type;

View File

@@ -8,7 +8,7 @@ namespace Bloom::TargetController::Commands
{
public:
static constexpr CommandType type = CommandType::RESUME;
static inline const std::string name = "Resume";
static const inline std::string name = "Resume";
[[nodiscard]] CommandType getType() const override {
return Resume::type;

View File

@@ -12,7 +12,7 @@ namespace Bloom::TargetController::Commands
{
public:
static constexpr CommandType type = CommandType::RESUME_TARGET_EXECUTION;
static inline const std::string name = "ResumeTargetExecution";
static const inline std::string name = "ResumeTargetExecution";
std::optional<Targets::TargetProgramCounter> fromProgramCounter;

View File

@@ -10,7 +10,7 @@ namespace Bloom::TargetController::Commands
{
public:
static constexpr CommandType type = CommandType::SET_BREAKPOINT;
static inline const std::string name = "SetBreakpoint";
static const inline std::string name = "SetBreakpoint";
Targets::TargetBreakpoint breakpoint;

View File

@@ -10,7 +10,7 @@ namespace Bloom::TargetController::Commands
{
public:
static constexpr CommandType type = CommandType::SET_TARGET_PIN_STATE;
static inline const std::string name = "SetTargetPinState";
static const inline std::string name = "SetTargetPinState";
Targets::TargetPinDescriptor pinDescriptor;
Targets::TargetPinState pinState;

View File

@@ -12,7 +12,7 @@ namespace Bloom::TargetController::Commands
{
public:
static constexpr CommandType type = CommandType::SET_TARGET_PROGRAM_COUNTER;
static inline const std::string name = "SetTargetProgramCounter";
static const inline std::string name = "SetTargetProgramCounter";
Targets::TargetProgramCounter address = 0;

View File

@@ -12,7 +12,7 @@ namespace Bloom::TargetController::Commands
{
public:
static constexpr CommandType type = CommandType::STEP_TARGET_EXECUTION;
static inline const std::string name = "StepTargetExecution";
static const inline std::string name = "StepTargetExecution";
std::optional<Targets::TargetProgramCounter> fromProgramCounter;

View File

@@ -8,7 +8,7 @@ namespace Bloom::TargetController::Commands
{
public:
static constexpr CommandType type = CommandType::STOP_TARGET_EXECUTION;
static inline const std::string name = "StopTargetExecution";
static const inline std::string name = "StopTargetExecution";
[[nodiscard]] CommandType getType() const override {
return StopTargetExecution::type;

View File

@@ -8,7 +8,7 @@ namespace Bloom::TargetController::Commands
{
public:
static constexpr CommandType type = CommandType::SUSPEND;
static inline const std::string name = "Suspend";
static const inline std::string name = "Suspend";
[[nodiscard]] CommandType getType() const override {
return Suspend::type;

View File

@@ -11,7 +11,7 @@ namespace Bloom::TargetController::Commands
{
public:
static constexpr CommandType type = CommandType::WRITE_TARGET_MEMORY;
static inline const std::string name = "WriteTargetMemory";
static const inline std::string name = "WriteTargetMemory";
Targets::TargetMemoryType memoryType;
Targets::TargetMemoryAddress startAddress;

View File

@@ -10,7 +10,7 @@ namespace Bloom::TargetController::Commands
{
public:
static constexpr CommandType type = CommandType::WRITE_TARGET_REGISTERS;
static inline const std::string name = "WriteTargetRegisters";
static const inline std::string name = "WriteTargetRegisters";
Targets::TargetRegisters registers;