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

Some tidying and more TDF corrections

Browse Source
This commit is contained in:
Nav
2021-06-11 23:59:17 +01:00
parent 01ce8dd5a4
commit a550d2c3a1
9 changed files with 90 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/DebugToolDrivers/Microchip/AtmelICE/AtmelIce.cpp
View File

@@ -22,13 +22,13 @@ void AtmelIce::init() {
usbHidInterface.init();
}
/**
/*
* The Atmel-ICE EDBG/CMSIS-DAP interface doesn't operate properly when sending commands too quickly.
*
* Because of this, we have to enforce a minimum time gap between commands. See comment
* in CmsisDapInterface class declaration for more info.
*/
this->getEdbgInterface().setMinimumCommandTimeGap(35);
this->getEdbgInterface().setMinimumCommandTimeGap(std::chrono::milliseconds(35));
// We don't need to claim the CMSISDAP interface here as the HIDAPI will have already done so.
if (!this->sessionStarted) {

2
src/DebugToolDrivers/Microchip/MplabSnap/MplabSnap.cpp
View File

@@ -20,7 +20,7 @@ void MplabSnap::init() {
usbHidInterface.init();
}
this->getEdbgInterface().setMinimumCommandTimeGap(35);
this->getEdbgInterface().setMinimumCommandTimeGap(std::chrono::milliseconds(35));
// We don't need to claim the CMSISDAP interface here as the HIDAPI will have already done so.
if (!this->sessionStarted) {

4
src/DebugToolDrivers/Microchip/PowerDebugger/PowerDebugger.cpp
View File

@@ -22,13 +22,13 @@ void PowerDebugger::init() {
usbHidInterface.init();
}
/**
/*
* The Power Debugger EDBG/CMSIS-DAP interface doesn't operate properly when sending commands too quickly.
*
* Because of this, we have to enforce a minimum time gap between commands. See comment in
* CmsisDapInterface class declaration for more info.
*/
this->getEdbgInterface().setMinimumCommandTimeGap(35);
this->getEdbgInterface().setMinimumCommandTimeGap(std::chrono::milliseconds(35));
// We don't need to claim the CMSISDAP interface here as the HIDAPI will have already done so.
if (!this->sessionStarted) {

6
src/DebugToolDrivers/Protocols/CMSIS-DAP/CmsisDapInterface.cpp
View File

@@ -11,13 +11,13 @@ using namespace Bloom::DebugToolDrivers::Protocols::CmsisDap;
using namespace Bloom::Exceptions;
void CmsisDapInterface::sendCommand(const Command& cmsisDapCommand) {
if (this->msSendCommandDelay > 0) {
if (this->msSendCommandDelay.count() > 0) {
using namespace std::chrono;
long now = duration_cast<milliseconds>(high_resolution_clock::now().time_since_epoch()).count();
long difference = (now - this->lastCommandSentTimeStamp);
if (difference < this->msSendCommandDelay) {
std::this_thread::sleep_for(milliseconds(this->msSendCommandDelay - difference));
if (difference < this->msSendCommandDelay.count()) {
std::this_thread::sleep_for(milliseconds(this->msSendCommandDelay.count() - difference));
}
this->lastCommandSentTimeStamp = now;

12
src/DebugToolDrivers/Protocols/CMSIS-DAP/CmsisDapInterface.hpp
View File

@@ -35,8 +35,8 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap
* Setting msSendCommandDelay to any value above 0 will enforce an x millisecond gap between each command
* being sent, where x is the value of msSendCommandDelay.
*/
int msSendCommandDelay = 0;
long lastCommandSentTimeStamp;
std::chrono::milliseconds msSendCommandDelay = std::chrono::milliseconds(0);
long lastCommandSentTimeStamp = 0;
public:
explicit CmsisDapInterface() = default;
@@ -45,16 +45,12 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap
return this->usbHidInterface;
}
void setUsbHidInterface(Usb::HidInterface& usbHidInterface) {
this->usbHidInterface = usbHidInterface;
}
size_t getUsbHidInputReportSize() {
return this->usbHidInterface.getInputReportSize();
}
void setMinimumCommandTimeGap(int millisecondTimeGap) {
this->msSendCommandDelay = millisecondTimeGap;
void setMinimumCommandTimeGap(std::chrono::milliseconds commandTimeGap) {
this->msSendCommandDelay = commandTimeGap;
}
/**

4
src/DebugToolDrivers/TargetInterfaces/Microchip/AVR/AVR8/Avr8Interface.hpp
View File

@@ -94,8 +94,8 @@ namespace Bloom::DebugToolDrivers::TargetInterfaces::Microchip::Avr::Avr8
/**
* Should retrieve the AVR8 target signature of the AVR8 target.
*
* This method may invoke stop(), as some interfaces are known to require the target to be in a stopped
* state before the signature can be read.
* This method may invoke stop(), as the target may be required to be in a halted state before the signature
* can be read.
*
* @return
*/

15
src/Targets/TargetDescription/TargetDescriptionFile.cpp
View File

@@ -29,7 +29,6 @@ void TargetDescriptionFile::init(const QDomDocument& xml) {
this->xml = xml;
auto device = xml.elementsByTagName("device").item(0).toElement();
if (!device.isElement()) {
throw TargetDescriptionParsingFailureException("Device element not found.");
}
@@ -51,9 +50,9 @@ std::string TargetDescriptionFile::getTargetName() const {
AddressSpace TargetDescriptionFile::generateAddressSpaceFromXml(const QDomElement& xmlElement) {
if (
!xmlElement.hasAttribute("id")
|| !xmlElement.hasAttribute("name")
|| !xmlElement.hasAttribute("size")
|| !xmlElement.hasAttribute("start")
|| !xmlElement.hasAttribute("name")
|| !xmlElement.hasAttribute("size")
|| !xmlElement.hasAttribute("start")
) {
throw Exception("Address space element missing id/name/size/start attributes.");
}
@@ -88,7 +87,7 @@ AddressSpace TargetDescriptionFile::generateAddressSpaceFromXml(const QDomElemen
segmentNodes.item(segmentIndex).toElement()
);
if (memorySegments.find(segment.type) == memorySegments.end()) {
if (!memorySegments.contains(segment.type)) {
memorySegments.insert(
std::pair<
MemorySegmentType,
@@ -110,9 +109,9 @@ AddressSpace TargetDescriptionFile::generateAddressSpaceFromXml(const QDomElemen
MemorySegment TargetDescriptionFile::generateMemorySegmentFromXml(const QDomElement& xmlElement) {
if (
!xmlElement.hasAttribute("type")
|| !xmlElement.hasAttribute("name")
|| !xmlElement.hasAttribute("size")
|| !xmlElement.hasAttribute("start")
|| !xmlElement.hasAttribute("name")
|| !xmlElement.hasAttribute("size")
|| !xmlElement.hasAttribute("start")
) {
throw Exception("Missing type/name/size/start attributes");
}

5
src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1624.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<target-description-file schema-version="4.4">
<target-description-file>
<variants>
<variant ordercode="ATtiny1624-SSFR" package="SOIC14" pinout="SOIC14" speedmax="20000000" tempmax="125"
tempmin="-40" vccmax="5.5" vccmin="1.8"/>
@@ -172,9 +172,6 @@
<signal function="IOPORT" group="PIN" index="3" pad="PB3"/>
</signals>
</instance>
<instance name="PORTC">
<register-group address-space="data" name="PORTC" name-in-module="PORT" offset="0x0440"/>
</instance>
</module>
<module id="chip" name="PORTMUX">
<instance name="PORTMUX">

69
src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY43U.xml
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<target-description-file>
<variants>
<variant tempmin="0" tempmax="0" speedmax="0" package="" ordercode="standard" vccmin="0.7" vccmax="5.5"/>
<variant ordercode="ATtiny43U-SU" package="SOIC20" pinout="SOIC20" tempmax="85" tempmin="-40"/>
<variant ordercode="ATtiny43U-MU" package="WQFN20" pinout="QFN20" tempmax="85" tempmin="-40"/>
</variants>
<device name="ATtiny43U" architecture="AVR8" family="tinyAVR">
<address-spaces>
@@ -37,10 +38,30 @@
<instance name="PORTA" caption="I/O Port">
<register-group name="PORTA" name-in-module="PORTA" offset="0x00" address-space="data"
caption="I/O Port"/>
<signals>
<signal function="PORTA" group="P" index="0" pad="PA0"/>
<signal function="PORTA" group="P" index="1" pad="PA1"/>
<signal function="PORTA" group="P" index="2" pad="PA2"/>
<signal function="PORTA" group="P" index="3" pad="PA3"/>
<signal function="PORTA" group="P" index="4" pad="PA4"/>
<signal function="PORTA" group="P" index="5" pad="PA5"/>
<signal function="PORTA" group="P" index="6" pad="PA6"/>
<signal function="PORTA" group="P" index="7" pad="PA7"/>
</signals>
</instance>
<instance name="PORTB" caption="I/O Port">
<register-group name="PORTB" name-in-module="PORTB" offset="0x00" address-space="data"
caption="I/O Port"/>
<signals>
<signal function="PORTB" group="P" index="0" pad="PB0"/>
<signal function="PORTB" group="P" index="1" pad="PB1"/>
<signal function="PORTB" group="P" index="2" pad="PB2"/>
<signal function="PORTB" group="P" index="3" pad="PB3"/>
<signal function="PORTB" group="P" index="4" pad="PB4"/>
<signal function="PORTB" group="P" index="5" pad="PB5"/>
<signal function="PORTB" group="P" index="6" pad="PB6"/>
<signal function="PORTB" group="P" index="7" pad="PB7"/>
</signals>
</instance>
</module>
<module name="USI">
@@ -782,4 +803,50 @@
</value-group>
</module>
</modules>
<pinouts>
<pinout name="SOIC20">
<pin pad="PB0" position="1"/>
<pin pad="PB1" position="2"/>
<pin pad="PB2" position="3"/>
<pin pad="PB3" position="4"/>
<pin pad="PB4" position="5"/>
<pin pad="PB5" position="6"/>
<pin pad="PB6" position="7"/>
<pin pad="PB7" position="8"/>
<pin pad="VCC" position="9"/>
<pin pad="GND" position="10"/>
<pin pad="LSW" position="11"/>
<pin pad="VBAT" position="12"/>
<pin pad="PA0" position="13"/>
<pin pad="PA1" position="14"/>
<pin pad="PA2" position="15"/>
<pin pad="PA3" position="16"/>
<pin pad="PA4" position="17"/>
<pin pad="PA5" position="18"/>
<pin pad="PA6" position="19"/>
<pin pad="PA7" position="20"/>
</pinout>
<pinout name="QFN20">
<pin pad="PB2" position="1"/>
<pin pad="PB3" position="2"/>
<pin pad="PB4" position="3"/>
<pin pad="PB5" position="4"/>
<pin pad="PB6" position="5"/>
<pin pad="PB7" position="6"/>
<pin pad="VCC" position="7"/>
<pin pad="GND" position="8"/>
<pin pad="LSW" position="9"/>
<pin pad="VBAT" position="10"/>
<pin pad="PA0" position="11"/>
<pin pad="PA1" position="12"/>
<pin pad="PA2" position="13"/>
<pin pad="PA3" position="14"/>
<pin pad="PA4" position="15"/>
<pin pad="PA5" position="16"/>
<pin pad="PA6" position="17"/>
<pin pad="PA7" position="18"/>
<pin pad="PB0" position="19"/>
<pin pad="PB1" position="20"/>
</pinout>
</pinouts>
</target-description-file>