From ebfd97eae8096b04368464976f2d9647c473bf10 Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Tue, 21 Sep 2021 21:21:57 +0100
Subject: [PATCH] Tidying

---
 CMakeLists.txt                                              | 1 -
 .../CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.hpp | 6 +++++-
 src/Insight/Insight.cpp                                     | 1 +
 src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp  | 1 +
 .../UiFiles/TargetRegisterInspectorWindow.ui                | 2 +-
 src/TargetController/TargetController.cpp                   | 2 +-
 src/Targets/Microchip/AVR/AVR8/Avr8.cpp                     | 2 +-
 7 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce7ebdfe..ff5eccd2 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -172,7 +172,6 @@ add_executable(Bloom
     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/BitBodyWidget.cpp
-
 )
 
 set_target_properties(Bloom PROPERTIES OUTPUT_NAME bloom)
diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.hpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.hpp
index b42c3a62..a73b9cca 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.hpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.hpp
@@ -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
          * 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.
          */
diff --git a/src/Insight/Insight.cpp b/src/Insight/Insight.cpp
index 75d73e0f..27fc89d0 100644
--- a/src/Insight/Insight.cpp
+++ b/src/Insight/Insight.cpp
@@ -54,6 +54,7 @@ void Insight::startup() {
 #ifndef BLOOM_DEBUG_BUILD
     QCoreApplication::addLibraryPath(QString::fromStdString(Paths::applicationDirPath() + "/plugins"));
 #endif
+
     this->application.setQuitOnLastWindowClosed(true);
     qRegisterMetaType<Bloom::Targets::TargetDescriptor>();
     qRegisterMetaType<Bloom::Targets::TargetPinDescriptor>();
diff --git a/src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp b/src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp
index 252466c6..786041ce 100644
--- a/src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp
+++ b/src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp
@@ -1,6 +1,7 @@
 #include "InsightWindow.hpp"
 
 #include <QtSvg/QtSvg>
+#include <QDesktopServices>
 #include <utility>
 
 #include "UiLoader.hpp"
diff --git a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/UiFiles/TargetRegisterInspectorWindow.ui b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/UiFiles/TargetRegisterInspectorWindow.ui
index d750f351..854f7f74 100644
--- a/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/UiFiles/TargetRegisterInspectorWindow.ui
+++ b/src/Insight/UserInterfaces/InsightWindow/Widgets/TargetRegisterInspector/UiFiles/TargetRegisterInspectorWindow.ui
@@ -174,7 +174,7 @@
                                                     <item alignment="Qt::AlignCenter">
                                                         <widget class="QPushButton" name="apply-btn">
                                                             <property name="text">
-                                                                <string>Apply</string>
+                                                                <string>Write Value</string>
                                                             </property>
                                                         </widget>
                                                     </item>
diff --git a/src/TargetController/TargetController.cpp b/src/TargetController/TargetController.cpp
index 942bf455..c7724f42 100644
--- a/src/TargetController/TargetController.cpp
+++ b/src/TargetController/TargetController.cpp
@@ -569,7 +569,7 @@ void TargetController::onReadRegistersEvent(const Events::RetrieveRegistersFromT
         }
 
     } 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);
     }
 }
diff --git a/src/Targets/Microchip/AVR/AVR8/Avr8.cpp b/src/Targets/Microchip/AVR/AVR8/Avr8.cpp
index 18fbf3d4..4d27b40f 100644
--- a/src/Targets/Microchip/AVR/AVR8/Avr8.cpp
+++ b/src/Targets/Microchip/AVR/AVR8/Avr8.cpp
@@ -508,7 +508,7 @@ void Avr8::setPinState(const TargetPinDescriptor& pinDescriptor, const TargetPin
         ) {
             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.
                  *
                  * Instead, we can just set the appropriate bit against the SET register.