Changeset 613

Timestamp:

12/02/08 14:34:23 (4 years ago)

Author:

phyrephox

Message:

+ added new feature (By PlasmaHH) - compare Propcases
Usage: go to debug menu, go to "ALT +/- debug action", set to "CmpProps?" (Compare propcases)
then in alt-mode, press the +/- button to initialize it (all current propcases are then saved)
then after you made changes in the camera (canon menu) you enter alt-mode, press +/- button - you will see all the props that have changed, until you exit alt-mode
if there are more than 12 changed propcases, after 15 seconds it will show the next entries. this is not convenient, but i couldnt come up with a better way for now.
on the other hand: it's not clever changing so many things at once (in-camera) to find out propcases. one at a time is the better solution.

• gui_fselect.c & rbf_font/rbf_font.c - squashed some compiler warnings (PlasmaHH)
• makefile - version.inc was updated even when no new data was inserted, i disabled it (dont think there will be any sideeffects)

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• core/gui.c (modified) (5 diffs)
• core/gui_fselect.c (modified) (1 diff)
• lib/font/rbf_font.c (modified) (1 diff)

trunk/Makefile

@@ -58 +58 @@
 version: FORCE
         echo "**** Build: $(BUILD_NUMBER)"
-        echo "BUILD_NUMBER := $(BUILD_NUMBER)" > version.inc
+#       echo "BUILD_NUMBER := $(BUILD_NUMBER)" > version.inc
 
 FORCE:

trunk/core/gui.c

@@ -146 +146 @@
 #endif
 static void gui_draw_load_menu_rbf(int arg);
-static void gui_draw_load_symbol_rbf(int arg);                  //AKA
+static void gui_draw_load_symbol_rbf(int arg);          //AKA
 #ifdef OPT_TEXTREADER
         static void gui_draw_load_rbf(int arg);
@@ -158 +158 @@
 static void gui_menuproc_edge_load(int arg);
 static void gui_menuproc_edge_free(int arg);
-
+#ifdef OPT_DEBUGGING
+void gui_compare_props(int arg);
+#endif
 #ifndef OPTIONS_AUTOSAVE
 static void gui_menuproc_save(int arg);
@@ -1845 +1847 @@
 #define DEBUG_DISPLAY_TASKS 3
 static const char * gui_debug_shortcut_enum(int change, int arg) {
-    static const char* modes[]={ "None", "Dmp RAM", "Page"};
+    static const char* modes[]={ "None", "DmpRAM", "Page", "CmpProps"};
 
     conf.debug_shortcut_action += change;
@@ -1891 +1893 @@
                     debug_propcase_page = 0;
             }
+        break;
+        case 3:
+            gui_compare_props(1);
         break;
     }
@@ -3183 +3188 @@
 }
 
+#ifdef OPT_DEBUGGING
+
+void gui_compare_props(int arg)
+{
+        #define NUM_PROPS 512
+        static int initialized = 0;
+        static int props[NUM_PROPS] = { };
+        char buf[64];
+        int i;
+        int p;
+        int c;
+
+
+        if( initialized )
+        { // we have previous data set! do a comparison
+                c = 0;
+                for( i = 0; i < NUM_PROPS; ++i )
+                {
+                        p = shooting_get_prop(i);
+                        if( props[i] != p )
+                        {
+                                ++c;
+                                sprintf(buf,"%4d is %8d was %8d",i,p,props[i]);
+                                draw_string(16,16*c,buf,MAKE_COLOR(COLOR_BLACK,COLOR_YELLOW));
+                        }
+                        props[i] = p;
+                        if( c == 12 )
+                        {
+                                ++c;
+                                sprintf(buf,"%s","Waiting 15 Seconds");
+                                draw_string(16,16*c,buf,MAKE_COLOR(COLOR_BLACK,COLOR_YELLOW));
+                                msleep(15000);
+                                c = 0;
+                        }
+                }
+                ++c;
+                sprintf(buf,"%s","Press <ALT> to leave");
+                draw_string(16,16*c,buf,MAKE_COLOR(COLOR_BLACK,COLOR_YELLOW));
+        }
+        else
+        {
+        // no previous data was set so we save the data initially
+                for( i = 0; i < NUM_PROPS; ++i )
+                {
+                        props[i] = shooting_get_prop(i);
+                }
+        }
+        initialized = 1;
+}
+
+#endif

trunk/core/gui_fselect.c

@@ -656 +656 @@
 static void fselect_marked_paste_cb(unsigned int btn) {
     struct fitem  *ptr;
-    int ss, sd, fsrc, fdst, i=0;
+    int ss, sd = 0, fsrc, fdst, i=0;
     register int *buf;
     unsigned char fend;

trunk/lib/font/rbf_font.c

@@ -211 +211 @@
     
     for (i=0; i<256; ++i) {
-        rbf_assign_char_8x16(&rbf_font.cTable[i], font[i], rbf_font.height);
+        rbf_assign_char_8x16(&rbf_font.cTable[i], (char*)font[i], rbf_font.height);
     }
     need_free = 1;