From cdd35c46c1b0c8fc26b79c4e5128cd2fb94ba528 Mon Sep 17 00:00:00 2001 From: Nav Date: Tue, 15 Mar 2022 11:17:30 +0000 Subject: [PATCH] Tidying --- src/DebugServers/GdbRsp/GdbRspDebugServer.cpp | 6 ++---- src/Targets/Microchip/AVR/AVR8/Avr8.cpp | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/DebugServers/GdbRsp/GdbRspDebugServer.cpp b/src/DebugServers/GdbRsp/GdbRspDebugServer.cpp index 0ffb78f8..2f777fb7 100644 --- a/src/DebugServers/GdbRsp/GdbRspDebugServer.cpp +++ b/src/DebugServers/GdbRsp/GdbRspDebugServer.cpp @@ -222,11 +222,9 @@ namespace Bloom::DebugServers::Gdb const auto memoryType = this->getMemoryTypeFromGdbAddress(packet.startAddress); if (memoryType == Targets::TargetMemoryType::FLASH) { - Logger::error( + throw Exception( "GDB client requested a flash memory write - This is not currently supported by Bloom." ); - this->clientConnection->writePacket(ResponsePacket({'E', '0', '1'})); - return; } const auto startAddress = this->removeMemoryTypeIndicatorFromGdbAddress(packet.startAddress); @@ -235,7 +233,7 @@ namespace Bloom::DebugServers::Gdb this->clientConnection->writePacket(ResponsePacket({'O', 'K'})); } catch (const Exception& exception) { - Logger::error("Failed to write memory two target - " + exception.getMessage()); + Logger::error("Failed to write memory to target - " + exception.getMessage()); this->clientConnection->writePacket(ResponsePacket({'E', '0', '1'})); } } diff --git a/src/Targets/Microchip/AVR/AVR8/Avr8.cpp b/src/Targets/Microchip/AVR/AVR8/Avr8.cpp index 7640f8f8..f9318270 100644 --- a/src/Targets/Microchip/AVR/AVR8/Avr8.cpp +++ b/src/Targets/Microchip/AVR/AVR8/Avr8.cpp @@ -141,8 +141,8 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit if (!this->updateDwenFuseBit) { throw TargetOperationFailure( "Failed to activate debugWire physical interface - check target connection and DWEN fuse " - "bit. Bloom can set the DWEN fuse bit automatically. For instructions on enabling this function," - " see " + Paths::homeDomainName() + "/docs/debugging-avr-debugwire" + "bit. Bloom can manage the DWEN fuse bit automatically. For instructions on enabling this " + "function, see " + Paths::homeDomainName() + "/docs/debugging-avr-debugwire" ); }