Source code re-org for modules? - page 3 - General Discussion and Assistance - CHDK Forum
« previous next »
Pages: 1 2 [3] 4   Go Down

Source code re-org for modules?

  • 36 Replies
  • 15932 Views
*

Offline philmoz

  • *****
  • 3450
    • Photos
Re: Source code re-org for modules?
« Reply #20 on: 24 / December / 2012, 17:54:41 »
Advertisements
Quote from: dvip on 24 / December / 2012, 16:40:43
Phil,
While testing Override Tv [Ev Step] Ev Step Value,
I noticed that no matter what Ev Value  I choose, I always
get an image with 1/2000. I tried this with the A590is-101b and philmoz-reorg@2404.


Should be fixed in 2405 - thanks for testing.

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)
*

Offline dvip

  • ****
  • 451
Re: Source code re-org for modules?
« Reply #21 on: 24 / December / 2012, 18:28:42 »
Thank you Phil for all the great work.
It is working fine again.
Happy Holidays!
Logged
*

Offline philmoz

  • *****
  • 3450
    • Photos
Re: Source code re-org for modules?
« Reply #22 on: 25 / December / 2012, 21:48:31 »
Unless there are objections I plan to start migrating changes from this branch to the trunk version over the weekend. I'll try and break this into pieces to allow time for review and testing.

In the latest version the core CHDK build varies from 135K - 164K (the SX230 & SX260 are the largest because of the GPS code).

Build time is 8.5 minutes for all current camera and firmware versions.

Phil.  :xmas
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)
*

Offline msl

  • *****
  • 1280
  • A720 IS, SX220 HS 1.01a
    • CHDK-DE links
Re: Source code re-org for modules?
« Reply #23 on: 26 / December / 2012, 05:24:27 »
Thanks for that - a very nice xmas gift. :xmas

I have compiled versions for the A720 & SX220. The CHDK shell works without any problems.

CHDK runs on both cameras. Various test scripts showed no errors.

One question:
Means the migration of your branch to the trunk version also a change of the stable version to version 1.2? Because you have changed the version number to 1.3.

msl
Logged
CHDK-DE:  CHDK-DE links
*

Offline reyalp

  • ******
  • 14080
Re: Source code re-org for modules?
« Reply #24 on: 26 / December / 2012, 15:52:32 »
Phil,
I think moving this stuff to the trunk is fine. One thing to watch out for is that when you merge a "move" svn doesn't "move" the existing file on the branch you are merging into. Instead, it deletes the old name in the target branch and copies the version from the branch you are merging. This shouldn't be a problem if your brunch is up to date from the trunk.

Merging this will probably make landing the remote capture stuff a bit more complicated, but I'm sure it can be resolved manually, so that shouldn't hold you back. I hope to spend some time with that stuff in the near future.

Quote from: msl on 26 / December / 2012, 05:24:27
One question:
Means the migration of your branch to the trunk version also a change of the stable version to version 1.2? Because you have changed the version number to 1.3.
I don't think it makes sense to try to release 1.2 before merging this.
Logged
Don't forget what the H stands for.
*

Offline philmoz

  • *****
  • 3450
    • Photos
Re: Source code re-org for modules?
« Reply #25 on: 26 / December / 2012, 17:01:14 »
Quote from: msl on 26 / December / 2012, 05:24:27
One question:
Means the migration of your branch to the trunk version also a change of the stable version to version 1.2? Because you have changed the version number to 1.3.

That was a mistake. I change the version locally so I can tell what I have loaded on the camera. Normally I exclude that file from the commit. I'll roll it back to 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)
*

Offline msl

  • *****
  • 1280
  • A720 IS, SX220 HS 1.01a
    • CHDK-DE links
Re: Source code re-org for modules?
« Reply #26 on: 27 / December / 2012, 03:16:26 »
Quote from: philmoz on 26 / December / 2012, 17:01:14
I'll roll it back to 1.2.

Thanks for the clarification.

msl
Logged
CHDK-DE:  CHDK-DE links
*

Offline philmoz

  • *****
  • 3450
    • Photos
Re: Source code re-org for modules?
« Reply #27 on: 04 / January / 2013, 19:12:51 »
I didn't merge this branch last weekend - seems I messed up the SVN changes making it too hard to split out into pieces.

So I plan to merge the whole thing into the trunk in one go and keep my fingers crossed I have broken things too badly.

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)
*

Offline waterwingz

  • ******
  • 12138
    • Waterwingz
Re: Source code re-org for modules?
« Reply #28 on: 04 / January / 2013, 19:48:24 »
FTFY ...
Quote from: philmoz on 04 / January / 2013, 19:12:51
So I plan to merge the whole thing into the trunk in one go and keep my fingers crossed I have not broken things too badly.

Can't speak for everyone but given the scope & benefit of the changes,  I'll be happy to test and report as part of this.
« Last Edit: 04 / January / 2013, 19:53:46 by waterwingz »
Logged
Ported :   A1200    SD940   G10    Powershot N    G16
*

Offline waterwingz

  • ******
  • 12138
    • Waterwingz
Re: Source code re-org for modules?
« Reply #29 on: 04 / January / 2013, 20:07:52 »
@philmoz :  just grabbed the svn update.  It builds, loads and runs properly on all three of my cameras.  Anything in particular that I should look at ?

Also, I now notice menu item string truncation more than before on two of my cameras.  Is there somewhere to set the menu width on a per camera basis ? Nevermind - #define CAM_MENU_BORDERWIDTH
« Last Edit: 04 / January / 2013, 20:12:20 by waterwingz »
Logged
Ported :   A1200    SD940   G10    Powershot N    G16
Pages: 1 2 [3] 4   Go Up
« previous next »
 

Related Topics