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

Included variant ID in target pin descriptor

Browse Source
This commit is contained in:
Nav
2021-09-04 17:58:05 +01:00
parent 90a4f1ce29
commit 1bc881e9ae
9 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Targets/Microchip/AVR/AVR8/Avr8.cpp
View File

@@ -428,7 +428,8 @@ std::map<int, TargetPinState> Avr8::getPinStates(int variantId) {
return output;
}
void Avr8::setPinState(int variantId, const TargetPinDescriptor& pinDescriptor, const TargetPinState& state) {
void Avr8::setPinState(const TargetPinDescriptor& pinDescriptor, const TargetPinState& state) {
auto variantId = pinDescriptor.variantId;
if (!this->targetVariantsById.contains(variantId)) {
throw Exception("Invalid target variant ID");
}

1
src/Targets/Microchip/AVR/AVR8/Avr8.hpp
View File

@@ -146,7 +146,6 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit
std::map<int, TargetPinState> getPinStates(int variantId) override;
void setPinState(
int variantId,
const TargetPinDescriptor& pinDescriptor,
const TargetPinState& state
) override;

1
src/Targets/Microchip/AVR/AVR8/TargetDescription/TargetDescriptionFile.cpp
View File

@@ -435,6 +435,7 @@ void TargetDescriptionFile::loadTargetVariants() {
targetPin.name = tdPin.pad;
targetPin.padName = tdPin.pad;
targetPin.number = tdPin.position;
targetPin.variantId = targetVariant.id;
// TODO: REMOVE THIS:
if (tdPin.pad.find("vcc") == 0