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

Daniel/engine desktop build #14

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Daniel/engine desktop build #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b981783
Changes for desktop build of engine in test framework
Unreal-Dan Dec 20, 2023
eaebcc5
more fixes for desktop build
Unreal-Dan Dec 20, 2023
e4f782f
fix for desktop build
Unreal-Dan Dec 21, 2023
30c5ab0
minor fix
Unreal-Dan Dec 23, 2023
09630cc
Merge branch 'master' into daniel/engine_desktop_build
Unreal-Dan Jan 16, 2024
4ee28f6
Merge branch 'master' into daniel/engine_desktop_build
Unreal-Dan Jan 17, 2024
1ae936c
Merge branch 'master' into daniel/engine_desktop_build
Unreal-Dan Jan 17, 2024
7840cd1
Merge branch 'master' into daniel/engine_desktop_build
Unreal-Dan Jan 25, 2024
2431248
Merge branch 'master' into daniel/engine_desktop_build
Unreal-Dan Jan 25, 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
8 changes: 5 additions & 3 deletions VortexTestingFramework/IRSimulator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include "IRSimulator.h"
#include "VortexLib.h"

#include "VortexEngine.h"

#include <stdio.h>

#define DEFAULT_PORT "33456"
Expand Down Expand Up @@ -113,7 +115,7 @@ void IRSimulator::process_incoming_messages()
}
bool is_mark = (message & (1 << 31)) != 0;
message &= ~(1 << 31);
Vortex::IRDeliver(message);
g_pTestFramework->vortex().IRDeliver(message);
}
}

Expand Down Expand Up @@ -159,7 +161,7 @@ bool IRSimulator::startServer()
printf("Success listening on *:8080\n");
m_isServer = true;
g_pTestFramework->setWindowTitle(g_pTestFramework->getWindowTitle() + " Receiver");
g_pTestFramework->setWindowPos(LED_COUNT == 28 ? 975 : 900, 350);
g_pTestFramework->setWindowPos(g_pTestFramework->engine().leds().ledCount() == 28 ? 975 : 900, 350);

// launch another instance of the test framwork to act as the sender
if (m_isServer) {
Expand Down Expand Up @@ -231,7 +233,7 @@ bool IRSimulator::startClient()
}
CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)process_incoming_messages, NULL, 0, NULL);
g_pTestFramework->setWindowTitle(g_pTestFramework->getWindowTitle() + " Sender");
g_pTestFramework->setWindowPos(LED_COUNT == 28 ? 300 : 250, 350);
g_pTestFramework->setWindowPos(g_pTestFramework->engine().leds().ledCount() == 28 ? 300 : 250, 350);
return true;
}

Expand Down
2 changes: 2 additions & 0 deletions VortexTestingFramework/IRSimulator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
// This is a network connection that simulates the IR connection between
// two vortex engines so that mode sharing can be tested

class VortexEngine;

class IRSimulator
{
public:
Expand Down
Loading
Loading