Adding new cameras, applying patches into trunk (with source code prepared) - page 130 - General Discussion and Assistance - CHDK Forum  

Adding new cameras, applying patches into trunk (with source code prepared)

  • 1640 Replies
  • 540633 Views
Re: Adding new cameras, applying patches into trunk (with source code prepared)
« Reply #1290 on: 24 / January / 2014, 06:33:16 »
Advertisements
I published this patch more than a week ago but got no reply and the code didn't end up in the repository. Am I missing something/should have done something different?

A proposal patch to fix the eyefi functionalities I added. Relative to revision 3311.
- fixes a bug when user choses not to test a network being added
- more wait time network testing (it was often not enough)

I made extensive testing while traveling during 4 weeks, so it should be pretty stable right now.

*

Offline philmoz

  • *****
  • 3175
    • Photos
Re: Adding new cameras, applying patches into trunk (with source code prepared)
« Reply #1291 on: 24 / January / 2014, 07:14:06 »
I published this patch more than a week ago but got no reply and the code didn't end up in the repository. Am I missing something/should have done something different?

A proposal patch to fix the eyefi functionalities I added. Relative to revision 3311.
- fixes a bug when user choses not to test a network being added
- more wait time network testing (it was often not enough)

I made extensive testing while traveling during 4 weeks, so it should be pretty stable right now.

Thanks for the reminder - things get missed sometimes.

Added in revision 3333.

Phil.
CHDK ports:
  sx30is (1.00c, 1.00h, 1.00l, 1.00n & 1.00p)
  g12 (1.00c, 1.00e, 1.00f & 1.00g)
  sx130is (1.01d & 1.01f)
  ixus310hs (1.00a & 1.01a)
  sx40hs (1.00d, 1.00g & 1.00i)
  g1x (1.00e, 1.00f & 1.00g)
  g5x (1.00c, 1.01a, 1.01b)

Change to custom_auto_iso discussed here : http://chdk.setepontos.com/index.php?topic=11118.msg108981#msg108981

Applies cleanly to 1.3.0 trunk and with automatic patch offsets in 1.2.0.

Update : added 1/2000 shutter speed in response to this request : http://chdk.setepontos.com/index.php?topic=11118.msg110742#msg110742
« Last Edit: 05 / March / 2014, 21:20:29 by waterwingz »
Ported :   A1200    SD940   G10    Powershot N    G16

*

Offline philmoz

  • *****
  • 3175
    • Photos
Change to custom_auto_iso discussed here : http://chdk.setepontos.com/index.php?topic=11118.msg108981#msg108981

Applies cleanly to 1.3.0 trunk and with automatic patch offsets in 1.2.0.

Update : added 1/2000 shutter speed in response to this request : http://chdk.setepontos.com/index.php?topic=11118.msg110742#msg110742

Added to trunk in revision 3369, and release 1.2 in revision 3370.

Phil.
CHDK ports:
  sx30is (1.00c, 1.00h, 1.00l, 1.00n & 1.00p)
  g12 (1.00c, 1.00e, 1.00f & 1.00g)
  sx130is (1.01d & 1.01f)
  ixus310hs (1.00a & 1.01a)
  sx40hs (1.00d, 1.00g & 1.00i)
  g1x (1.00e, 1.00f & 1.00g)
  g5x (1.00c, 1.01a, 1.01b)


Hi,

thank you very much for the fast reaction and integration of 1/2000 in the auto-iso-code.
This is really very friendly!

One question concerning waterwingz statement here:
http://chdk.setepontos.com/index.php?topic=11259.msg110460#msg110460

Will I have to make a special request for that?
Or will you consider that "bug" automatically in future releases?

Best regards
canontestit

One question concerning waterwingz statement here:
...
Will I have to make a special request for that? Or will you consider that "bug" automatically in future releases?
It's on my "to do" list but not at the top.  Given the recent renewed interest in the function,  I'll see if I can get to it this month.

Update :  I took a look and I no longer believe there is a bug related to not setting an Av value for cameras with adjustable apertures.   At the point where the autoiso code runs,  the Av value should already be set. The code just adjusts the Tv and Sv values proportionately.
« Last Edit: 07 / March / 2014, 18:52:56 by waterwingz »
Ported :   A1200    SD940   G10    Powershot N    G16

Update patch to cleanup USB remote code in 1.3.0 prior to submitting separate changes for battery 3rd terminal triggering and high speed pulse width measurement.

Changes include :
1) moves usb_remote_key() calls from each camera's kbd.c routine to a common point in kbd_process()
2) white space cleanup of usb_xxxx.c files
3) multiple changes in anticipation of some day making the code run from an .flt module

Changes primarily from philmoz.  Thanks for that!

Tested on A1200 and G10.  Builds the 3395 tree without errors.
Ported :   A1200    SD940   G10    Powershot N    G16

*

Offline reyalp

  • ******
  • 12728
Update patch to cleanup USB remote code in 1.3.0 prior to submitting separate changes for battery 3rd terminal triggering and high speed pulse width measurement.
Added, trunk changeset 3396.
Don't forget what the H stands for.


*

Offline c10ud

  • ***
  • 245
This patch adjusts S110's kbd so it doesn't interfere with shooting (ptp) when keeping the KEY_POWER phisically pressed.
Also removed KEY_PRINT entry since I see a number of ports deprecated it.

Code: [Select]
diff --git a/platform/s110/kbd.c b/platform/s110/kbd.c
index 512c136..1f968a3 100644
--- a/platform/s110/kbd.c
+++ b/platform/s110/kbd.c
@@ -17,7 +17,7 @@ static long kbd_mod_state[3] = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF };
 extern void _GetKbdState(long*);
 
 #define KEYS_MASK0 (0x000181EF)
-#define KEYS_MASK1 (0x00C00000)
+#define KEYS_MASK1 (0x00800000)
 #define KEYS_MASK2 (0x000000C0)
 
 #define SD_READONLY_FLAG    0x00000800 // Found @0xf864bc7c, levent 0x20a
@@ -46,9 +46,11 @@ static KeyMap keymap[] = {
     { 0, KEY_VIDEO           ,0x00000100 },
     { 0, KEY_ZOOM_OUT        ,0x00008000 }, // Found @0xf864bc2c, levent 0x03
     { 0, KEY_ZOOM_IN         ,0x00010000 }, // Found @0xf864bc34, levent 0x02
-    { 1, KEY_POWER           ,0x00400000 }, // Found @0xf864bc54, levent 0x100
+
+// Removed since it breaks when shooting with KEY_POWER pressed
+//    { 1, KEY_POWER           ,0x00400000 }, // Found @0xf864bc54, levent 0x100
     { 1, KEY_PLAYBACK        ,0x00800000 }, // Found @0xf864bc5c, levent 0x101
-    { 1, KEY_PRINT           ,0x00800000 }, // = Default ALT button
+
     { 2, KEY_SHOOT_FULL      ,0x000000c0 }, // Found @0xf864bc6c, levent 0x01
     { 2, KEY_SHOOT_FULL_ONLY ,0x00000080 }, // Found @0xf864bc6c, levent 0x01
     { 2, KEY_SHOOT_HALF      ,0x00000040 }, // Found @0xf864bc64, levent 0x00
diff --git a/platform/s110/platform_camera.h b/platform/s110/platform_camera.h
index fc80d34..3241060 100644
--- a/platform/s110/platform_camera.h
+++ b/platform/s110/platform_camera.h
@@ -37,8 +37,8 @@
     #define CAM_HAS_NATIVE_ND_FILTER            1   // Camera has built-in ND filter with Canon menu support for enable/disable
 
     #define CAM_ADJUSTABLE_ALT_BUTTON           1
-    #define CAM_ALT_BUTTON_NAMES            { "Playback", "Video", "Display" }
-    #define CAM_ALT_BUTTON_OPTIONS          { KEY_PRINT, KEY_VIDEO, KEY_DISPLAY }
+    #define CAM_ALT_BUTTON_NAMES            { "Display", "Video" }
+    #define CAM_ALT_BUTTON_OPTIONS          { KEY_DISPLAY, KEY_VIDEO }
 
     #undef  CAM_CAN_SD_OVER_NOT_IN_MF
     #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO

*

Offline nafraf

  • *****
  • 1308
Also removed KEY_PRINT entry since I see a number of ports deprecated it.
KEY_PRINT alias has been removed from some ports, it was discussed here, but KEY_PLAYBACK is the "standard" button used for ALT mode in several models:
Code: [Select]
#define CAM_ALT_BUTTON_NAMES                { "Playback", "Video", "Display" }
#define CAM_ALT_BUTTON_OPTIONS              { KEY_PLAYBACK, KEY_VIDEO, KEY_DISPLAY }

 

Related Topics