Revert "Reset SG when writing to GCONF or COOLCONF (vintagepc#300)"

This reverts commit bc56fba.
wavexx · Mar 29, 2021 · a64f2ad · a64f2ad
1 parent bc56fba
commit a64f2ad
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/parts/components/TMC2130.cpp b/parts/components/TMC2130.cpp
@@ -154,10 +154,7 @@ void TMC2130::ProcessCommand()
 		switch (m_cmdProc.bitsIn.address)
 		{
 			case 0x00: // GCONF
-			case 0x6D: // COOLCONF
-				// Reset and adjust DIAG out
-				m_regs.defs.DRV_STATUS.stallGuard = false;
-				RaiseDiag(m_regs.defs.DRV_STATUS.stallGuard);
+				RaiseDiag(m_regs.defs.DRV_STATUS.stallGuard); // Adjust DIAG out, it mayhave  been reconfigured.
 				break;
 			case 0x6C: // Chopconf
 				m_uiStepIncrement = std::pow(2,m_regs.defs.CHOPCONF.mres);

diff --git a/scripts/tests/test_TMC2130.c b/scripts/tests/test_TMC2130.c
@@ -177,10 +177,8 @@ int main()
 	step();
 	printf("DIAGDISABLE %02x\n",PINA&0x02);
 
-	// Keep existing configuration (DIAG0_stall && pushpull),
-	// but ensure DIAG is cleared when GCONF is written to
-	printf("DIAG %02x\n",PINA&0x02);
-	TMCTX(0x80,1U<<7U | 1U << 12);
+	TMCTX(0x80,1U<<7U); // DIAG0_stall, Act low
+
 	printf("DIAG %02x\n",PINA&0x02);
 
 

diff --git a/scripts/tests/test_TMC2130.txt b/scripts/tests/test_TMC2130.txt
@@ -22,6 +22,5 @@ Board::Pause()
 GLHelper::SnapRect(tests/snaps/TMC04,0,164,500,80)
 Board::Resume()
 Serial0::NextLineMustBe(DIAGDISABLE 02)
-Serial0::NextLineMustBe(DIAG 02)
 Serial0::NextLineMustBe(DIAG 00)
 Board::Quit()