Xflash load from hex

parts/Board.cpp

@@ -321,22 +321,30 @@ namespace Boards {
 
 	avr_flashaddr_t Board::LoadFirmware(const string &strFW)
 	{
-		uint32_t uiFWSize = 0, uiFWStart = 0;
 		if (strFW.size()>4)
 		{
 			if (0==strFW.compare(strFW.size()-4, 4, ".hex"))
 			{
-				gsl::unique_ptr<uint8_t> puiBytes {read_ihex_file(strFW.c_str(),&uiFWSize, &uiFWStart) };
-				if (!puiBytes)
+				ihex_chunk_p pChunks = nullptr;
+				int iCount = read_ihex_chunks(strFW.c_str(), &pChunks);
+				if (iCount==0)
+				{
+					std::cerr << "No chunks found in .hex file. Firmware NOT loaded!\n";
+					return 0;
+				} else if (pChunks[0].data == nullptr)
 				{
 					std::cout << "WARN: Could not load " << strFW << ". MCU will execute existing flash." << '\n';
+					return 0;
 				}
-				else
-				{
-					std::cout << "Loaded "  << uiFWSize << " bytes from HEX file: " << strFW << '\n';
-					gsl::span<uint8_t> flash {m_pAVR->flash, m_pAVR->flashend};
-					memcpy(flash.begin() + uiFWStart, puiBytes.get(), uiFWSize);
+				gsl::span<uint8_t> chunk0 {pChunks[0].data, pChunks[0].size};
+				uint32_t uiFWStart = pChunks[0].baseaddr;
+				if (iCount > 1) {
+					OnExtraHexChunk({pChunks[1].data,pChunks[1].size});
 				}
+				std::cout << "Loaded "  << chunk0.size_bytes() << " bytes from HEX file: " << strFW << '\n';
+				gsl::span<uint8_t> flash {m_pAVR->flash, m_pAVR->flashend};
+				memcpy(flash.data() + uiFWStart, chunk0.begin(), chunk0.size_bytes());
+				free_ihex_chunks(pChunks);
 				m_pAVR->codeend = m_pAVR->flashend;
 				return uiFWStart;
 			}

parts/Board.h

@@ -111,6 +111,9 @@ namespace Boards
 			// within the context of the AVR run thread.
 			virtual void OnAVRCycle(){};
 
+			// For boards that can handle extra chunks in the hex (language)
+			virtual void OnExtraHexChunk(gsl::span<uint8_t> /*chunk*/){};
+
 			void OnKeyPress(const Key& key) override;
 
 			LineStatus ProcessAction(unsigned int ID, const std::vector<std::string> &vArgs) override;

parts/boards/EinsyRambo.cpp

@@ -240,6 +240,11 @@ namespace Boards
 		sd_card.Unmount();
 	}
 
+	void EinsyRambo::OnExtraHexChunk(gsl::span<uint8_t> chunk)
+	{
+		spiFlash.Load(chunk);
+	}
+
 	void EinsyRambo::OnAVRReset()
 	{
 		std::cout << "RESET\n";

parts/boards/EinsyRambo.h

@@ -66,6 +66,8 @@ namespace Boards
 
 			void OnKeyPress(const Key& key) override;
 
+			void OnExtraHexChunk(gsl::span<uint8_t> chunk) override;
+
 			static constexpr float fScale24v = 1.0f/26.097f; // Based on rSense voltage divider outputting 5v
 
 			bool m_bFactoryReset = false;

parts/components/TMC2130.cpp

@@ -57,7 +57,11 @@ void TMC2130::_Draw(bool bIsSimple)
 		}
 		// Copy atomic to local
 		float fPos = m_fCurPos;
-        glColor3f(0,0,0);
+		if (m_bDrawStall) {
+        	glColor3f(0.7,0,0);
+		} else {
+        	glColor3f(0,0,0);
+		}
 	    glBegin(GL_QUADS);
 			glVertex3f(0,0,0);
 			glVertex3f(350,0,0);
@@ -191,6 +195,7 @@ void TMC2130::RaiseDiag(uint8_t value)
     if (bDiag)
 	{
 		//printf("Raised: %d\n", value ==  m_regs.defs.GCONF.diag0_int_pushpull);
+		m_bDrawStall = value>0;
         RaiseIRQ(DIAG_OUT, value == m_regs.defs.GCONF.diag0_int_pushpull);
 	}
 }

parts/components/TMC2130.h

@@ -218,6 +218,8 @@ class TMC2130: public SPIPeripheral, public Scriptable
 		bool m_bStall = false;
 		uint32_t m_uiStepIncrement = 1;
 
+		std::atomic_bool m_bDrawStall {false};
+
 		// Position helpers
 		float StepToPos(int32_t step);
 		int32_t PosToStep(float step);

parts/components/w25x20cl.cpp

@@ -358,6 +358,13 @@ void w25x20cl::Load(const std::string &path)
 		Load();
 }
 
+void w25x20cl::Load(const gsl::span<uint8_t> data)
+{
+	size_t bytes = std::min(m_flash.size_bytes(), data.size_bytes());
+	memcpy(m_flash.begin(), data.begin(), bytes);
+	std::cout << "Loaded " << std::to_string(bytes) << " from hex file to xflash\n";
+}
+
 void w25x20cl::Load()
 {
 	auto *path = m_filepath.c_str();

parts/components/w25x20cl.h

@@ -58,6 +58,9 @@ class w25x20cl:public SPIPeripheral, public Scriptable
 	// Loads the flash contents from file. (creates "path" if it does not exit)
 	void Load(const std::string &path);
 
+	// Loads from an array
+	void Load(const gsl::span<uint8_t> data);
+
 	// Reloads the current file.
 	void Load();