Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update simavr submodule #375

Merged
merged 8 commits into from
Nov 29, 2024
Merged

Update simavr submodule #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
27016ff
Update simavr submodule
vintagepc Mar 3, 2024
1cc62ae
Update submodule
vintagepc Mar 3, 2024
d3d8118
submodule update
vintagepc May 27, 2024
96ac80e
Fix clang error
vintagepc May 27, 2024
437a28b
libELF fixes
vintagepc May 27, 2024
35a0a54
take 2 - osx fix
vintagepc May 27, 2024
addbede
Merge remote-tracking branch 'origin/master' into update-simavr-3-3-24
vintagepc Nov 28, 2024
43ba3f1
fix test bug
vintagepc Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdParty/simavr
Open in desktop
Submodule simavr updated 332 files
2 changes: 1 addition & 1 deletion MK404.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand Down
6 changes: 3 additions & 3 deletions scripts/tests/test_w25x20cl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
2 changes: 1 addition & 1 deletion scripts/tests/test_w25x20cl.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading