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

  • 1469 Replies
  • 164825 Views
*

Offline reyalp

  • ******
  • 9801
  • Publish
    Advertisements
    - fixed problem with 'Visual Settings -> Reset Files' menu option that would erase the symbol font file instead of resetting it back to the default value, causing symbols to vanish (gui.c, conf.c, conf.h).
    I may be mistaken, but I suspect the old behavior was intended to prevent memory being used by the symbols.

    Of course, it would be better to just not load the symbols if they aren't enabled :)
    Don't forget what the H stands for.

    *

    Offline philmoz

    • *****
    • 2936
      • Photos
  • Publish
    I may be mistaken, but I suspect the old behavior was intended to prevent memory being used by the symbols.

    Of course, it would be better to just not load the symbols if they aren't enabled :)

    Could be; but the default in a clean install is to load the icon_10.rbf file. If you use the reset files option your symbols disappear and it's not obvious how to get them back. This change resets it back to the 'clean' install value. Happy to leave the change out - the other changes to rbf_font.c are not dependent on this.

    Not loading the symbols if you turn them off is probably worth looking at; but the symbols get turned off automatically when the file is loaded if the symbol font height is taller than the menu font height. So this would need some rework as well to cope with all cases.

    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

    • ******
    • 9801
  • Publish
    Could be; but the default in a clean install is to load the icon_10.rbf file.
    Here's the history of that http://tools.assembla.com/chdk/changeset/696 and http://chdk.kernreaktor.org/mantis/view.php?id=184

    I'll have a look at this tomorrow.
    Don't forget what the H stands for.

    *

    Offline philmoz

    • *****
    • 2936
      • Photos
  • Publish
    Initial beta for the SX130is.
    Original code from previous developers merged with current changeset 1124.
    Testing done by achillies.
    Seems pretty stable, and supports the exmem extension to get around the low memory problems on this camera.

    Patch removed - missing camera.h file
    « Last Edit: 04 / April / 2011, 04:09:05 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
    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

    • ******
    • 9801
  • Publish
    Patch to cleanup font handling:
    - allocate font memory in a single block instead of a small chunk for each character in the font (uses less memory and avoids fragmentation).
    - cleaned up code in rbf_font.c for font loading (merged two similar functions).
    - fixed problem with 'Visual Settings -> Reset Files' menu option that would erase the symbol font file instead of resetting it back to the default value, causing symbols to vanish (gui.c, conf.c, conf.h).
    Added (lib/font/rbf_font.c part only) changeset 1125

    The settings whole settings part of it (interaction between enabled and selected font and whether the font gets loaded) could use some cleanup and some point but it's not urgent.
    Don't forget what the H stands for.

  • Publish
    Updates to IXUS120-SD940 for firmware 1.02C.

    Patch file attached.  Some addresses in stubs_entry_2.S for fw 1.02c changed to match those used in 1.03b and 1.03c.  Checked by waldo and waterwingz.


    *

    Offline reyalp

    • ******
    • 9801
  • Publish
    Initial beta for the SX130is.
    Original code from previous developers merged with current changeset 1124.
    Testing done by achillies.
    Seems pretty stable, and supports the exmem extension to get around the low memory problems on this camera.
    camera.h seems to be missing from this patch.

    edit
    Updates to IXUS120-SD940 for firmware 1.02C.

    Patch file attached.  Some addresses in stubs_entry_2.S for fw 1.02c changed to match those used in 1.03b and 1.03c.  Checked by waldo and waterwingz.
    Added, changeset 1127
    « Last Edit: 04 / April / 2011, 00:21:51 by reyalp »
    Don't forget what the H stands for.


    *

    Offline philmoz

    • *****
    • 2936
      • Photos
  • Publish
    camera.h seems to be missing from this patch.

    Doh! Hopefully correct patch for sx130is attached to this post.

    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

    • ******
    • 9801
  • Publish
    camera.h seems to be missing from this patch.

    Doh! Hopefully correct patch for sx130is attached to this post.
    There were some bits missing from loader but I got them from the previous patch.

    I've added this in changeset 1128. I have not added it to the autobuild. Thoughts on the alleged camera damage in: http://chdk.setepontos.com/index.php?topic=5691.msg62825#msg62825 ?

    It is already in the CHDKDE autobuild as alpha, for whatever that's worth.
    Don't forget what the H stands for.

     

    Related Topics