Leahnaya/gba-link-connection
1
0
Fork 0
mirror of https://github.com/afska/gba-link-connection.git synced 2026-10-02 05:47:11 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reverting test code

Browse Source 
This reverts commit a8383a67eec7c82079d533c8a60f6202aeb3b059.
This commit is contained in:
Rodrigo Alfonso
2024-08-19 04:34:51 -03:00
parent 0aa6d70178
commit 1aaf84bb27
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/LinkMobile_demo/Makefile
View File

@@ -141,7 +141,7 @@ LIBDIRS := $(TONCLIB) $(PWD)/../_lib/libugba
# --- switches ---
bMB := 1 # Multiboot build
bMB := 0 # Multiboot build
bTEMPS := 0 # Save gcc temporaries (.i and .s files)
bDEBUG2 := 0 # Generate debug info (bDEBUG2? Not a full DEBUG flag. Yet)

1
examples/LinkMobile_demo/src/main.cpp
View File

@@ -533,7 +533,6 @@ std::string getErrorString(LinkMobile::Error error) {
toHex(error.cmdId) +
"\n CmdResult: " + getResultString(error.cmdResult) +
"\n CmdErrorCode: " + std::to_string(error.cmdErrorCode) +
"\n TEST: " + toHex(error.notWaiting) +
"\n ReqType: " + std::to_string(error.reqType) + "\n";
}

10
lib/LinkMobile.hpp
View File

@@ -100,8 +100,8 @@ class LinkMobile {
using u8 = unsigned char;
static constexpr auto BASE_FREQUENCY = Link::_TM_FREQ_1024;
static constexpr int INIT_WAIT_FRAMES = 30;
static constexpr int INIT_TIMEOUT_FRAMES = 60;
static constexpr int INIT_WAIT_FRAMES = 7;
static constexpr int INIT_TIMEOUT_FRAMES = 30;
static constexpr int PING_FREQUENCY_FRAMES = 60;
static constexpr int ADAPTER_WAITING = 0xd2;
static constexpr u32 ADAPTER_WAITING_32BIT = 0xd2d2d2d2;
@@ -254,7 +254,6 @@ class LinkMobile {
u8 cmdId = 0;
CommandResult cmdResult = CommandResult::PENDING;
u8 cmdErrorCode = 0;
u32 notWaiting = 0;
bool cmdIsSending = false;
int reqType = -1;
};
@@ -831,7 +830,6 @@ class LinkMobile {
u16 expectedChecksum;
u8 errorCommandId;
u8 errorCode;
u32 notWaiting = 0;
bool isActive = false;
void reset() {
@@ -1530,9 +1528,9 @@ class LinkMobile {
.cmdId = asyncCommand.relatedCommandId(),
.cmdResult = asyncCommand.result,
.cmdErrorCode = asyncCommand.errorCode,
.notWaiting = asyncCommand.notWaiting,
.cmdIsSending =
asyncCommand.direction == AsyncCommand::Direction::SENDING,
.reqType = userRequests.isEmpty() ? -1 : userRequests.peek().type};
_LMLOG_(
@@ -1630,7 +1628,6 @@ class LinkMobile {
asyncCommand.transferred >= mainSize + CHECKSUM_SIZE + 1;
if (!isAcknowledgement && newData != ADAPTER_WAITING) {
_LMLOG_("!! not waiting: %X", newData);
asyncCommand.notWaiting = newData;
return asyncCommand.fail(CommandResult::NOT_WAITING);
}
@@ -1667,7 +1664,6 @@ class LinkMobile {
if (!isAcknowledgement && newData != ADAPTER_WAITING &&
newData != ADAPTER_WAITING_32BIT) {
_LMLOG_("!! not waiting: %X", newData);
asyncCommand.notWaiting = newData;
return asyncCommand.fail(CommandResult::NOT_WAITING);
}