This commit is contained in:
Nav
2021-09-21 21:21:57 +01:00
parent e76bb07ef1
commit ebfd97eae8
7 changed files with 10 additions and 5 deletions

View File

@@ -172,7 +172,6 @@ add_executable(Bloom
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/BitsetWidget/BitsetWidget.cpp src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/BitsetWidget/BitsetWidget.cpp
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/BitsetWidget/BitWidget.cpp src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/BitsetWidget/BitWidget.cpp
src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/BitsetWidget/BitBodyWidget.cpp src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/BitsetWidget/BitBodyWidget.cpp
) )
set_target_properties(Bloom PROPERTIES OUTPUT_NAME bloom) set_target_properties(Bloom PROPERTIES OUTPUT_NAME bloom)

View File

@@ -107,7 +107,11 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
* ISP, after they've finished a debug session. After programming the target, the user will need to cycle the * ISP, after they've finished a debug session. After programming the target, the user will need to cycle the
* target power before Bloom can gain access for another debug session. * target power before Bloom can gain access for another debug session.
* *
* This feature can be activated via the user's Bloom configuration. * NOTE: ATM, this isn't actually used anywhere. It will always be false. We may include this as a target
* config parameter, but we first need to consider the actual demand. AVRDUDE used to handle the disabling of
* the debugWire module, but a recent update resulted in it failing to do so. And that was some time ago, so
* we need to check if AVRDUDE and other programming software (MPLAB IPE) can handle the disabling of the
* debugWire module. If not, then we can come back to this.
* *
* See disableDebugWire() method below. * See disableDebugWire() method below.
*/ */

View File

@@ -54,6 +54,7 @@ void Insight::startup() {
#ifndef BLOOM_DEBUG_BUILD #ifndef BLOOM_DEBUG_BUILD
QCoreApplication::addLibraryPath(QString::fromStdString(Paths::applicationDirPath() + "/plugins")); QCoreApplication::addLibraryPath(QString::fromStdString(Paths::applicationDirPath() + "/plugins"));
#endif #endif
this->application.setQuitOnLastWindowClosed(true); this->application.setQuitOnLastWindowClosed(true);
qRegisterMetaType<Bloom::Targets::TargetDescriptor>(); qRegisterMetaType<Bloom::Targets::TargetDescriptor>();
qRegisterMetaType<Bloom::Targets::TargetPinDescriptor>(); qRegisterMetaType<Bloom::Targets::TargetPinDescriptor>();

View File

@@ -1,6 +1,7 @@
#include "InsightWindow.hpp" #include "InsightWindow.hpp"
#include <QtSvg/QtSvg> #include <QtSvg/QtSvg>
#include <QDesktopServices>
#include <utility> #include <utility>
#include "UiLoader.hpp" #include "UiLoader.hpp"

View File

@@ -174,7 +174,7 @@
<item alignment="Qt::AlignCenter"> <item alignment="Qt::AlignCenter">
<widget class="QPushButton" name="apply-btn"> <widget class="QPushButton" name="apply-btn">
<property name="text"> <property name="text">
<string>Apply</string> <string>Write Value</string>
</property> </property>
</widget> </widget>
</item> </item>

View File

@@ -569,7 +569,7 @@ void TargetController::onReadRegistersEvent(const Events::RetrieveRegistersFromT
} }
} catch (const TargetOperationFailure& exception) { } catch (const TargetOperationFailure& exception) {
Logger::error("Failed to read general registers from target - " + exception.getMessage()); Logger::error("Failed to read registers from target - " + exception.getMessage());
this->emitErrorEvent(event.id); this->emitErrorEvent(event.id);
} }
} }

View File

@@ -508,7 +508,7 @@ void Avr8::setPinState(const TargetPinDescriptor& pinDescriptor, const TargetPin
) { ) {
if (padDescriptor.gpioPortClearAddress != portSetAddress) { if (padDescriptor.gpioPortClearAddress != portSetAddress) {
/* /*
* We don't need to read the register if the SET and CLEAR operations are performed via different * We don't need to read the SET register if the SET and CLEAR operations are performed via different
* registers. * registers.
* *
* Instead, we can just set the appropriate bit against the SET register. * Instead, we can just set the appropriate bit against the SET register.