Changeset 875

Timestamp:

02/23/10 20:27:48 (3 years ago)

Author:

fe50

Message:

• added greek language support (codepage 1253), provided by zeno (​http://chdk.setepontos.com/index.php/topic,2949.0.html), font file "ArilGR14.rbf" by alk_is, CHDK Bugtracker ID 210 (​http://chdk.kernreaktor.org/mantis/view.php?id=210)

• added task structure header files, provided by cppasm (​http://chdk.setepontos.com/index.php/topic,4801.0.html) for further development

• added extended Tv fix for some newer cameras like the SX10 / SD980, by barberofcivil (​http://chdk.setepontos.com/index.php/topic,4392.0.html) Normally the shutter overrides work by setting the propcase values at some point after auto-exposure has happened; the Canon code previously took these values unchanged for short exposures. In some newer cameras, the value is changed, apparently some time after it has been retrieved from the propcase; the modified code now handles this.

Location:

trunk

Files:

• CHDK/FONTS/ArilGR14.rbf (added)
• CHDK/LANG/greek.lng (added)
• core/gui.c (modified) (1 diff)
• include/dryos23.h (added)
• include/dryos31.h (added)
• include/font.h (modified) (2 diffs)
• include/vxworks.h (added)
• lib/font/codepages.h (modified) (2 diffs)
• platform/generic/wrappers.c (modified) (1 diff)

trunk/core/gui.c

@@ -1113 +1113 @@
 //-------------------------------------------------------------------
 const char* gui_font_enum(int change, int arg) {
-    static const char* fonts[]={ "Win1250", "Win1251", "Win1252", "Win1254", "Win1257"};
+    static const char* fonts[]={ "Win1250", "Win1251", "Win1252", "Win1253", "Win1254", "Win1257"};
 
     conf.font_cp+=change;

trunk/include/font.h

@@ -13 +13 @@
 #define  FONT_CP_WIN_1254       3
 #define  FONT_CP_WIN_1257       4
+/* 1253 (Greek) */
+#define  FONT_CP_WIN_1253       5
 
 //-------------------------------------------------------------------
@@ -41 +43 @@
 #endif
 
-
-
-

trunk/lib/font/codepages.h

@@ -46 +46 @@
 };
 
-/* 1253 (Greek) */
+/* 1253 (Greek) */  
+static unsigned short cp_win_1253[] = {
+    0x20AC, 0xFFFF, 0x201A, 0x0192, 0x201E, 0x2026, 0x2020, 0x2021, 0xFFFF, 0x2030, 0xFFFF, 0x2039, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 
+    0xFFFF, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 0xFFFF, 0x2122, 0xFFFF, 0x203A, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 
+    0x00A0, 0x0385, 0x0386, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0xFFFF, 0x00AB, 0x00AC, 0x00AD, 0x00AE, 0x2015, 
+    0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x0384, 0x00B5, 0x00B6, 0x00B7, 0x0388, 0x0389, 0x038A, 0x00BB, 0x038C, 0x00BD, 0x038E, 0x038F, 
+    0x0390, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, 0x0398, 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 
+    0x03A0, 0x03A1, 0xFFFF, 0x03A3, 0x03A4, 0x03A5, 0x03A6, 0x03A7, 0x03A8, 0x03A9, 0x03AA, 0x03AB, 0x03AC, 0x03AD, 0x03AE, 0x03AF, 
+    0x03B0, 0x03B1, 0x03B2, 0x03B3, 0x03B4, 0x03B5, 0x03B6, 0x03B7, 0x03B8, 0x03B9, 0x03BA, 0x03BB, 0x03BC, 0x03BD, 0x03BE, 0x03BF, 
+    0x03C0, 0x03C1, 0x03C2, 0x03C3, 0x03C4, 0x03C5, 0x03C6, 0x03C7, 0x03C8, 0x03C9, 0x03CA, 0x03CB, 0x03CC, 0x03CD, 0x03CE, 0xFFFF, 
+};
 
 /* 1254 (Turkish) */
@@ -86 +96 @@
     cp_win_1251, 
     cp_win_1252, 
+    cp_win_1253, 
     cp_win_1254, 
-    cp_win_1257
+    cp_win_1257 
 };
 

trunk/platform/generic/wrappers.c

@@ -890 +890 @@
 int  apex2us(int apex_tv){
 #if CAM_EXT_TV_RANGE
- if (apex_tv<-576) return 1000000.0*pow(2.0, -apex_tv/96.0);
- else return _apex2us(apex_tv);
-#else
- return 0;
+/*
+ Extended Tv, by barberofcivil, http://chdk.setepontos.com/index.php/topic,4392.0.html
+ Explanation by reyalP:
+ In every port, the original shutter overrides (as opposed to super long exposure) worked by
+ setting the propcase values at some point after auto-exposure has happened (except in manual
+ modes, where the manual control propcases may be used instead). The Canon code previously took
+ these values unchanged for short exposures. In newer cameras, like on the SX10 / SD980, the value
+ is changed, apparently some time after it has been retrieved from the propcase. We know this is
+ the case, because the propcase value itself doesn't get clamped to the allowed range (if it did,
+ barberofcivil's code wouldn't work).
+*/
+        short tv;
+        tv = shooting_get_tv96();
+        if (tv<-576 || tv!=apex_tv) return 1000000.0*pow(2.0, -tv/96.0);
+        else return _apex2us(apex_tv);
+#else
+        return 0;
 #endif
 }