Skip to content

use CRLF for txt dump #69

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

Merged
jsm174 merged 1 commit into from
Apr 14, 2025
Merged

use CRLF for txt dump #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 21 additions & 21 deletions src/DMD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "DMDUtil/DMD.h"

#include "DMDUtil/Config.h"
#include "DMDUtil/ConsoleDMD.h"
#include "DMDUtil/LevelDMD.h"
Expand All @@ -14,15 +15,14 @@
#include <chrono>
#include <cstring>

#include "sockpp/tcp_connector.h"

#include "AlphaNumeric.h"
#include "FrameUtil.h"
#include "Logger.h"
#include "ZeDMD.h"
#include "pupdmd.h"
#include "serum-decode.h"
#include "serum.h"
#include "sockpp/tcp_connector.h"

namespace DMDUtil
{
Expand All @@ -45,23 +45,20 @@ void ZEDMDCALLBACK ZeDMDLogCallback(const char* format, va_list args, const void

class DMDServerConnector
{
public:
~DMDServerConnector() { delete m_pConnector; }
public:
~DMDServerConnector() { delete m_pConnector; }

static DMDServerConnector* Create(const char* pAddress, int port)
{
sockpp::tcp_connector* pConnector = new sockpp::tcp_connector({pAddress, (in_port_t)port});
return pConnector ? new DMDServerConnector(pConnector) : nullptr;
}
static DMDServerConnector* Create(const char* pAddress, int port)
{
sockpp::tcp_connector* pConnector = new sockpp::tcp_connector({pAddress, (in_port_t)port});
return pConnector ? new DMDServerConnector(pConnector) : nullptr;
}

ssize_t Write(const void* buf, size_t size)
{
return m_pConnector->write_n(buf, size);
}
ssize_t Write(const void* buf, size_t size) { return m_pConnector->write_n(buf, size); }

void Close() { m_pConnector->close(); }
void Close() { m_pConnector->close(); }

private:
private:
DMDServerConnector(sockpp::tcp_connector* pConnector) : m_pConnector(pConnector) {}
sockpp::tcp_connector* m_pConnector;
};
Expand Down Expand Up @@ -1510,16 +1507,19 @@ void DMD::DumpDMDTxtThread()

if (f)
{
fprintf(f, "0x%08x\n", passed[0]);
for (int y = 0; y < m_pUpdateBufferQueue[bufferPosition]->height; y++)
if (passed[0] > 0)
{
for (int x = 0; x < m_pUpdateBufferQueue[bufferPosition]->width; x++)
fprintf(f, "0x%08x\r\n", passed[0]);
for (int y = 0; y < m_pUpdateBufferQueue[bufferPosition]->height; y++)
{
fprintf(f, "%x", renderBuffer[0][y * m_pUpdateBufferQueue[bufferPosition]->width + x]);
for (int x = 0; x < m_pUpdateBufferQueue[bufferPosition]->width; x++)
{
fprintf(f, "%x", renderBuffer[0][y * m_pUpdateBufferQueue[bufferPosition]->width + x]);
}
fprintf(f, "\r\n");
}
fprintf(f, "\n");
fprintf(f, "\r\n");
}
fprintf(f, "\n");
}
memcpy(renderBuffer[0], renderBuffer[1], length);
passed[0] = passed[1];
Expand Down