Changeset 602

Timestamp:

11/29/08 19:40:05 (5 years ago)

Author:

phyrephox

Message:

• fixed get_platform_id in ubasic and also in the "safety feature"

now returns the right decimal platform id. perhaps someone can figure out why atoi(PLATFORMID) can't be assigned to conf.platformid on cfg creation ( error: initializer element is not constant)?

due to this fix, some cfg items get resetted on cfgs by people who used latest revisions (no biggie i hope):

conf.raw_cache = 0;
conf.zoom_override_value = 0;
conf.fast_ev = 0;
conf.fast_movie_control = 0;
conf.fast_movie_quality_control = 0;
conf.zoom_scale = 100;
conf.platformid = atoi(PLATFORMID);

this one gave me a headache, and in the end it turned out i was the idiot :D
note: perhaps someone should update the wiki with the decimal platform ids ​http://chdk.wikia.com/wiki/P-ID_(Table)

Location:

trunk

Files:

• CHDK/LANG/german.lng (modified) (2 diffs)
• core/conf.c (modified) (3 diffs)
• lib/ubasic/ubasic.c (modified) (1 diff)

trunk/CHDK/LANG/german.lng

@@ -585 +585 @@
 414 "    Bei Neustart löschen"
 
-415 "RAW-Endung für Reihe"
-
-416 "  in Fahrenheit"
+415 "RAW-Präfix für Reihe"
+
+416 "    in Fahrenheit"
 
 // Konturenüberlagerung
 417 "Lade Konturen ..."
 418 "Speichere Konturen ..."
-419 "Auch im Playmode"
+419 "Auch im Playmode?"
 420 "Gib Speicher frei ..."
 421 "Lade und setze Zoom"
 422 "Sperre Konturenüberlagerung"
 
-423 "2. Vorhang Blitzsychro"
+423 "2. Vorhang Blitzsynchro"
 
 // DNG
@@ -603 +603 @@
 425 "RAW-Puffer nutzen"
 426 "Datei badpixel.bin fehlt!"
-427 "Zeige raw speicherzeit"
+427 "Zeige RAW Speicherzeit"
 
 428 "4 Gewinnt"

trunk/core/conf.c

@@ -107 +107 @@
 void clear_values()
 {       
-        if (conf.platformid != (int)PLATFORMID) // the following config entries will be resetted if you switch the camera using the same cfg
+        if (conf.platformid != atoi(PLATFORMID)) // the following config entries will be resetted if you switch the camera using the same cfg
         {
     conf.raw_cache = 0;
@@ -115 +115 @@
     conf.fast_movie_quality_control = 0;
     conf.zoom_scale = 100;
-    conf.platformid = (int)PLATFORMID;
+    conf.platformid = atoi(PLATFORMID);
         }
 
@@ -390 +390 @@
     CONF_INFO(227, conf.flash_sync_curtain,     CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO(228, conf.raw_timer,     CONF_DEF_VALUE, i:0, NULL),
-    CONF_INFO(229, conf.platformid,     CONF_DEF_VALUE, i:(int)PLATFORMID, NULL),
+    CONF_INFO(229, conf.platformid,     CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO(230, conf.save_raw_in_edgeoverlay,     CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO(231, conf.save_raw_in_auto,     CONF_DEF_VALUE, i:0, NULL),

trunk/lib/ubasic/ubasic.c

@@ -272 +272 @@
   case TOKENIZER_GET_PLATFORM_ID:
     accept(TOKENIZER_GET_PLATFORM_ID);
-    r = (int)PLATFORMID;
+    r = atoi(PLATFORMID);
    break;
   case TOKENIZER_GET_DRIVE_MODE: