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

nafraf

1308

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

« Reply #1020 on: 02 / March / 2013, 02:29:03 »

Advertisements

Patch to sx50 100b and 100c

Quote from: nafraf on 28 / February / 2013, 17:04:25

Well, this patch for 100b and 100c includes:
* the previous capt_seq.c patch to fix call to wait_until_remote_button_is_released
* EXMEM_BUFFER_SIZE and EXMEM_HEAP_SKIP
* Implementation of void *vid_get_viewport_fb() void *vid_get_viewport_live_fb() as done in g12.

File was posted here sx50_100b_100c_trunk2606.patch.gz.
Tests and reports here

Logged

philmoz

3450

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

« Reply #1021 on: 02 / March / 2013, 05:46:12 »

Quote from: nafraf on 02 / March / 2013, 02:29:03

Patch to sx50 100b and 100c
Quote from: nafraf on 28 / February / 2013, 17:04:25
Well, this patch for 100b and 100c includes:
* the previous capt_seq.c patch to fix call to wait_until_remote_button_is_released
* EXMEM_BUFFER_SIZE and EXMEM_HEAP_SKIP
* Implementation of void *vid_get_viewport_fb() void *vid_get_viewport_live_fb() as done in g12.
File was posted here sx50_100b_100c_trunk2606.patch.gz.
Tests and reports here

Added in revision 2610 (trunk) and 2611 (release-1.1).

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)

lapser

1093

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

« Reply #1022 on: 02 / March / 2013, 09:01:42 »

Quote from: philmoz on 02 / March / 2013, 05:46:12

Added in revision 2610 (trunk) and 2611 (release-1.1).

Thanks nafraf and Phil.

Also, the jpg size is actually 4000 x 3000 instead of this:

#define CAM_JPEG_WIDTH 4072
#define CAM_JPEG_HEIGHT 3044

Logged

EOS-M3_120f / SX50_100b / SX260_101a / G1X_100g / D20_100b
https://www.youtube.com/user/DrLapser/videos

nafraf

1308

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

« Reply #1023 on: 02 / March / 2013, 13:11:21 »

A4000IS port (ALPHA)
100c and 101a remain untested.
101b can be added to autobuild, it was tested by ricardo28.
Thanks.

a4000_100c_101a_101b_trunk2611.patch.gz (55.88 kB - downloaded 27 times.)

Logged

philmoz

3450

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

« Reply #1024 on: 02 / March / 2013, 15:35:32 »

Quote from: lapser on 02 / March / 2013, 09:01:42

Quote from: philmoz on 02 / March / 2013, 05:46:12
Added in revision 2610 (trunk) and 2611 (release-1.1).
Thanks nafraf and Phil.

Also, the jpg size is actually 4000 x 3000 instead of this:

#define CAM_JPEG_WIDTH 4072
#define CAM_JPEG_HEIGHT 3044

That's ok.

Many of the ports (including mine) define the image size for DNG images to use the whole of the active sensor area. Canon choose to crop their JPEG images smaller than the active area.

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)

philmoz

3450

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

« Reply #1025 on: 02 / March / 2013, 15:58:15 »

Quote from: nafraf on 02 / March / 2013, 13:11:21

A4000IS port (ALPHA)
100c and 101a remain untested.
101b can be added to autobuild, it was tested by ricardo28.
Thanks.

Added in revision 2612 (trunk) and 2613 (release-1.1)

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)

srsa_4c

4451

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

« Reply #1026 on: 02 / March / 2013, 19:05:08 »

Quote from: srsa_4c on 24 / February / 2013, 18:04:13

Quote from: reyalp on 24 / February / 2013, 17:55:03
I think I missed this discussion the first time around. IMO, enabling something based on 100% sig finder match, and manual spot checks on a few ports is OK. I enabled it for all dryos cams in the trunk on the same basis.
OK, I will check 1-2 firmware out of each "generation", then I'll risk the commit...

I've checked this in. https://trac.assembla.com/chdk/changeset/2614/ and https://trac.assembla.com/chdk/changeset/2615/
memPartInfoGet is a VxWorks library function. It's present in all VxWorks firmwares (except s1, ixus30, ixus40), but is only used in the earliest models. The routine looks exactly the same in every firmware (except the BL instructions).
Checked the following disassemblies:
a530 100a: ok
a550 100c: ok
a560 100a: ok
a570 100e: ok
a610 100e: ok
a620 100f: ok
a630 100c: ok
a640 100b: ok
a700 100b: ok
a710 100a: ok
g7 100e: ok
ixus50 101a: ok
ixus55 100b: ok
ixus60 100a: ok
ixus65 100a: ok
ixus700 101a: ok
ixus70 101b: ok
ixus750 100g: ok
ixus75 100b: ok
ixus800 100b: ok
ixus850 100e: ok
ixus900 100c: ok
ixus950 100c: ok
ixusizoom_sd30 100g: ok
s2is 100f: ok
s3is 100a: ok
tx1 100g: ok

Logged

reyalp

14114

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

« Reply #1027 on: 02 / March / 2013, 19:09:02 »

I would have started doing this (or enabling it) in the trunk only. Sorry I wasn't clear about this in my previous post. It's probably OK.

Logged

Don't forget what the H stands for.

srsa_4c

4451

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

« Reply #1028 on: 02 / March / 2013, 19:41:43 »

Quote from: reyalp on 02 / March / 2013, 19:09:02

I would have started doing this (or enabling it) in the trunk only. Sorry I wasn't clear about this in my previous post. It's probably OK.

Hmmm, I should have read your sentence a bit more thoroughly.

Quote

I enabled it for all dryos cams in the trunk on the same basis.

And yes, it's really not mass-enabled in 1.1 ...

I have no doubt that the function is actually the correct one in every case though. Checked 1 fw version for every camera manually.

Logged

reyalp

14114

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

« Reply #1029 on: 02 / March / 2013, 19:50:13 »

Quote from: srsa_4c on 02 / March / 2013, 19:41:43

I have no doubt that the function is actually the correct one in every case though. Checked 1 fw version for every camera manually.

Yeah, I think it's fine. And meminfo has been enabled in the trunk for dryos a long time without problems, so we could probably move that over too. It sort of qualifies as a bug fix, because the malloc version can cause crashes in ptp...

Logged

Don't forget what the H stands for.