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

Implemented parsing for new register-group-instance element in TDF scripts

Browse Source
This commit is contained in:
Nav
2024-02-17 21:44:02 +00:00
parent de096f63f0
commit 7ac54ec259
6 changed files with 157 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
build/scripts/Targets/TargetDescriptionFiles/Services/Xml/FromXmlService.php
View File

@@ -14,6 +14,7 @@ use Targets\TargetDescriptionFiles\MemorySegmentSection;
use Targets\TargetDescriptionFiles\MemorySegmentType;
use Targets\TargetDescriptionFiles\Module;
use Targets\TargetDescriptionFiles\Peripheral;
use Targets\TargetDescriptionFiles\RegisterGroupInstance;
use Targets\TargetDescriptionFiles\PhysicalInterface;
use Targets\TargetDescriptionFiles\Property;
use Targets\TargetDescriptionFiles\PropertyGroup;
@@ -325,8 +326,8 @@ class FromXmlService
continue;
}
if ($childNode->nodeName === 'register-group-reference') {
$output->registerGroupReferences[] = $this->registerGroupReferenceFromElement($childNode);
if ($childNode->nodeName === 'register-group-instance') {
$output->registerGroupInstances[] = $this->registerGroupInstanceFromElement($childNode);
continue;
}
@@ -356,6 +357,20 @@ class FromXmlService
return $output;
}
public function registerGroupInstanceFromElement(DOMElement $element): RegisterGroupInstance
{
$attributes = $this->getNodeAttributesByName($element);
return new RegisterGroupInstance(
$attributes['key'] ?? null,
$attributes['name'] ?? null,
$attributes['register-group-key'] ?? null,
$attributes['address-space-key'] ?? null,
$this->stringService->tryStringToInt($attributes['offset'] ?? null),
$attributes['description'] ?? null
);
}
public function signalFromElement(DOMElement $element): Signal
{
$attributes = $this->getNodeAttributesByName($element);

24
build/scripts/Targets/TargetDescriptionFiles/Services/Xml/ToXmlService.php
View File

@@ -9,6 +9,7 @@ use Targets\TargetDescriptionFiles\MemorySegment;
use Targets\TargetDescriptionFiles\MemorySegmentSection;
use Targets\TargetDescriptionFiles\Module;
use Targets\TargetDescriptionFiles\Peripheral;
use Targets\TargetDescriptionFiles\RegisterGroupInstance;
use Targets\TargetDescriptionFiles\PhysicalInterface;
use Targets\TargetDescriptionFiles\Pin;
use Targets\TargetDescriptionFiles\Pinout;
@@ -135,8 +136,8 @@ class ToXmlService
$element->setAttribute('name', $peripheral->name);
$element->setAttribute('module-key', $peripheral->moduleKey);
foreach ($peripheral->registerGroupReferences as $registerGroupReference) {
$element->append($this->registerGroupReferenceToXml($registerGroupReference, $document));
foreach ($peripheral->registerGroupInstances as $registerGroupInstance) {
$element->append($this->registerGroupInstanceToXml($registerGroupInstance, $document));
}
if (!empty($peripheral->signals)) {
@@ -151,6 +152,25 @@ class ToXmlService
return $element;
}
public function registerGroupInstanceToXml(
RegisterGroupInstance $registerGroupInstance,
DOMDocument $document
): DOMElement {
$element = $document->createElement('register-group-instance');
$element->setAttribute('key', $registerGroupInstance->key);
$element->setAttribute('name', $registerGroupInstance->name);
if (!empty($registerGroupInstance->description)) {
$element->setAttribute('description', $registerGroupInstance->description);
}
$element->setAttribute('register-group-key', $registerGroupInstance->registerGroupKey);
$element->setAttribute('address-space-key', $registerGroupInstance->addressSpaceKey);
$element->setAttribute('offset', $this->stringService->tryIntToHex($registerGroupInstance->offset));
return $element;
}
public function signalToXml(Signal $signal, DOMDocument $document): DOMElement
{
$element = $document->createElement('signal');