doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tidying

Browse Source
This commit is contained in:
Nav
2022-07-09 14:09:05 +01:00
parent 049ccc1439
commit 78491a7874
10 changed files with 57 additions and 1676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
build/scripts/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php
View File

@@ -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;
}
}
}

27
build/scripts/TargetDescriptionFiles/TargetDescriptionFile.php
View File

@@ -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;
}

253
resources/bloom-social-github.svg
View File

@@ -1,253 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="1280"
height="640"
viewBox="0 0 338.66666 169.33334"
version="1.1"
id="svg897"
inkscape:version="1.0.1 (1.0.1+r75)"
sodipodi:docname="bloom-social-github.svg"
inkscape:export-filename="/home/nav/Pictures/bloom-social-github.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<defs
id="defs891">
<linearGradient
id="linearGradient5464"
osb:paint="solid">
<stop
style="stop-color:#343532;stop-opacity:1;"
offset="0"
id="stop5462" />
</linearGradient>
<filter
style="color-interpolation-filters:sRGB"
id="filter7460"
inkscape:label="filter0"
x="-9.1374425e-07"
width="1.0000018"
y="-1.7474314e-06"
height="1.0000035">
<feTurbulence
id="feTurbulence7472"
baseFrequency="1 1"
type="turbulence"
numOctaves="1"
seed="1000" />
<feGaussianBlur
stdDeviation="0.00013660749"
id="feGaussianBlur7474" />
</filter>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#343532"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
inkscape:cx="861.37892"
inkscape:cy="248.98644"
inkscape:document-units="px"
inkscape:current-layer="layer4"
inkscape:document-rotation="0"
showgrid="false"
units="px"
inkscape:window-width="3440"
inkscape:window-height="1353"
inkscape:window-x="2560"
inkscape:window-y="34"
inkscape:window-maximized="1"
inkscape:snap-page="true" />
<metadata
id="metadata894">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Background"
inkscape:groupmode="layer"
id="layer1"
style="display:inline"
sodipodi:insensitive="true">
<rect
style="mix-blend-mode:normal;fill:#343532;fill-opacity:1;stroke:#919191;stroke-width:0.286544;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect1478"
width="358.80719"
height="187.6228"
x="-9.2471457"
y="-12.12172" />
</g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Icon"
sodipodi:insensitive="true">
<path
style="display:inline;opacity:1;fill:#a8a9a9;fill-opacity:1;stroke:none;stroke-width:0.704345;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 164.27363,97.814036 h -4.22606 v 4.226064 h 4.22606 z"
id="path3020" />
<path
style="display:inline;opacity:1;fill:#46484a;fill-opacity:1;stroke:none;stroke-width:0.704345;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 171.44643,97.814036 h -4.22609 v 4.226064 h 4.22609 z"
id="path3018" />
<path
style="display:inline;opacity:1;fill:#883e42;fill-opacity:1;stroke:none;stroke-width:0.704345;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 178.61923,97.814036 h -4.22609 v 4.226064 h 4.22609 z"
id="rect3462-6-0-7" />
<rect
style="display:inline;fill:#1e1e1e;fill-opacity:1;stroke:none;stroke-width:0.704345;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect3447"
width="20.659916"
height="20.65992"
x="159.00333"
y="74.336708" />
<path
style="display:inline;opacity:1;fill:#a8a9a9;fill-opacity:1;stroke:none;stroke-width:0.704345;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 164.27363,67.29324 h -4.22606 v 4.226096 h 4.22606 z"
id="path3014" />
<path
style="display:inline;opacity:1;fill:#98763f;fill-opacity:1;stroke:none;stroke-width:0.704345;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 171.44643,67.29324 h -4.22609 v 4.226096 h 4.22609 z"
id="path3012" />
<path
style="display:inline;opacity:1;fill:#a8a9a9;fill-opacity:1;stroke:none;stroke-width:0.704345;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 178.61923,67.29324 h -4.22609 v 4.226096 h 4.22609 z"
id="rect3462-6-0-7-3" />
<path
style="display:inline;fill:none;stroke:#883e42;stroke-width:1.73735;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 176.50549,102.0401 v 7.18614 l 6.00279,5.58322"
id="path2868-1" />
<path
style="display:inline;fill:none;stroke:#a8a9a9;stroke-width:1.73735;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 162.16054,102.0401 v 7.18614 l -6.00275,5.58322"
id="path2868-4-96" />
<path
style="display:inline;fill:none;stroke:#46484a;stroke-width:1.73735;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 169.33319,102.0401 v 15.69949"
id="path2885-2" />
<path
style="display:inline;fill:none;stroke:#a8a9a9;stroke-width:1.73735;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 162.16054,67.29324 v -7.186101 l -6.00275,-5.583225"
id="path2868-1-1" />
<path
style="display:inline;fill:none;stroke:#a8a9a9;stroke-width:1.73735;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 176.50549,67.29324 v -7.186101 l 6.00279,-5.583225"
id="path2868-4-96-2" />
<path
style="display:inline;fill:none;stroke:#98763f;stroke-width:1.73735;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 169.33289,67.29324 V 51.593751"
id="path2885-2-0" />
<path
style="display:inline;fill:none;stroke:#a8a9a9;stroke-width:1.73735;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 186.70677,77.493915 h 7.1861 l 5.58322,-6.002749"
id="path2868" />
<path
style="display:inline;fill:none;stroke:#3d778c;stroke-width:1.73735;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 186.70677,91.838876 h 7.1861 l 5.58322,6.00273"
id="path2868-4" />
<path
style="display:inline;fill:none;stroke:#3d778c;stroke-width:1.73735;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 186.70677,84.666256 h 15.69948"
id="path2885" />
<path
style="display:inline;fill:none;stroke:#98763f;stroke-width:1.73735;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 151.95991,77.493915 h -7.18614 l -5.58319,-6.002749"
id="path2868-9" />
<path
style="display:inline;fill:none;stroke:#98763f;stroke-width:1.73735;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 151.95991,91.838876 h -7.18614 l -5.58319,6.00273"
id="path2868-4-9" />
<path
style="display:inline;fill:none;stroke:#a8a9a9;stroke-width:1.73735;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 151.95991,84.666256 H 136.26042"
id="path2885-4" />
<rect
style="display:inline;opacity:1;fill:#98763f;fill-opacity:1;stroke:none;stroke-width:0.704345;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect3462-2-5"
width="4.2260838"
height="4.2260842"
x="-156.18591"
y="75.38076"
transform="scale(-1,1)" />
<rect
style="display:inline;opacity:1;fill:#a8a9a9;fill-opacity:1;stroke:none;stroke-width:0.704345;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect3462-3-7-9"
width="4.2260838"
height="4.2260842"
x="-156.18591"
y="82.553497"
transform="scale(-1,1)" />
<rect
style="display:inline;opacity:1;fill:#98763f;fill-opacity:1;stroke:none;stroke-width:0.704345;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect3462-6-0-3"
width="4.2260838"
height="4.2260842"
x="-156.18591"
y="89.726234"
transform="scale(-1,1)" />
<rect
style="display:inline;opacity:1;fill:#a8a9a9;fill-opacity:1;stroke:none;stroke-width:0.704345;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect3462-2"
width="4.2260838"
height="4.2260842"
x="182.48068"
y="75.38076" />
<rect
style="display:inline;opacity:1;fill:#3d778c;fill-opacity:1;stroke:none;stroke-width:0.704345;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect3462-3-7"
width="4.2260838"
height="4.2260842"
x="182.48068"
y="82.553497" />
<rect
style="display:inline;opacity:1;fill:#3d778c;fill-opacity:1;stroke:none;stroke-width:0.704345;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect3462-6-0"
width="4.2260838"
height="4.2260842"
x="182.48068"
y="89.726234" />
<ellipse
style="display:inline;fill:#a8a9a9;fill-opacity:0.81374;stroke:#0f0f0f;stroke-width:0.217169;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path3034"
cx="161.17476"
cy="76.508118"
rx="0.86867172"
ry="0.86867177" />
</g>
<g
inkscape:groupmode="layer"
id="layer4"
inkscape:label="Background Texture"
style="display:inline">
<rect
style="display:inline;opacity:0.3566468;mix-blend-mode:normal;fill:#b9f344;fill-opacity:1;stroke:#919191;stroke-width:0.286544;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter7460)"
id="rect1478-3"
width="358.80716"
height="187.6228"
x="-9.2471008"
y="-12.12172" />
</g>
<g
inkscape:groupmode="layer"
id="layer3"
inkscape:label="Background 2"
style="opacity:0.55838"
sodipodi:insensitive="true" />
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

13
src/Application.cpp
View File

@@ -405,8 +405,9 @@ namespace Bloom
this->targetController.get()
);
auto tcStateChangeEvent =
this->applicationEventListener->waitForEvent<Events::TargetControllerThreadStateChanged>();
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<Events::ShutdownTargetController>());
this->applicationEventListener->waitForEvent<Events::TargetControllerThreadStateChanged>(
@@ -443,7 +444,9 @@ namespace Bloom
this->debugServer.get()
);
auto dsStateChangeEvent = this->applicationEventListener->waitForEvent<Events::DebugServerThreadStateChanged>();
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<Events::ShutdownDebugServer>());
this->applicationEventListener->waitForEvent<Events::DebugServerThreadStateChanged>(

1366
src/Insight/UserInterfaces/InsightWindow/Images/bloom-architecture.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 60 KiB

4
src/Insight/UserInterfaces/InsightWindow/Images/BloomIcon.svg → src/Insight/UserInterfaces/InsightWindow/Images/bloom-icon.svg
View File

@@ -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">
<defs
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

2
src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp
View File

@@ -84,7 +84,7 @@ namespace Bloom
QApplication::setWindowIcon(QIcon(
QString::fromStdString(Paths::compiledResourcesPath()
+ "/src/Insight/UserInterfaces/InsightWindow/Images/BloomIcon.svg"
+ "/src/Insight/UserInterfaces/InsightWindow/Images/bloom-icon.svg"
)
));

2
src/Insight/UserInterfaces/InsightWindow/Stylesheets/AboutWindow.qss
View File

@@ -13,7 +13,7 @@ QMainWindow {
min-width: 150px;
max-height: 150px;
max-width: 150px;
image: url(":/compiled/src/Insight/UserInterfaces/InsightWindow/Images/BloomIcon.svg");
image: url(":/compiled/src/Insight/UserInterfaces/InsightWindow/Images/bloom-icon.svg");
image-position: center;
}

3
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItem.cpp
View File

@@ -41,8 +41,6 @@ namespace Bloom::Widgets
}
void ByteItem::setValue(unsigned char value) {
this->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);

1
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetMemoryInspectionPane/HexViewerWidget/ByteItem.hpp
View File

@@ -60,7 +60,6 @@ namespace Bloom::Widgets
private:
unsigned char value = 0x00;
bool valueInitialised = false;
bool valueChanged = false;
const HexViewerWidgetSettings& settings;