Reverted passthough.c changes and fixed a typo in lindbergh.c

This commit is contained in:
dkeruza-neo
2025-03-29 15:37:45 -04:00
parent f677f1cd3f
commit 8d1f2764f3
2 changed files with 4 additions and 8 deletions
+1 -1
View File
@@ -444,7 +444,7 @@ int main(int argc, char *argv[])
continue;
}
if (strcmp(argv[i], "-z") == 0 || strcmp(argv[i], "--ziink") == 0)
if (strcmp(argv[i], "-z") == 0 || strcmp(argv[i], "--zink") == 0)
{
zink = 1;
continue;
+3 -7
View File
@@ -159,11 +159,8 @@ void *readJVSFrameThread(void * arg)
ackSize = 0;
waitForEnd = 0;
do {
while (jvsFrameBuffer.ready == 1)
{
usleep(1);
}
do
{
// printf("SERIAL thread debug: trying to read byte.\n");
// Try to read a byte from serial, this call will be blocking if VMIN > 0 and VTIME = 0
bytesRead = read(fd, &localBuffer[byteCount], 1);
@@ -198,7 +195,6 @@ void *readJVSFrameThread(void * arg)
}
} while (waitForEnd);
// Lock the buffer while we write to it
pthread_mutex_lock(&jvsBuffer_lock);
memcpy(jvsFrameBuffer.buffer, localBuffer, byteCount);
@@ -247,7 +243,7 @@ JVSFrame readJVSFrameFromThread() {
// Check if we have a valid frame
if (jvsFrameBuffer.ready == 1) {
memcpy(&frame, &jvsFrameBuffer, sizeof(JVSFrame));
frame = jvsFrameBuffer;
// It has been red, we disable this frame
jvsFrameBuffer.ready = 0;
} else {