1.7 development planning thread - General Discussion and Assistance - CHDK Forum supplierdeeply
« previous next »
Pages: [1] 2   Go Down

1.7 development planning thread

  • 12 Replies
  • 667 Views
*

Offline reyalp

  • ******
  • 13878
1.7 development planning thread
« on: 13 / October / 2022, 00:40:36 »
Advertisements
This thread should be used to collect development plans for the 1.7 release. As usual, I don't expect everything discussed here to actually make it into the release.

Anything that needs more than a few posts of discussion should go in a separate thread, but I can split if needed.

The first thing to address is merging the ximr branch into the trunk...
Logged
Don't forget what the H stands for.
*

Offline philmoz

  • *****
  • 3444
    • Photos
Re: 1.7 development planning thread
« Reply #1 on: 13 / October / 2022, 01:44:55 »
Quote from: reyalp on 13 / October / 2022, 00:40:36
The first thing to address is merging the ximr branch into the trunk...


Any thoughts on how best to do this?

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 reyalp

  • ******
  • 13878
Re: 1.7 development planning thread
« Reply #2 on: 13 / October / 2022, 02:17:44 »
Quote from: philmoz on 13 / October / 2022, 01:44:55
Any thoughts on how best to do this?
Since we've merged in both directions and mixed stubs rebuilds etc, and apparently even mixed merge and non-merge changes in a single commit, it doesn't merge cleanly, and doesn't look like a simple series of cherry picks will get there.

I believe *all* changes from the trunk have been merged into the ximr branch, so the end result we want is for the new trunk to just be a copy of ximr

Possible options to get there
1) Copy the content of the ximr branch into trunk, add new files (I checked and didn't see any in that exist in trunk but not ximr, so no deletes should be required) and commit.
1b) As above, with record-only merge to update the merginfo property. However, it's unclear which revisions should be included, and there probably isn't much value in having the merginfo in this case.
2) Rename trunk to something and create a new trunk from ximr. I don't like this, because SVN gets *very* difficult to deal with when different, unrelated trees have the same name at different points in history.
3) simply declare branches/ximr_rgba the new trunk, or make a new branch (like branches/unstable) from it. Autobuilds would need to be updated, but history would be clear.

My inclination is to #1, and I can do it if no one has better ideas.
Logged
Don't forget what the H stands for.
*

Offline philmoz

  • *****
  • 3444
    • Photos
Re: 1.7 development planning thread
« Reply #3 on: 13 / October / 2022, 02:35:57 »
Quote from: reyalp on 13 / October / 2022, 02:17:44
I believe *all* changes from the trunk have been merged into the ximr branch, so the end result we want is for the new trunk to just be a copy of ximr


I'm doing a final check of this at the moment.


Quote
My inclination is to #1, and I can do it if no one has better ideas.


Agree, this is probably the safest option.


Give me a little while to double check everything.
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 reyalp

  • ******
  • 13878
Re: 1.7 development planning thread
« Reply #4 on: 13 / October / 2022, 03:08:01 »
Quote from: philmoz on 13 / October / 2022, 02:35:57
I'm doing a final check of this at the moment.
Thanks
Quote
Give me a little while to double check everything.
Take your time, I won't be doing anything with it until tomorrow (US Pacific time) in any case.
Logged
Don't forget what the H stands for.
*

Offline philmoz

  • *****
  • 3444
    • Photos
Re: 1.7 development planning thread
« Reply #5 on: 13 / October / 2022, 05:43:48 »
I've done a clean checkout of both trunk and ximr branches and checked that all trunk changes are in the ximr version.
Copied ximr changes to trunk and done a full rebuild with GCC 4.9 - no issues. Builds and runs on my cameras.


Good to go I think. :)
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 whim

  • ******
  • 2044
  • A495/590/620/630 ixus70/115/220/230/300/870 S95
Re: 1.7 development planning thread
« Reply #6 on: 13 / October / 2022, 08:16:59 »
@philmoz

Hi Phil,

Really sorry to bother you during the Great Migration and not at all
suggesting this is urgent, but here it is:

While testing the recently added support for gcc 11 I noticed that
my old vxworks cams act up again: with ximr_draw_rgba rev 6194 cam
completely dead: no leds, no reaction at all.
Because I've been experimenting since release with gcc 11,
the problem was quickly identified and fixed.

In /platform/makefile_sub.inc we have (lines 6-10)

Code: [Select]
# Disable GCC 10 optimisation that prevents build from booting on some cameras.
# See https://chdk.setepontos.com/index.php?topic=14281.0
ifeq ($(GCC_VERSION_MAJOR),10)
    CFLAGS+=-fno-tree-loop-distribute-patterns
endif
just substituting in line 8 by
Code: [Select]
ifeq ($(GCC_VERSION_MAJOR),10 11)- or (for added future-proofing)   
Code: [Select]
ifneq ($(GCC_VERSION_MAJOR),4 5 8 9)fixed it for me.
cheers,
wim
Logged
*

Offline philmoz

  • *****
  • 3444
    • Photos
Re: 1.7 development planning thread
« Reply #7 on: 13 / October / 2022, 16:23:44 »
Quote from: whim on 13 / October / 2022, 08:16:59
just substituting in line 8 by
Code: [Select]
ifeq ($(GCC_VERSION_MAJOR),10 11)- or (for added future-proofing)   
Code: [Select]
ifneq ($(GCC_VERSION_MAJOR),4 5 8 9)fixed it for me.
cheers,
wim


Thanks for that. I'll fix it up after everything else is merged.
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 philmoz

  • *****
  • 3444
    • Photos
Re: 1.7 development planning thread
« Reply #8 on: 13 / October / 2022, 19:02:55 »
What's new in 1.7

  • XIMR based drawing system for CHDK UI (Digic 6 & 7)
  • Functionality for Lua scripts to detect if screen has been erased and needs redrawing
  • RAW EV Histogram
  • Add code_gen2 tool for Digic 6 & 7. Convert G5X and G7X2 ports to use code_gen2.
  • Support GCC 11 for building
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 pigeonhill

  • *****
  • 1123
Re: 1.7 development planning thread
« Reply #9 on: 14 / October / 2022, 01:37:42 »
@philmoz @reyalp

Great stuff and I can’t wait to ‘transition’ my scripts to 1.7.

Logged
Pages: [1] 2   Go Up
« previous next »
 

Related Topics