Changeset 1841

Timestamp:

05/06/12 22:30:09 (13 months ago)

Author:

reyalp

Message:

Merged revision(s) 1838-1840 from trunk:
g12 jogdial direction fix from waterwingz in ​http://chdk.setepontos.com/index.php?topic=650.msg85087#msg85087
d10 - add script led support (0=green, 1=orange, 2=AF)
add script LED support for ixus80_sd1100, from jourh in ​http://chdk.setepontos.com/index.php?topic=2044.msg85112#msg85112

Location:

branches/release-1_0

Files:

• . (modified) (1 prop)
• platform/d10/lib.c (modified) (1 diff)
• platform/g10/kbd.c (modified) (1 diff)
• platform/ixus80_sd1100/lib.c (modified) (1 diff)

branches/release-1_0/platform/d10/lib.c

@@ -40 +40 @@
 }
 
-// TODO
+/*
+D10 has 3 led values
+0/0 - Upper indicator Green
+1/1 - Upper indicator Orange
+2/9 - AF
+10-11 appears to also drive AF, but using the same codepath as non AF leds (no assert on invalid)
+note, LEDDrive returns 3 on invalid params otherwise 0
+second param 0 = solid on, 1 = off, 2-7 blink patterns
+2: continuous ~1 blink/sec
+3: continuous fast blink
+4: continuous medium blink (2/sec ?) 
+5: burst of 3? fast blinks
+6: continuous slow blinks
+7: if led was off 1 very fast blink. depends on previous state
+8: no obvious effect, but returns 0 for AF
+>8: If used with AF ASSERT!! LEDDrv.c Line 215, otherwise returns 3
+*/
 void camera_set_led(int led, int state, int bright) {
+ static char led_table[]={0,1,9};
+ _LEDDrive(led_table[led%sizeof(led_table)], state<=1 ? !state : state);
 }
-
-

branches/release-1_0/platform/g10/kbd.c

@@ -427 +427 @@
  old_jogdial=new_jogdial;
  new_jogdial=Get_JogDial();
- if (old_jogdial>new_jogdial) return JOGDIAL_LEFT;
- else if (old_jogdial<new_jogdial) return JOGDIAL_RIGHT;
+ if (old_jogdial<new_jogdial) return JOGDIAL_LEFT;
+ else if (old_jogdial>new_jogdial) return JOGDIAL_RIGHT;
  else return 0;
 }

branches/release-1_0/platform/ixus80_sd1100/lib.c

@@ -31 +31 @@
 void camera_set_led(int led, int state, int bright)
 {
-/* ???
-  int leds[] = {12,16,4,8,4,0,4};
-  if(led < 4 || led > 10 || led == 6) return;
-  volatile long *p=(void*)LED_AF + leds[led-4];
-    if (state)
-        p[0]=0x46;
-    else
-        p[0]=0x44;
-*/
-}
+    int leds[] = {0xd0,0x134,0x138,0x134,0x130,0xd4,0x3030,0x3030};  // power=3 | green | yellow | (not used) | orange | blue | af beam | timer
+    if(led >= 3 && led <= 10 && led != 6)  //  map to valid params;  no extra TIMER LED (is same as AF)
+    {
+        volatile long *p=(void*)0xc0220000 + leds[(led-3)%sizeof(leds)];
+        if (state)
+            p[0]=0x46;
+        else
+            p[0]=0x44;
+    }
+}