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

TobiMarg

81

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

« Reply #730 on: 02 / June / 2012, 16:06:29 »

Advertisements

Corrected connect 4 on 16:9 screens.

gui_4wins.c.patch (2.06 kB - downloaded 65 times.)

Logged

reyalp

14119

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

« Reply #731 on: 02 / June / 2012, 17:23:24 »

Quote from: ADamb on 31 / May / 2012, 01:53:43

Here comes last change - I switched from palette_buffer to palette_buffer_ptr, which can be found in disassembly.

Thanks, added in trunkchangeset 1891 release changeset 1892

@mastodon please let us know if the 1891 or later autobuild works.

Logged

Don't forget what the H stands for.

waterwingz

12140

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

« Reply #732 on: 02 / June / 2012, 21:11:02 »

Patch file to add firmware 1.00c to the IXUS200_SD980 code (installs and builds on stable & dev versions).

Also contains updates to the 1.01c & 1.01d firmware versions based on information in the latest stubs_entry.S files for those versions.

Firmware 1.00c tested by forum member SvobodaT. Updates to 1.01c & 1.01d are not tested but trivial.

Still needs testing to confirm that aperture_sizes_table[], shutter_speeds_table[], iso_table[], and modemap[] are correct. (modemap[] is not)

ixus200_sd980_for_stable-and-dev_trunk_1895.patch (159.39 kB - downloaded 63 times.)

Logged

Ported : A1200 SD940 G10 Powershot N G16

philmoz

3450

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

« Reply #733 on: 02 / June / 2012, 21:31:18 »

Quote from: TobiMarg on 02 / June / 2012, 16:06:29

Corrected connect 4 on 16:9 screens.

Added in revision 1897.

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)

mastodon

93

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

« Reply #734 on: 03 / June / 2012, 10:55:00 »

THANKS! v1892 works! And the menu did not ever flicker, like in the previous ones. AND the color of the startup screen seems to be more red, than before (v1825).

Logged

(A 410), SX 200, (SX 280), SX 700

kosy

28

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

« Reply #735 on: 10 / June / 2012, 01:40:20 »

Here is a patch for the a3300 camera. I used diff with the -cbr options: c gives 3 lines of context, b ignores whitespace changes, and r recurses through the directories. I hope this is satisfactory.

Summary of changes:
1. Changed the default ALT key to PLAY
2. Implemented the ability to change the ALT key to FACE, DISP, or PLAY (ALT Menu/Miscellaneous Stuff/<ALT> Mode Button)
3. Changed location of where CHDK colors are stored to a safe area in the palette so Canon's messages display correctly.
4. Defined DISP as the RAW button -- this also has the effect of making the DISP button the key that triggers "ALT +/- debug action" (ALT/Menu/Miscellaneous Stuff/Debug Parameters/ALT +/- debug action)

Question: Wouldn't it be a good idea to change the message "ALT +/- debug action" to "ALT DISP debug action" so it is correct for THIS camera?

Thanks!

a3300.patch (26.92 kB - downloaded 68 times.)

Logged

philmoz

3450

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

« Reply #736 on: 10 / June / 2012, 21:16:10 »

Quote from: waterwingz on 02 / June / 2012, 21:11:02

Patch file to add firmware 1.00c to the IXUS200_SD980 code (installs and builds on stable & dev versions).

Also contains updates to the 1.01c & 1.01d firmware versions based on information in the latest stubs_entry.S files for those versions.

Firmware 1.00c tested by forum member SvobodaT. Updates to 1.01c & 1.01d are not tested but trivial.

Still needs testing to confirm that aperture_sizes_table[], shutter_speeds_table[], iso_table[], and modemap[] are correct. (modemap[] is not)

Added in revision 1907 (release-1.0) and 1909 (trunk).

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 #737 on: 16 / June / 2012, 10:46:05 »

Quote from: kosy on 10 / June / 2012, 01:40:20

Here is a patch for the a3300 camera. I used diff with the -cbr options: c gives 3 lines of context, b ignores whitespace changes, and r recurses through the directories. I hope this is satisfactory.

I notice that nobody has said anything about this? I also noticed that nobody has added this to the trunk either. So having submitted one or two patches myself I thought I'd add this note.

Typically, the preferred method to prepare a patch file is to use the diff function integrated into the svn software (the version control software used to maintain the CHDK source code). On Windows, this is typical Tortouse SVN. On Linux machines there are svn command line tools. There are also other packages for both systems.

Patch files created in this format can then be feds directly into the the Unix patch command (or its Windows equivalent) to make all the changes automatically in the svn build tree. This makes things a lot easier for the two or three people who actually take the time (and have write permission) to apply changes. You can surely understand that they really don't have time to hand edit a long list of changes or wade through different patch file formats.

I tried to input your file into patch on my build machine but it was not immediately clear how to use it as formatted. It is clearly very different than the ones created using svn patch tools with the defaults settings. So I'm wondering if you can create a patch file using svn tools instead as a way of getting this submission accepted?

Update : turns out that I needed to use patch -p2 rather than patch -p0 but I also get the blob errors reyalp mentioned below.

« Last Edit: 16 / June / 2012, 17:08:47 by waterwingz »

Logged

Ported : A1200 SD940 G10 Powershot N G16

reyalp

14119

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

« Reply #738 on: 16 / June / 2012, 17:03:38 »

Quote from: waterwingz on 16 / June / 2012, 10:46:05

Quote from: kosy on 10 / June / 2012, 01:40:20
Here is a patch for the a3300 camera. I used diff with the -cbr options: c gives 3 lines of context, b ignores whitespace changes, and r recurses through the directories. I hope this is satisfactory.
I notice that nobody has said anything about this? I also noticed that nobody has added this to the trunk either.

Things that can be applied easily without much thought tend to go in quickly. Things that aren't, get pushed to the back of the queue.

As waterwingz says, an svn diff is preferred. It is also preferable to remove extraneous changes (debug display, buildconf etc)

I'm looking at this one now. It applies with the appropriate -p, but there's quite a few rejects against the current release branch, so it will take me a bit to decide whether I can apply it.

edit:
The rejects turned out to be line ending issues, no big deal. However, there are some other questions so I haven't checked in. See comments on http://chdk.setepontos.com/index.php?topic=6972.msg86536#msg86536

« Last Edit: 16 / June / 2012, 19:23:14 by reyalp »

Logged

Don't forget what the H stands for.

kosy

28

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

« Reply #739 on: 18 / June / 2012, 01:34:24 »

Quote from: reyalp on 16 / June / 2012, 17:03:38

The rejects turned out to be line ending issues, no big deal. However, there are some other questions so I haven't checked in. See comments on http://chdk.setepontos.com/index.php?topic=6972.msg86536#msg86536

Re the line endings issue -- is this due to the Windows habit of terminating lines with crlf versus *NIX's nl (new line)?

Currently I am using a bastardized system that's partly Windows (due to starting with CHDK-Shell) and Linux. I am working toward dropping the Windows part and then should be more UNIX-Linux compatible, at least as far as line endings are concerned. Will that resolve the line endings issues you were seeing?

Second question: I looked at some other patches and I thought they had been prepared by the gnu diff command with context enabled, so that's what I did. Doesn't svn also use the diff command?

Thanks!

Logged