Changeset 604

Timestamp:

11/29/08 23:17:48 (4 years ago)

Author:

phyrephox

Message:

• fixed platform_id again :D (wasnt really a bug)

final commit for tonight (hopefully) thx to reyalp

Location:

trunk

Files:

• core/conf.c (modified) (3 diffs)
• doc/version.txt (modified) (1 diff)
• lib/ubasic/ubasic.c (modified) (1 diff)
• makefile.inc (modified) (1 diff)

trunk/core/conf.c

@@ -107 +107 @@
 void clear_values()
 {       
-        if (conf.platformid != atoi(PLATFORMID)) // the following config entries will be resetted if you switch the camera using the same cfg
+        if (conf.platformid != 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 = atoi(PLATFORMID);
+    conf.platformid = 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:0, NULL),
+    CONF_INFO(229, conf.platformid,     CONF_DEF_VALUE, i:PLATFORMID, 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/doc/version.txt

@@ -4 +4 @@
 
 
-0.8.6 / #597-603 / PhyrePhoX
+0.8.6 / #597-604 / PhyrePhoX
+
+* fixed platform_id again :D
 
 + new function (one of my favourites to date, and i just wrote it :D), only for s-series & TX-1 

trunk/lib/ubasic/ubasic.c

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

trunk/makefile.inc

@@ -287 +287 @@
 CFLAGS+=-mthumb-interwork
 CFLAGS+=-I$(topdir)include $(PLFLAGS) $(CPPFLAGS)
-CFLAGS+=-DPLATFORM=\"$(PLATFORM)\" -DPLATFORMSUB=\"$(PLATFORMSUB)\" -DPLATFORMID=\"$(PLATFORMID)\" -DHDK_VERSION=\"$(VER)\" -DBUILD_NUMBER=\"$(BUILD_NUMBER)\" -DCAMERA_$(PLATFORM)=1
+CFLAGS+=-DPLATFORM=\"$(PLATFORM)\" -DPLATFORMSUB=\"$(PLATFORMSUB)\" -DPLATFORMID=$(PLATFORMID) -DHDK_VERSION=\"$(VER)\" -DBUILD_NUMBER=\"$(BUILD_NUMBER)\" -DCAMERA_$(PLATFORM)=1
 CFLAGS+=-Wall -Wno-unused -Wno-format
 LDFLAGS=-L$(topdir)lib/math -L$(topdir)lib/font