Skip to content

Commit

Permalink
Remove multithreading from simulator
Browse files Browse the repository at this point in the history
  • Loading branch information
malcx95 committed Mar 28, 2024
1 parent dc73603 commit 1a9d905
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 23 deletions.
17 changes: 17 additions & 0 deletions compile_commands.json
Original file line number Diff line number Diff line change
Expand Up @@ -6499,5 +6499,22 @@
"directory": "/home/malcolm/Programming/ZeKeyboard/firmware",
"file": "/home/malcolm/.arduino15/packages/teensy/hardware/avr/1.58.1/cores/teensy4/usb_touch.c",
"output": "/home/malcolm/Programming/ZeKeyboard/firmware/build/core/home/malcolm/.arduino15/packages/teensy/hardware/avr/1.58.1/cores/teensy4/usb_touch.c.o"
},
{
"arguments": [
"/usr/bin/g++",
"-c",
"-g",
"-Wall",
"-Wextra",
"-std=gnu++23",
"-I/usr/include/SFML",
"-o",
"obj/simulator.o",
"simulator.cpp"
],
"directory": "/home/malcolm/Programming/ZeKeyboard/firmware/simulator",
"file": "/home/malcolm/Programming/ZeKeyboard/firmware/simulator/simulator.cpp",
"output": "/home/malcolm/Programming/ZeKeyboard/firmware/simulator/obj/simulator.o"
}
]
27 changes: 4 additions & 23 deletions simulator/simulator.cpp
Original file line number Diff line number Diff line change
@@ -1,37 +1,18 @@
#include "simulator_device.h"
#include "../core/firmware.h"
#include "simulator_window.h"
#include <thread>


void window_thread(simulator::SimulatorWindow& window)
int main()
{
simulator::SimulatorDevice device;
core::Firmware firmware{device};
simulator::SimulatorWindow window{device, firmware};
while (window.is_open())
{
window.update();
}
}


void firmware_thread(core::Firmware& firmware)
{
while (true)
{
firmware.update();
}
}


int main()
{
simulator::SimulatorDevice device;
core::Firmware firmware{device};
simulator::SimulatorWindow window{device, firmware};

std::thread window_thread{::window_thread, std::ref(window)};
std::thread firmware_thread{::firmware_thread, std::ref(firmware)};
window_thread.join();
firmware_thread.join();

return 0;
}

0 comments on commit 1a9d905

Please sign in to comment.