bringing chdkde and chdk back together discussion - page 4 - General Discussion and Assistance - CHDK Forum  

bringing chdkde and chdk back together discussion

  • 52 Replies
  • 16069 Views
*

Offline msl

  • *****
  • 1269
  • A720 IS, SX220 HS 1.01a
    • CHDK-DE links
Re: bringing chdkde and chdk back together discussion
« Reply #30 on: 26 / February / 2012, 12:19:04 »
Advertisements
Working on the 'conf.c' merging and I've come across a problem that might need some thought.

Any thoughts?

I think, a reorganization is necessary. I would remove all unused entries. That means a user must renew only one time the configuration. This is acceptable.

FWIW, I was thinking a while back about making the cfg name release specific, so CHDK 1.1 would use CHDK11.CFG etc

Thats also a good idea.


I miss the config entry in changeset 1673 for the extended video time. I know this option is always reset. But this entry is also usefull for scripts (set/get_canfig_value()). Generally all menu entries should get a configuration ID. That's the basic for an individual scriptable configuration.

msl
CHDK-DE:  CHDK-DE links

*

Offline msl

  • *****
  • 1269
  • A720 IS, SX220 HS 1.01a
    • CHDK-DE links
Re: bringing chdkde and chdk back together discussion
« Reply #31 on: 26 / February / 2012, 14:05:04 »
New question.    Are there any cameras ported to CHDK-DE that are not available in CHDK ?

I think ATM there is no different. CHDK shell says: 86 cameras and 202 firmware versions for both.  :)

msl
CHDK-DE:  CHDK-DE links

Re: bringing chdkde and chdk back together discussion
« Reply #32 on: 26 / February / 2012, 14:14:43 »
I think ATM there is no different. CHDK shell says: 86 cameras and 202 firmware versions for both.  :
Thanks - I was trying to think of a quick way to work that out.
Ported :   A1200    SD940   G10    Powershot N    G16

*

Offline rudi

  • ***
  • 126
  • A590IS_101B, SX260HS_100B
Re: bringing chdkde and chdk back together discussion
« Reply #33 on: 29 / February / 2012, 13:05:44 »
Terminated for now - Part 8.

Some comments to main differences:
1. platform folder
Code: [Select]
I think all is okay in chdk-de.
s95_100e: boot.c different to 100h, 100i, 100k
ixus970, ixus75, ixus100, ixus1000: redefinitions from camera.h
ixus220: JogDial
ixus100: debug code, current vales in main.c

2. general
Code: [Select]
gui_space.c, gui_bat.c: icon colors and positions (small differences)
gui_draw.h: only formatted

3. chdk-de additional functions
Code: [Select]
partiton_nr: gui.c, gui_space.c
revision in buildinfo(): Makefile, makefile.inc, *.lng
gps support: gps.*, gui.c, sx230
autoiso2: shooting.c, gui.c
uBasic: get_min_stack_dist, prevension previous space/enter and absent last enter on script file
script: default script and type
lua: single dof_ functions (use both?)

4. recommend patch for chdk
Code: [Select]
dof: shooting_get_subject_distance_override_value() all SD vales now "from lens", internal still "from sensor"
On edit conf.c (/*, func*/), I get this question: If a function pointer in modul configuration at this time possible?

rudi


*

Offline philmoz

  • *****
  • 3156
    • Photos
Re: bringing chdkde and chdk back together discussion
« Reply #34 on: 01 / March / 2012, 05:30:32 »
Terminated for now - Part 8.

Some comments to main differences:
1. platform folder
Code: [Select]
I think all is okay in chdk-de.
s95_100e: boot.c different to 100h, 100i, 100k
ixus970, ixus75, ixus100, ixus1000: redefinitions from camera.h
ixus220: JogDial
ixus100: debug code, current vales in main.c

2. general
Code: [Select]
gui_space.c, gui_bat.c: icon colors and positions (small differences)
gui_draw.h: only formatted

3. chdk-de additional functions
Code: [Select]
partiton_nr: gui.c, gui_space.c
revision in buildinfo(): Makefile, makefile.inc, *.lng
gps support: gps.*, gui.c, sx230
autoiso2: shooting.c, gui.c
uBasic: get_min_stack_dist, prevension previous space/enter and absent last enter on script file
script: default script and type
lua: single dof_ functions (use both?)

4. recommend patch for chdk
Code: [Select]
dof: shooting_get_subject_distance_override_value() all SD vales now "from lens", internal still "from sensor"

Thanks, I'll look at this some more over the weekend if I get some time.

Quote
On edit conf.c (/*, func*/), I get this question: If a function pointer in modul configuration at this time possible?

Yes, the 'info_func' parameter passed to 'config_restore' can be used if modules need this functionality.

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)
  g5x (1.00c, 1.01a, 1.01b)

*

Offline philmoz

  • *****
  • 3156
    • Photos
Re: bringing chdkde and chdk back together discussion
« Reply #35 on: 06 / March / 2012, 22:18:06 »
Revision 1712 merges most of the remaining changes from CHDK-DE into the release-1.0 branch of CHDK.

I have made a few changes to support where the code differences aren't easily resolved:
- moved the 'VER=CHDK' line from makefile.inc to version.inc
- added a 'VER_$(VER)' compiler define to allow conditional compilation where the code differs (this will define VER_CHDK for CHDK)
- used VER_CHDK in conf.c and gui.c for the code that is still different (config id values, settings and logo file name)

There are still a few small differences to be resolved:
- core/gui.c line 585, menu item type differs (I think the CHDK version is correct)
- core/gui_batt.c, unnecessary include of camera.h in CHDK-DE
- core/gui_menu.c, extra calls to do_callback() in CHDK-DE, are these necessary?
- core/histogram.c, missing comment in CHDK-DE version
- core/kbd.c, missing IXUS310 touchscreen code in CHDK-DE
- include/conf.h, extra comment in CHDK-DE (against ext_video_time)
- platform/generic/shooting.c, unnecessary comment in CHDK-DE version
- platform/ixus220_elph300hs/kbd.c, includes unused jogdial variable in CHDK-DE
- platform/ixus220_elph300hs/lib.c, includes unused jogdial code in CHDK-DE
- platform/sx130is/notes.txt, warning missing from CHDK-DE version
- buildconf.inc, OPT_LUA_CALL_NATIVE and OPT_DEFAULT_LANG differ, need to make these conditional on VER
- Makefile, missing comments in CHDK-DE version, extra curves files and scripts files in CHKD-DE not yet in CHDK, CHDK-DE missing editor scripts

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)
  g5x (1.00c, 1.01a, 1.01b)

Re: bringing chdkde and chdk back together discussion
« Reply #36 on: 06 / March / 2012, 23:06:04 »
Revision 1712 merges most of the remaining changes from CHDK-DE into the release-1.0 branch of CHDK.
Thanks Phil - lots of "grind it out" work to make this happen that probably most people do not really appreciate.  I do.

Is there a vision now to start having the CHDK-DE version use this svn version to feed their autobuild server ?

And will the dev/unstable trunk be shared too ?
 
Ported :   A1200    SD940   G10    Powershot N    G16

*

Offline philmoz

  • *****
  • 3156
    • Photos
Re: bringing chdkde and chdk back together discussion
« Reply #37 on: 06 / March / 2012, 23:50:18 »
Revision 1712 merges most of the remaining changes from CHDK-DE into the release-1.0 branch of CHDK.
Thanks Phil - lots of "grind it out" work to make this happen that probably most people do not really appreciate.  I do.

Is there a vision now to start having the CHDK-DE version use this svn version to feed their autobuild server ?

And will the dev/unstable trunk be shared too ?
 

Not sure about the autobuild; but I'm merging these latest changes into the trunk code so it should also be usable by CHDK-DE soon.

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)
  g5x (1.00c, 1.01a, 1.01b)


*

Offline reyalp

  • ******
  • 12585
Re: bringing chdkde and chdk back together discussion
« Reply #38 on: 07 / March / 2012, 00:48:25 »
release autobuild is broken by this somehow.

Code: [Select]
make: *** empty string invalid as file name.  Stop.
child process exited abnormally
Don't forget what the H stands for.

*

Offline rudi

  • ***
  • 126
  • A590IS_101B, SX260HS_100B
Re: bringing chdkde and chdk back together discussion
« Reply #39 on: 07 / March / 2012, 14:04:03 »
@philmoz
Thanks for your permanent work and the good solution with $(VER).

Is there a vision now to start having the CHDK-DE version use this svn version to feed their autobuild server ?
No, not in this time. Maybe in the future. I'm not sure we will handle the change to module version. A second autobuild? Current version from your branch and module version from DE trunk?

- buildconf.inc, OPT_LUA_CALL_NATIVE and OPT_DEFAULT_LANG differ, need to make these conditional on VER
We can set this option in else part form $(VER) handling in makefile.inc.
eg.
Code: [Select]
ifeq ($(VER),CHDK)
CFLAGS+=-DVER_CHDK
else
CFLAGS+=-DVER_CHDK_DE
    OPT_LUA_CALL_NATIVE=1
    ifndef OPT_DEFAULT_LANG
        OPT_DEFAULT_LANG=german
    endif
endif
But CHDK-Shell can't see this changes and preset OPT_DEFAULT_LANG=english on default!

A other way for OPT_LUA_CALL_NATIVE is an additional option in script menu. This option block to register native functions in luascript.c. CHDKLover tested this alternative succeed. In his code can't this option set with set_config_value().

rudi

 

Related Topics