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

  • 1470 Replies
  • 166268 Views
  • Publish
    Re: Adding new cameras, applying patches into trunk (with source code prepared)
    « Reply #150 on: 27 / February / 2011, 15:41:18 »
    Advertisements
    Just curious - are updates sync'd with the German version (CHDK-DE) in any way ? Or do they just get out of sync unless somebody who watches both forum's notices ?

    *

    Offline reyalp

    • ******
    • 9858
  • Publish
    Re: Adding new cameras, applying patches into trunk (with source code prepared)
    « Reply #151 on: 27 / February / 2011, 16:03:36 »
    Just curious - are updates sync'd with the German version (CHDK-DE) in any way ? Or do they just get out of sync unless somebody who watches both forum's notices ?
    The CHDKDE developers are very good about picking up changes from the trunk. I'm not so good about picking up changes from CHDKDE :(

    Anyone watching either project can get email notices of each commit.

    I would really like see them come back together somehow, it would be much easier if it was all in the same svn.
    Don't forget what the H stands for.

    *

    Offline philmoz

    • *****
    • 2936
      • Photos
  • Publish
    Update for G12 & SX30 (patched against changeset 1081).
    - Fixes startup crash (hopefully) by using different 'Open' firmware function (G12 & SX30).
    - Added ND filter to G12 (from CHDK-DE).
    - Faster motion detect by implementing vid_get_viewport_live_fb (G12 & SX30).
    - Optimised & cleaned up motion_detect code.
    - Fixed bracketing in continuous shooting mode when timer enabled.

    Regards,
    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)

    *

    Offline reyalp

    • ******
    • 9858
  • Publish
    Update for G12 & SX30 (patched against changeset 1081).
    - Fixes startup crash (hopefully) by using different 'Open' firmware function (G12 & SX30).
    - Added ND filter to G12 (from CHDK-DE).
    - Faster motion detect by implementing vid_get_viewport_live_fb (G12 & SX30).
    - Optimised & cleaned up motion_detect code.
    - Fixed bracketing in continuous shooting mode when timer enabled.

    Regards,
    Phil.
    Thanks Phil. Added all but the motion detection optimization in changeset 1086

    Sorry for the delay, feel free to send me a pm if I seem to have forgotten your patch. It does happen.

    I'll add the md part in another commit.

    I'd like to reiterate how much I prefer more, smaller patches for unrelated changes. I can add them quicker (because I don't need a large block of free time to do the trivial parts), it's easier for CHDK-DE to keep up (especially when some changes are back-ported from their tree and others are not), and it makes reading/understanding the history easier later.

    If changes are really straightforward, combining them isn't a problem, but anything that I have to think about I'd rather have isolated if possible.

    edit:
    added md stuff, changeset 1087

    The autobuild seems to be broken but it's not due to compile errors. - fixed, thank to Hacki for some late night hacking!
    « Last Edit: 13 / March / 2011, 21:18:40 by reyalp »
    Don't forget what the H stands for.


    *

    Offline philmoz

    • *****
    • 2936
      • Photos
  • Publish
    Thanks Phil. Added all but the motion detection optimization in changeset 1086

    edit:
    added md stuff, changeset 1087
    Thanks reyalp, I'll try and keep the patches smaller in future :)

    Edit: Ignore this patch, the crash fix is still not working.

    Speaking of patches here's another G12 & SX30 update (patched against changeset 1089):
    - fixed a bug in the histogram code that I added earlier to deal with viewport buffer width being greater than viewport width (also contains some small changes to the 'img' variable to align with the motion detect code).
    - added a better method for detecting and avoiding potential crashes coming from the FsIoNotify code when opening files (http://chdk.setepontos.com/index.php?topic=6179.0). The previous fix caused the RAW/DNG file save times to be slower.
    - updated stub addresses (for the FsIoNotify handling)
    - added #define in camera.h for the FsIoNotify special case code (plus some formatting cleanup)


    Thanks,
    Phil.
    « Last Edit: 15 / March / 2011, 22:28:35 by philmoz »
    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)

    *

    Offline philmoz

    • *****
    • 2936
      • Photos
  • Publish
    Latest G12 & SX30 patch (patched against changeset 1092).

    Changes:
    - added delay for SX30 in action_push_click (action_stack.c) [from CHDK-DE].
    - fixed bug in histogram code for cases when viewport buffer memory is wider than actual viewport, also cleaned up the code a little (to align with the motion detect code) and added some comments.
    - minor format cleanup in camera.h for G12 & SX30
    - added new #define in camera.h for the (current) startup crash fix code (http://chdk.setepontos.com/index.php?topic=6179.0)
    - added some new propcase values in propset4.h (used for some other fixes)
    - clean up old code in kbd.c for G12
    - updated battery min & max for G12
    - fixed Dark Frame Subtraction for G12 & SX30 (requires change in generic/capt_seq.c as well as camera specific capt_seq.c).
    - fixed some incorrect stub addresses for both cameras.
    - added code to lens_set_focus_pos (generic/wrappers.c) for G12 to stop it crashing if 'Continuous AF' enabled.
    - added startup crash fix code to open (generic/wrappers.c).
    - fixed AE lock in movie mode for G12 (MakeAFScan in generic/wrappers.c)
    - fixed SX30 value for KEYS_MASK0 and removed old code in kbd,c
    - removed old comments in platform/sx30/main.c

    Hope this isn't too big,
    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)

    *

    Offline philmoz

    • *****
    • 2936
      • Photos
  • Publish
    Fix USB_MASK for Ixus100 (SD780is) to match CHDK-DE and SDM.
    http://chdk.setepontos.com/index.php?topic=6211
    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)

    *

    Offline reyalp

    • ******
    • 9858
  • Publish
    Fix USB_MASK for Ixus100 (SD780is) to match CHDK-DE and SDM.
    http://chdk.setepontos.com/index.php?topic=6211
    Added, http://tools.assembla.com/chdk/changeset/1102

    The autobuild server appears to be down.

    Haven't forgotten about the one in your previous post, just haven't had time.
    Don't forget what the H stands for.


    *

    Offline philmoz

    • *****
    • 2936
      • Photos
  • Publish
    Haven't forgotten about the one in your previous post, just haven't had time.

    No problem - I'm all too familiar with that. Always more to do than time to do it :)
    Appreciate all the effort you put in here - without you (and others like you) this project would probably never happen.

    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)

    *

    Offline reyalp

    • ******
    • 9858
  • Publish
    Latest G12 & SX30 patch (patched against changeset 1092).
    Added in changesets 1103-1106.

    Quote
    Hope this isn't too big,
    It's not size that bothers me. What I'd rather not have is a lot of unrelated changes in the same patch.
    Don't forget what the H stands for.

     

    Related Topics