Changeset 1646

Timestamp:

02/05/12 22:08:30 (17 months ago)

Author:

reyalp

Message:

Merged revision(s) 1643-1645 from branches/release-1_0:
a1100 - override _GetBatteryTemperature with dummy to prevent crash
a1100 - undef CAM_EXT_TV_RANGE since it obviously isn't implemented, update notes
a1100 - use undef instead of define 0 for clarity

Location:

trunk

Files:

• . (modified) (1 prop)
• platform/a1100/lib.c (modified) (1 diff)
• platform/a1100/notes.txt (modified) (1 diff)
• platform/a1100/platform_camera.h (modified) (1 diff)

trunk/platform/a1100/lib.c

@@ -44 +44 @@
  return 122; 
 }
+
+/*
+GetBatteryTemperature usually will get back temperature of battery compartment/batteries. GetBatteryTemperature is implemented in Canon's firmware for SX120IS.
+Firmware entry point is identified but function is not usable. 
+Camera will crash if Canon's GetBatteryTemperature is called by CHDK.
+To avoid a crash Canon's GetBatteryTemperature must not called. As long CHDK general code do not distinguish between cameras that support or don't support GetBatteryTemperature, 
+this function will be implemented as specific CHDK-code. It returns always with -99
+This overrides original canon entry point from stubs_entry.S
+*/
+int _GetBatteryTemperature()
+{
+      return -99;
+}
+

trunk/platform/a1100/notes.txt

@@ -9 +9 @@
 
 version -> [func.set]+[down]
+
+Battery temperature is not available on this camera, always returns -99
+
+Optical zoom in video does not work
+
+Extra long exposures (>64 seconds) not implemented

trunk/platform/a1100/platform_camera.h

@@ -38 +38 @@
     #undef  DEFAULT_RAW_EXT 
     #define DEFAULT_RAW_EXT                 2  // use .CR2 
-    #define CAM_EXT_TV_RANGE                0
-    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 0
-    #define CAM_CAN_MUTE_MICROPHONE         0
-    #define CAM_EV_IN_VIDEO                 0
+    #undef CAM_EXT_TV_RANGE
+    #undef CAM_AF_SCAN_DURING_VIDEO_RECORD
+    #undef CAM_CAN_MUTE_MICROPHONE
+    #undef CAM_EV_IN_VIDEO
 
     #undef  CAM_UNCACHED_BIT