diff --git a/build/scripts/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php b/build/scripts/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php
index 2378017c..d1ab00c9 100644
--- a/build/scripts/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php
+++ b/build/scripts/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php
@@ -145,19 +145,19 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
$this->signature = new Signature();
if (isset($signaturePropertyGroup->propertiesMappedByName['signature0'])) {
- $this->signature->byteZero = $this->rawValueToInt(
+ $this->signature->byteZero = $this->stringToInt(
$signaturePropertyGroup->propertiesMappedByName['signature0']->value
);
}
if (isset($signaturePropertyGroup->propertiesMappedByName['signature1'])) {
- $this->signature->byteOne = $this->rawValueToInt(
+ $this->signature->byteOne = $this->stringToInt(
$signaturePropertyGroup->propertiesMappedByName['signature1']->value
);
}
if (isset($signaturePropertyGroup->propertiesMappedByName['signature2'])) {
- $this->signature->byteTwo = $this->rawValueToInt(
+ $this->signature->byteTwo = $this->stringToInt(
$signaturePropertyGroup->propertiesMappedByName['signature2']->value
);
}
@@ -166,71 +166,71 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
$ispParamPropertyGroup = $this->propertyGroupsByName['isp_interface'] ?? null;
if (!empty($ispParamPropertyGroup)) {
if (isset($ispParamPropertyGroup->propertiesMappedByName['ispenterprogmode_timeout'])) {
- $this->ispProgramModeTimeout = $this->rawValueToInt(
+ $this->ispProgramModeTimeout = $this->stringToInt(
$ispParamPropertyGroup->propertiesMappedByName['ispenterprogmode_timeout']->value
);
}
if (isset($ispParamPropertyGroup->propertiesMappedByName['ispenterprogmode_stabdelay'])) {
- $this->ispProgramModeStabilizationDelay = $this->rawValueToInt(
+ $this->ispProgramModeStabilizationDelay = $this->stringToInt(
$ispParamPropertyGroup->propertiesMappedByName['ispenterprogmode_stabdelay']->value
);
}
if (isset($ispParamPropertyGroup->propertiesMappedByName['ispenterprogmode_cmdexedelay'])) {
- $this->ispProgramModeCommandExecutionDelay = $this->rawValueToInt(
+ $this->ispProgramModeCommandExecutionDelay = $this->stringToInt(
$ispParamPropertyGroup->propertiesMappedByName['ispenterprogmode_cmdexedelay']->value
);
}
if (isset($ispParamPropertyGroup->propertiesMappedByName['ispenterprogmode_synchloops'])) {
- $this->ispProgramModeSyncLoops = $this->rawValueToInt(
+ $this->ispProgramModeSyncLoops = $this->stringToInt(
$ispParamPropertyGroup->propertiesMappedByName['ispenterprogmode_synchloops']->value
);
}
if (isset($ispParamPropertyGroup->propertiesMappedByName['ispenterprogmode_bytedelay'])) {
- $this->ispProgramModeByteDelay = $this->rawValueToInt(
+ $this->ispProgramModeByteDelay = $this->stringToInt(
$ispParamPropertyGroup->propertiesMappedByName['ispenterprogmode_bytedelay']->value
);
}
if (isset($ispParamPropertyGroup->propertiesMappedByName['ispenterprogmode_pollvalue'])) {
- $this->ispProgramModePollValue = $this->rawValueToInt(
+ $this->ispProgramModePollValue = $this->stringToInt(
$ispParamPropertyGroup->propertiesMappedByName['ispenterprogmode_pollvalue']->value
);
}
if (isset($ispParamPropertyGroup->propertiesMappedByName['ispenterprogmode_pollindex'])) {
- $this->ispProgramModePollIndex = $this->rawValueToInt(
+ $this->ispProgramModePollIndex = $this->stringToInt(
$ispParamPropertyGroup->propertiesMappedByName['ispenterprogmode_pollindex']->value
);
}
if (isset($ispParamPropertyGroup->propertiesMappedByName['ispleaveprogmode_predelay'])) {
- $this->ispProgramModePreDelay = $this->rawValueToInt(
+ $this->ispProgramModePreDelay = $this->stringToInt(
$ispParamPropertyGroup->propertiesMappedByName['ispleaveprogmode_predelay']->value
);
}
if (isset($ispParamPropertyGroup->propertiesMappedByName['ispleaveprogmode_postdelay'])) {
- $this->ispProgramModePostDelay = $this->rawValueToInt(
+ $this->ispProgramModePostDelay = $this->stringToInt(
$ispParamPropertyGroup->propertiesMappedByName['ispleaveprogmode_postdelay']->value
);
}
if (isset($ispParamPropertyGroup->propertiesMappedByName['ispreadsign_pollindex'])) {
- $this->ispReadSignaturePollIndex = $this->rawValueToInt(
+ $this->ispReadSignaturePollIndex = $this->stringToInt(
$ispParamPropertyGroup->propertiesMappedByName['ispreadsign_pollindex']->value
);
}
if (isset($ispParamPropertyGroup->propertiesMappedByName['ispreadfuse_pollindex'])) {
- $this->ispReadFusePollIndex = $this->rawValueToInt(
+ $this->ispReadFusePollIndex = $this->stringToInt(
$ispParamPropertyGroup->propertiesMappedByName['ispreadfuse_pollindex']->value
);
}
if (isset($ispParamPropertyGroup->propertiesMappedByName['ispreadlock_pollindex'])) {
- $this->ispReadLockPollIndex = $this->rawValueToInt(
+ $this->ispReadLockPollIndex = $this->stringToInt(
$ispParamPropertyGroup->propertiesMappedByName['ispreadlock_pollindex']->value
);
}
@@ -310,7 +310,7 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
$this->ocdRevision = isset($ocdProperties['ocd_revision']) ? (int) $ocdProperties['ocd_revision']->value : null;
$this->ocdDataRegister = isset($ocdProperties['ocd_datareg'])
- ? $this->rawValueToInt($ocdProperties['ocd_datareg']->value) : null;
+ ? $this->stringToInt($ocdProperties['ocd_datareg']->value) : null;
}
if (isset($this->modulesByName['cpu'])) {
@@ -427,42 +427,42 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
if (isset($pdiInterfacePropertiesByName['app_section_offset'])) {
$this->appSectionPdiOffset = isset($pdiInterfacePropertiesByName['app_section_offset']->value)
- ? $this->rawValueToInt($pdiInterfacePropertiesByName['app_section_offset']->value) : null;
+ ? $this->stringToInt($pdiInterfacePropertiesByName['app_section_offset']->value) : null;
}
if (isset($pdiInterfacePropertiesByName['boot_section_offset'])) {
$this->bootSectionPdiOffset = isset($pdiInterfacePropertiesByName['boot_section_offset']->value)
- ? $this->rawValueToInt($pdiInterfacePropertiesByName['boot_section_offset']->value) : null;
+ ? $this->stringToInt($pdiInterfacePropertiesByName['boot_section_offset']->value) : null;
}
if (isset($pdiInterfacePropertiesByName['datamem_offset'])) {
$this->ramPdiOffset = isset($pdiInterfacePropertiesByName['datamem_offset']->value)
- ? $this->rawValueToInt($pdiInterfacePropertiesByName['datamem_offset']->value) : null;
+ ? $this->stringToInt($pdiInterfacePropertiesByName['datamem_offset']->value) : null;
}
if (isset($pdiInterfacePropertiesByName['eeprom_offset'])) {
$this->eepromPdiOffset = isset($pdiInterfacePropertiesByName['eeprom_offset']->value)
- ? $this->rawValueToInt($pdiInterfacePropertiesByName['eeprom_offset']->value) : null;
+ ? $this->stringToInt($pdiInterfacePropertiesByName['eeprom_offset']->value) : null;
}
if (isset($pdiInterfacePropertiesByName['user_signatures_offset'])) {
$this->userSignaturesPdiOffset = isset($pdiInterfacePropertiesByName['user_signatures_offset']->value)
- ? $this->rawValueToInt($pdiInterfacePropertiesByName['user_signatures_offset']->value) : null;
+ ? $this->stringToInt($pdiInterfacePropertiesByName['user_signatures_offset']->value) : null;
}
if (isset($pdiInterfacePropertiesByName['prod_signatures_offset'])) {
$this->productSignaturesPdiOffset = isset($pdiInterfacePropertiesByName['prod_signatures_offset']->value)
- ? $this->rawValueToInt($pdiInterfacePropertiesByName['prod_signatures_offset']->value) : null;
+ ? $this->stringToInt($pdiInterfacePropertiesByName['prod_signatures_offset']->value) : null;
}
if (isset($pdiInterfacePropertiesByName['fuse_registers_offset'])) {
$this->fuseRegistersPdiOffset = isset($pdiInterfacePropertiesByName['fuse_registers_offset']->value)
- ? $this->rawValueToInt($pdiInterfacePropertiesByName['fuse_registers_offset']->value) : null;
+ ? $this->stringToInt($pdiInterfacePropertiesByName['fuse_registers_offset']->value) : null;
}
if (isset($pdiInterfacePropertiesByName['lock_registers_offset'])) {
$this->lockRegistersPdiOffset = isset($pdiInterfacePropertiesByName['lock_registers_offset']->value)
- ? $this->rawValueToInt($pdiInterfacePropertiesByName['lock_registers_offset']->value) : null;
+ ? $this->stringToInt($pdiInterfacePropertiesByName['lock_registers_offset']->value) : null;
}
if (isset($this->peripheralModulesByName['nvm'])) {
@@ -509,12 +509,12 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
if (isset($updiInterfacePropertiesByName['ocd_base_addr'])) {
$this->ocdBaseAddress = isset($updiInterfacePropertiesByName['ocd_base_addr']->value)
- ? $this->rawValueToInt($updiInterfacePropertiesByName['ocd_base_addr']->value) : null;
+ ? $this->stringToInt($updiInterfacePropertiesByName['ocd_base_addr']->value) : null;
}
if (isset($updiInterfacePropertiesByName['progmem_offset'])) {
$this->programMemoryUpdiStartAddress = isset($updiInterfacePropertiesByName['progmem_offset']->value)
- ? $this->rawValueToInt($updiInterfacePropertiesByName['progmem_offset']->value) : null;
+ ? $this->stringToInt($updiInterfacePropertiesByName['progmem_offset']->value) : null;
}
}
@@ -522,25 +522,25 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
if (isset($dataAddressSpace->memorySegmentsByTypeAndName['signatures']['signatures'])) {
$signatureMemSegment = $dataAddressSpace->memorySegmentsByTypeAndName['signatures']['signatures'];
$this->signatureSegmentSize = isset($signatureMemSegment->size)
- ? $this->rawValueToInt($signatureMemSegment->size) : null;
+ ? $this->stringToInt($signatureMemSegment->size) : null;
$this->signatureSegmentStartAddress = isset($signatureMemSegment->startAddress)
- ? $this->rawValueToInt($signatureMemSegment->startAddress) : null;
+ ? $this->stringToInt($signatureMemSegment->startAddress) : null;
}
if (isset($dataAddressSpace->memorySegmentsByTypeAndName['fuses']['fuses'])) {
$fusesMemSegment = $dataAddressSpace->memorySegmentsByTypeAndName['fuses']['fuses'];
$this->fuseSegmentSize = isset($fusesMemSegment->size)
- ? $this->rawValueToInt($fusesMemSegment->size) : null;
+ ? $this->stringToInt($fusesMemSegment->size) : null;
$this->fuseSegmentStartAddress = isset($fusesMemSegment->startAddress)
- ? $this->rawValueToInt($fusesMemSegment->startAddress) : null;
+ ? $this->stringToInt($fusesMemSegment->startAddress) : null;
}
if (isset($dataAddressSpace->memorySegmentsByTypeAndName['lockbits']['lockbits'])) {
$lockbitsMemSegment = $dataAddressSpace->memorySegmentsByTypeAndName['lockbits']['lockbits'];
$this->lockbitsSegmentStartAddress = isset($lockbitsMemSegment->startAddress)
- ? $this->rawValueToInt($lockbitsMemSegment->startAddress) : null;
+ ? $this->stringToInt($lockbitsMemSegment->startAddress) : null;
}
}
}
diff --git a/build/scripts/TargetDescriptionFiles/TargetDescriptionFile.php b/build/scripts/TargetDescriptionFiles/TargetDescriptionFile.php
index 1bcb8ecd..b47afb88 100644
--- a/build/scripts/TargetDescriptionFiles/TargetDescriptionFile.php
+++ b/build/scripts/TargetDescriptionFiles/TargetDescriptionFile.php
@@ -85,10 +85,11 @@ class TargetDescriptionFile
$this->loadPinouts();
}
- protected function rawValueToInt(string $value): ?int
+ protected function stringToInt(string $value): ?int
{
- return stristr($value, '0x') !== false ? (int) hexdec($value) :
- (strlen($value) > 0 ? (int) $value : null);
+ return stristr($value, '0x') !== false
+ ? (int) hexdec($value)
+ : (strlen($value) > 0 ? (int) $value : null);
}
private function loadVariants(): void
@@ -133,9 +134,9 @@ class TargetDescriptionFile
$addressSpace->name = isset($addressSpaceAttrs['name']) ? $addressSpaceAttrs['name'] : null;
$addressSpace->startAddress = isset($addressSpaceAttrs['start'])
- ? $this->rawValueToInt($addressSpaceAttrs['start']) : null;
+ ? $this->stringToInt($addressSpaceAttrs['start']) : null;
$addressSpace->size = isset($addressSpaceAttrs['size'])
- ? $this->rawValueToInt($addressSpaceAttrs['size']) : null;
+ ? $this->stringToInt($addressSpaceAttrs['size']) : null;
$memorySegmentElements = $addressSpaceElement->xpath('memory-segment');
foreach ($memorySegmentElements as $memorySegmentElement) {
@@ -144,12 +145,12 @@ class TargetDescriptionFile
$memorySegment->name = isset($memorySegmentAttrs['name']) ? $memorySegmentAttrs['name'] : null;
$memorySegment->startAddress = isset($memorySegmentAttrs['start'])
- ? $this->rawValueToInt($memorySegmentAttrs['start']) : null;
+ ? $this->stringToInt($memorySegmentAttrs['start']) : null;
$memorySegment->type = isset($memorySegmentAttrs['type']) ? $memorySegmentAttrs['type'] : null;
$memorySegment->size = isset($memorySegmentAttrs['size'])
- ? $this->rawValueToInt($memorySegmentAttrs['size']) : null;
+ ? $this->stringToInt($memorySegmentAttrs['size']) : null;
$memorySegment->pageSize = isset($memorySegmentAttrs['pagesize'])
- ? $this->rawValueToInt($memorySegmentAttrs['pagesize']) : null;
+ ? $this->stringToInt($memorySegmentAttrs['pagesize']) : null;
$addressSpace->memorySegmentsByTypeAndName[strtolower($memorySegment->type)]
[strtolower($memorySegment->name)] = $memorySegment;
@@ -201,7 +202,7 @@ class TargetDescriptionFile
}
$registerGroup->offset = isset($registerGroupAttrs['offset'])
- ? $this->rawValueToInt($registerGroupAttrs['offset']) : null;
+ ? $this->stringToInt($registerGroupAttrs['offset']) : null;
$registerElements = $registerGroupElement->xpath('register');
foreach ($registerElements as $registerElement) {
@@ -214,9 +215,9 @@ class TargetDescriptionFile
}
$register->offset = isset($registerAttrs['offset'])
- ? $this->rawValueToInt($registerAttrs['offset']) : null;
+ ? $this->stringToInt($registerAttrs['offset']) : null;
$register->size = isset($registerAttrs['size'])
- ? $this->rawValueToInt($registerAttrs['size']) : null;
+ ? $this->stringToInt($registerAttrs['size']) : null;
$bitFieldElements = $registerElement->xpath('bitfield');
foreach ($bitFieldElements as $bitFieldElement) {
@@ -282,7 +283,7 @@ class TargetDescriptionFile
$signal->padName = isset($signalAttrs['pad']) ? $signalAttrs['pad'] : null;
$signal->function = isset($signalAttrs['function']) ? $signalAttrs['function'] : null;
- $signal->index = isset($signalAttrs['index']) ? $this->rawValueToInt($signalAttrs['index']) : null;
+ $signal->index = isset($signalAttrs['index']) ? $this->stringToInt($signalAttrs['index']) : null;
$moduleInstance->signals[] = $signal;
}
@@ -376,7 +377,7 @@ class TargetDescriptionFile
$pin = new Pin();
$pin->pad = isset($pinAttrs['pad']) ? $pinAttrs['pad'] : null;
- $pin->position = isset($pinAttrs['position']) ? $this->rawValueToInt($pinAttrs['position']) : null;
+ $pin->position = isset($pinAttrs['position']) ? $this->stringToInt($pinAttrs['position']) : null;
$pinout->pins[] = $pin;
}
diff --git a/resources/bloom-social-github.svg b/resources/bloom-social-github.svg
deleted file mode 100644
index 6e1afdc2..00000000
--- a/resources/bloom-social-github.svg
+++ /dev/null
@@ -1,253 +0,0 @@
-
-
diff --git a/src/Application.cpp b/src/Application.cpp
index f3c4446a..6a8bf33a 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -405,8 +405,9 @@ namespace Bloom
this->targetController.get()
);
- auto tcStateChangeEvent =
- this->applicationEventListener->waitForEvent();
+ const auto tcStateChangeEvent = this->applicationEventListener->waitForEvent<
+ Events::TargetControllerThreadStateChanged
+ >();
if (!tcStateChangeEvent.has_value() || tcStateChangeEvent->get()->getState() != ThreadState::READY) {
throw Exception("TargetController failed to startup.");
@@ -418,7 +419,7 @@ namespace Bloom
return;
}
- auto targetControllerState = this->targetController->getThreadState();
+ const auto targetControllerState = this->targetController->getThreadState();
if (targetControllerState == ThreadState::STARTING || targetControllerState == ThreadState::READY) {
EventManager::triggerEvent(std::make_shared());
this->applicationEventListener->waitForEvent(
@@ -443,7 +444,9 @@ namespace Bloom
this->debugServer.get()
);
- auto dsStateChangeEvent = this->applicationEventListener->waitForEvent();
+ const auto dsStateChangeEvent = this->applicationEventListener->waitForEvent<
+ Events::DebugServerThreadStateChanged
+ >();
if (!dsStateChangeEvent.has_value() || dsStateChangeEvent->get()->getState() != ThreadState::READY) {
throw Exception("DebugServer failed to startup.");
@@ -455,7 +458,7 @@ namespace Bloom
return;
}
- auto debugServerState = this->debugServer->getThreadState();
+ const auto debugServerState = this->debugServer->getThreadState();
if (debugServerState == ThreadState::STARTING || debugServerState == ThreadState::READY) {
EventManager::triggerEvent(std::make_shared());
this->applicationEventListener->waitForEvent(
diff --git a/src/Insight/UserInterfaces/InsightWindow/Images/bloom-architecture.svg b/src/Insight/UserInterfaces/InsightWindow/Images/bloom-architecture.svg
deleted file mode 100644
index 59ead6da..00000000
--- a/src/Insight/UserInterfaces/InsightWindow/Images/bloom-architecture.svg
+++ /dev/null
@@ -1,1366 +0,0 @@
-
-
diff --git a/src/Insight/UserInterfaces/InsightWindow/Images/BloomIcon.svg b/src/Insight/UserInterfaces/InsightWindow/Images/bloom-icon.svg
similarity index 99%
rename from src/Insight/UserInterfaces/InsightWindow/Images/BloomIcon.svg
rename to src/Insight/UserInterfaces/InsightWindow/Images/bloom-icon.svg
index 81a01ca7..fa321b72 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Images/BloomIcon.svg
+++ b/src/Insight/UserInterfaces/InsightWindow/Images/bloom-icon.svg
@@ -13,8 +13,8 @@
version="1.1"
id="svg8"
inkscape:version="1.0.1 (1.0.1+r75)"
- sodipodi:docname="BloomIcon.svg"
- inkscape:export-filename="/home/nav/Projects/Bloom/src/Insight/UserInterfaces/InsightWindow/Images/BloomIconv1.png"
+ sodipodi:docname="bloom-icon.svg"
+ inkscape:export-filename="/home/nav/Projects/Bloom/src/Insight/UserInterfaces/InsightWindow/Images/bloom-iconv1.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
valueChanged = this->valueInitialised && this->value != value;
-
this->value = value;
this->hexValue = QString::number(this->value, 16).rightJustified(2, '0').toUpper();
this->asciiValue = (this->value >= 32 && this->value <= 126)
@@ -63,7 +61,6 @@ namespace Bloom::Widgets
static const auto widgetRect = this->boundingRect();
static const auto standardTextColor = QColor(0xAF, 0xB1, 0xB3);
- static const auto valueChangedTextColor = QColor(0x54, 0x7F, 0xBA);
static auto font = QFont("'Ubuntu', sans-serif");
static const auto highlightedBackgroundColor = QColor(0x3C, 0x59, 0x5C, 255);
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItem.hpp b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItem.hpp
index 2919df99..842b1ee1 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItem.hpp
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItem.hpp
@@ -60,7 +60,6 @@ namespace Bloom::Widgets
private:
unsigned char value = 0x00;
bool valueInitialised = false;
- bool valueChanged = false;
const HexViewerWidgetSettings& settings;