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

reyalp

14120

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

« Reply #1240 on: 09 / October / 2013, 00:30:57 »

Advertisements

Quote from: buttim on 08 / October / 2013, 09:14:02

I found some key mappings missing for the G15 and updated a couple of files consequently.
Here is the patch

Added, trunk changeset 3141 release changeset 3142

Logged

Don't forget what the H stands for.

buttim

45

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

« Reply #1241 on: 10 / October / 2013, 03:02:32 »

A new patch for the Eyefi mod.
As discussed with Philmoz (http://chdk.setepontos.com/index.php?topic=10750.new;topicseen#new):

added the possibility for the module to be unloaded
moved a few things from gui.c to the eyefi module
completed the 'default_libeyefi' structure with dummy functions
(very little) refactoring of code in gui.c to reduce size
corrected minor mistakes, especially missing calls to the close function in case of errors

The diff is relative to the 3118 release, not to the previous patch (hope i did the right thing)

eyefi3118_2.diff (58.87 kB - downloaded 22 times.)

Logged

reyalp

14120

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

« Reply #1242 on: 10 / October / 2013, 17:05:31 »

Quote from: buttim on 10 / October / 2013, 03:02:32

The diff is relative to the 3118 release, not to the previous patch (hope i did the right thing)

Please make your patch relative the the current trunk, or at least a trunk revision after the original was applied.

Assuming you are using an svn working copy, you should be able to just svn update and make the new patch, although you might get some conflicts if you have made changes on top of that.

Thanks again for working on this.

Logged

Don't forget what the H stands for.

buttim

45

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

« Reply #1243 on: 10 / October / 2013, 18:21:14 »

Quote from: reyalp on 10 / October / 2013, 17:05:31

Please make your patch relative the the current trunk, or at least a trunk revision after the original was applied.

Diff to version 3144 for Eyefi attached, sorry for the inconvenience

eyefi3144.diff (6.74 kB - downloaded 20 times.)

Logged

reyalp

14120

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

« Reply #1244 on: 11 / October / 2013, 00:38:46 »

Quote from: buttim on 10 / October / 2013, 18:21:14

Quote from: reyalp on 10 / October / 2013, 17:05:31
Please make your patch relative the the current trunk, or at least a trunk revision after the original was applied.

Diff to version 3144 for Eyefi attached, sorry for the inconvenience

Thanks. Unfortunately, I think some bits may have been lost, the code for
> completed the 'default_libeyefi' structure with dummy functions
doesn't appear in this patch. I do see it in your previous patch, but it's probably better if I don't try to piece it together.

A couple comments on the code:
The enums in eyefi.h should be more unique if they are in the public header, e.g. eyefi_status and EYEFI_SUCCESS rather than status and SUCCESS.

I'm confused by

Code: [Select]

//big endian
#define host_to_be32(n) (n)

in eyefi.h, since the cameras are in fact little endian.

Logged

Don't forget what the H stands for.

buttim

45

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

« Reply #1245 on: 11 / October / 2013, 03:18:43 »

Sorry, I shouldn't try to do merges late at night.
Hope everything is ok now (but please do give a check...)

eyefi3144_2.diff (11.09 kB - downloaded 18 times.)

Logged

philmoz

3450

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

« Reply #1246 on: 11 / October / 2013, 18:09:05 »

Quote from: buttim on 11 / October / 2013, 03:18:43

Sorry, I shouldn't try to do merges late at night.
Hope everything is ok now (but please do give a check...)

Added in revision 3147 (with some minor changes to the module.c code).

Phil.

Logged

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)
g7x2 (1.01a, 1.01b, 1.10b)

waterwingz

12140

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

« Reply #1247 on: 11 / October / 2013, 21:04:27 »

Patch to fix ND filter "flashing" problem with the G10. Updates propset2.h with correct param for ND filter state and adds CAM_HAS_NATIVE_ND_FILTER to G10 platform_camera.h

As the G12 & G15 already have this patch, I suspect the G11 and maybe G9 need it too but I have no way to test that.

G10_CAM_HAS_NATIVE_ND_FILTER.patch (1.15 kB - downloaded 18 times.)

Logged

Ported : A1200 SD940 G10 Powershot N G16

philmoz

3450

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

« Reply #1248 on: 11 / October / 2013, 22:51:16 »

Quote from: waterwingz on 11 / October / 2013, 21:04:27

Patch to fix ND filter "flashing" problem with the G10. Updates propset2.h with correct param for ND filter state and adds CAM_HAS_NATIVE_ND_FILTER to G10 platform_camera.h

As the G12 & G15 already have this patch, I suspect the G11 and maybe G9 need it too but I have no way to test that.

Added in revision 3150 (trunk) and 3151 (release-1.2).

Phil.

Logged

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)
g7x2 (1.01a, 1.01b, 1.10b)

waterwingz

12140

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

« Reply #1249 on: 19 / October / 2013, 23:36:35 »

Patch file to enable the G10 to use set_focus() in both MF and non-MF modes.

Should probably go in the 1.2.0 & 1.3.0 branches please.

g10_man_focus.patch (0.63 kB - downloaded 26 times.)

Logged

Ported : A1200 SD940 G10 Powershot N G16