Update simavr submodule (#375)

* Update simavr submodule * Fix clang error * libELF fixes * fix test bug
vintagepc · Nov 29, 2024 · c440b01 · c440b01
1 parent 1ec65e8
commit c440b01
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/3rdParty/simavr b/3rdParty/simavr
diff --git a/MK404.cpp b/MK404.cpp
@@ -435,7 +435,7 @@ int main(int argc, char *argv[])
 
 	m_bTerminal = argTerm.isSet();
 
-	m_bTestMode = (argModel.getValue()=="Test_Printer") | argTest.isSet();
+	m_bTestMode = (argModel.getValue()=="Test_Printer") || argTest.isSet();
 
 	Config::Get().SetLCDScheme(argLCDSCheme.getValue());
 	Config::Get().SetSoftPWM(EnabledType::GetNameToType().at(argSoftPWM.getValue()));

diff --git a/scripts/tests/test_w25x20cl.c b/scripts/tests/test_w25x20cl.c
@@ -76,9 +76,9 @@ int main()
 	printf("READY\n");
 
 	SPI_TX(0x90);
-	SPI_TX(0xFF);
-	SPI_TX(0xFF);
-	printf("SPI %02x\n", SPI_TX(0xFF));
+	SPI_TX(0x00);
+	SPI_TX(0x00);
+	printf("SPI %02x\n", SPI_TX(0x00));
 	printf("SPI %02x\n", SPI_TX(0xFF));
 	printf("SPI %02x\n", SPI_TX(0xFF));
 

diff --git a/scripts/tests/test_w25x20cl.txt b/scripts/tests/test_w25x20cl.txt
@@ -5,8 +5,8 @@ SPIFlash::Clear()
 Serial0::NextLineMustBe(READY)
 ScriptHost::Log(Verify ID)
 Serial0::NextLineMustBe(SPI 00)
-Serial0::NextLineMustBe(SPI 11)
 Serial0::NextLineMustBe(SPI ef)
+Serial0::NextLineMustBe(SPI 11)
 ScriptHost::Log(Check UID)
 Serial0::NextLineMustBe(SPI deadbeefdeadbeef)
 ScriptHost::Log(Write data)