new grid X offset calcs to fix some issues

[proxmark3-svn] / client / proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 2ed127a4f934d2eb736c567af1de07d3d1e77af5..d00af5ccb1ad9d75a4d9ec37b37ae1e99d34ec06 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -102,7 +102,7 @@ static void *main_loop(void *targ) {
        struct receiver_arg rarg;
        char *cmd = NULL;
        pthread_t reader_thread;
        struct receiver_arg rarg;
        char *cmd = NULL;
        pthread_t reader_thread;

-  
+

        if (arg->usb_present == 1) {
                rarg.run = 1;
                pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);
        if (arg->usb_present == 1) {
                rarg.run = 1;
                pthread_create(&reader_thread, NULL, &uart_receiver, &rarg);


@@ -175,13 +175,13 @@ static void *main_loop(void *targ) {
                rarg.run = 0;
                pthread_join(reader_thread, NULL);
        }
                rarg.run = 0;
                pthread_join(reader_thread, NULL);
        }

-
+       
+       ExitGraphics();
+       

        if (script_file) {
                fclose(script_file);
                script_file = NULL;
        }
        if (script_file) {
                fclose(script_file);
                script_file = NULL;
        }

-
-       ExitGraphics();

        pthread_exit(NULL);
        return NULL;
 }
        pthread_exit(NULL);
        return NULL;
 }


@@ -199,12 +199,12 @@ static void dumpAllHelp(int markdown)
 static char *my_executable_path = NULL;
 static char *my_executable_directory = NULL;
 
 static char *my_executable_path = NULL;
 static char *my_executable_directory = NULL;
 

-const char const *get_my_executable_path(void)
+const char *get_my_executable_path(void)

 {
        return my_executable_path;
 }
 
 {
        return my_executable_path;
 }
 

-const char const *get_my_executable_directory(void)
+const char *get_my_executable_directory(void)

 {
        return my_executable_directory;
 }
 {
        return my_executable_directory;
 }


@@ -219,6 +219,7 @@ static void set_my_executable_path(void)
                        my_executable_path[path_length] = '\0';
                        my_executable_directory = (char *)malloc(dirname_length + 2);
                        strncpy(my_executable_directory, my_executable_path, dirname_length+1);
                        my_executable_path[path_length] = '\0';
                        my_executable_directory = (char *)malloc(dirname_length + 2);
                        strncpy(my_executable_directory, my_executable_path, dirname_length+1);

+                       my_executable_directory[dirname_length+1] = '\0';

                }
        }
 }
                }
        }
 }


@@ -253,7 +254,7 @@ int main(int argc, char* argv[]) {
                .usb_present = 0,
                .script_cmds_file = NULL
        };
                .usb_present = 0,
                .script_cmds_file = NULL
        };

-       pthread_t main_loop_threat;
+       pthread_t main_loop_thread;

 
   
        sp = uart_open(argv[1]);
 
   
        sp = uart_open(argv[1]);


@@ -287,13 +288,16 @@ int main(int argc, char* argv[]) {
 
        // create a mutex to avoid interlacing print commands from our different threads
        pthread_mutex_init(&print_lock, NULL);
 
        // create a mutex to avoid interlacing print commands from our different threads
        pthread_mutex_init(&print_lock, NULL);

+       pthread_create(&main_loop_thread, NULL, &main_loop, &marg);

 
 

-       pthread_create(&main_loop_threat, NULL, &main_loop, &marg);
+       // build ui/graph forms on separate thread (killed on main_loop_thread);

        InitGraphics(argc, argv);
        InitGraphics(argc, argv);

-

        MainGraphics();
        MainGraphics();

+       //this won't return until ExitGraphics() is called

 
 

-       pthread_join(main_loop_threat, NULL);
+       //wait for thread to finish
+       pthread_join(main_loop_thread, NULL);
+       

 
        // Clean up the port
        if (offline == 0) {
 
        // Clean up the port
        if (offline == 0) {