From 814b98ddd0a48ea89f018ebc7c2ab18aebab597f Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Mon, 9 May 2022 22:36:44 +0100
Subject: [PATCH] Tidying

---
 README.md                                             |  2 +-
 resources/packaging/PKGBUILD.template.in              |  2 --
 .../VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp     | 11 +++++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 0c256914..eb6dd766 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ See source code in src/SignalHandler/ for more.
 
 ---
 
-### Building Bloom
+### Building Bloom from source
 To compile Bloom, the following dependencies must be resolved. The accompanying installation commands require support
 for apt-get.
 
diff --git a/resources/packaging/PKGBUILD.template.in b/resources/packaging/PKGBUILD.template.in
index d474efdb..3ffb1085 100644
--- a/resources/packaging/PKGBUILD.template.in
+++ b/resources/packaging/PKGBUILD.template.in
@@ -11,7 +11,5 @@ package(){
   depends=('fontconfig>=2.11.94' 'freetype2>=2.6' 'gcc-libs>=5' 'glibc>=2.18' 'libgl' 'libglvnd' 'libpng12' 'libx11' 'libxcb' 'libxext' 'libxkbcommon>=0.5.0' 'libxkbcommon-x11>=0.5.0' 'libxrender' 'xcb-util-image>=0.2.1' 'xcb-util-keysyms>=0.4.0' 'xcb-util-renderutil' 'xcb-util-wm>=0.4.1' 'zlib>=1.1.4')
 
   mkdir -p "${pkgdir}/@CPACK_PACKAGING_INSTALL_PREFIX@"
-
-  # Extract package data
   cp -R @CMAKE_INSTALL_PREFIX@* "${pkgdir}/@CPACK_PACKAGING_INSTALL_PREFIX@"
 }
diff --git a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp
index 20baf956..f490f5d3 100644
--- a/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp
+++ b/src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp
@@ -546,9 +546,10 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
             }
 
             auto memoryType = Avr8MemoryType::SRAM;
-            if (registerDescriptor.type == TargetRegisterType::GENERAL_PURPOSE_REGISTER
+            if (
+                registerDescriptor.type == TargetRegisterType::GENERAL_PURPOSE_REGISTER
                 && (this->configVariant == Avr8ConfigVariant::XMEGA || this->configVariant == Avr8ConfigVariant::UPDI)
-                ) {
+            ) {
                 memoryType = Avr8MemoryType::REGISTER_FILE;
             }
 
@@ -578,8 +579,10 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
                 if (this->configVariant == Avr8ConfigVariant::DEBUG_WIRE) {
                     avr8MemoryType = Avr8MemoryType::FLASH_PAGE;
 
-                } else if (this->configVariant == Avr8ConfigVariant::XMEGA
-                    || this->configVariant == Avr8ConfigVariant::UPDI) {
+                } else if (
+                    this->configVariant == Avr8ConfigVariant::XMEGA
+                    || this->configVariant == Avr8ConfigVariant::UPDI
+                ) {
                     avr8MemoryType = Avr8MemoryType::APPL_FLASH;
 
                 } else {