From 31eff2e67922f93da05f13cad163567d4a9a2953 Mon Sep 17 00:00:00 2001 From: Clay Smith Date: Thu, 2 Feb 2023 19:36:23 -0600 Subject: Last Commit? --- Controller_Program.numbers | Bin 353158 -> 349917 bytes global_defs.h | 1 + handle_devices.c | 30 ++++++++++++++++++++++++++++-- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/Controller_Program.numbers b/Controller_Program.numbers index 319aab9..68c7029 100755 Binary files a/Controller_Program.numbers and b/Controller_Program.numbers differ diff --git a/global_defs.h b/global_defs.h index 84c4124..f6ce735 100644 --- a/global_defs.h +++ b/global_defs.h @@ -10,6 +10,7 @@ #define NUM_EVENTS_PS4 3 #define NUM_EVENTS_WII 4 #define NUM_EVENTS 13 //steam + xbox + ps4 * 6 + wii * 4 + mouse +#define BUFSIZE 40 // WIRED PS4 diff --git a/handle_devices.c b/handle_devices.c index 2164cec..df3e9f3 100644 --- a/handle_devices.c +++ b/handle_devices.c @@ -179,6 +179,7 @@ void print_multiple_events(int num_exceptions, int controller_event_fptrs[], ... if (isParent) { //printf("\nIm the parent, pid: %d\n", getpid()); //put the code you want the parent to run here? + char buffer[BUFSIZE+1]; int initial_read = read(controller_event_fptrs[pairs[0].event_fptr_index], &event[0], event_size); if (initial_read == -1) { fprintf(stderr, "PROBLEM READING FILE!\n"); @@ -187,13 +188,25 @@ void print_multiple_events(int num_exceptions, int controller_event_fptrs[], ... size_t start_sec = event[0].time.tv_sec; while (read(controller_event_fptrs[pairs[0].event_fptr_index], &event[0], event_size) != -1) { if (event[0].type == 0) continue; - printf("%d %zu.%-6zu %d %3d %9d\n", + + printf("%d %zu.%-6zu %d %3d %11d\n", + pairs[0].event_user_num, + event[0].time.tv_sec - start_sec, + event[0].time.tv_usec, + event[0].type, + event[0].code, + event[0].value); + +/* + snprintf(buffer, BUFSIZE, "%d %zu.%-6zu %d %3d %11d\n", pairs[0].event_user_num, event[0].time.tv_sec - start_sec, event[0].time.tv_usec, event[0].type, event[0].code, event[0].value); + write(STDOUT_FILENO, buffer, sizeof(buffer)); +*/ } fprintf(stderr, "DISCONNECTED\n"); } @@ -203,6 +216,7 @@ void print_multiple_events(int num_exceptions, int controller_event_fptrs[], ... if (pids[i] == 0) { //printf("Im child #%d.\n", i + 1); //put the rest of the code in here? + char buffer[BUFSIZE+1]; int initial_read = read(controller_event_fptrs[pairs[i+1].event_fptr_index], &event[i+1], event_size); if (initial_read == -1) { fprintf(stderr, "PROBLEM READING FILE!\n"); @@ -211,13 +225,25 @@ void print_multiple_events(int num_exceptions, int controller_event_fptrs[], ... size_t start_sec = event[i+1].time.tv_sec; while (read(controller_event_fptrs[pairs[i+1].event_fptr_index], &event[i+1], event_size) != -1) { if (event[i+1].type == 0) continue; - printf("%d %zu.%-6zu %d %3d %9d\n", + + printf("%d %zu.%-6zu %d %3d %11d\n", + pairs[i+1].event_user_num, + event[i+1].time.tv_sec - start_sec, + event[i+1].time.tv_usec, + event[i+1].type, + event[i+1].code, + event[i+1].value); + +/* + snprintf(buffer, BUFSIZE, "%d %zu.%-6zu %d %3d %11d\n", pairs[i+1].event_user_num, event[i+1].time.tv_sec - start_sec, event[i+1].time.tv_usec, event[i+1].type, event[i+1].code, event[i+1].value); + write(STDOUT_FILENO, buffer, sizeof(buffer)); +*/ } fprintf(stderr, "DISCONNECTED\n"); } -- cgit v1.2.1