new branch - CHDK : Elf Edition - Developers wanted - page 7 - General Discussion and Assistance - CHDK Forum supplierdeeply

new branch - CHDK : Elf Edition - Developers wanted

  • 316 Replies
  • 110775 Views
*

Offline whim

  • ******
  • 2046
  • A495/590/620/630 ixus70/115/220/230/300/870 S95
Re: new branch - CHDK : Elf Edition - Developers wanted
« Reply #60 on: 13 / December / 2011, 17:12:46 »
Advertisements
@philmoz

Thanks, and what about
Quote
... Also, note that a 'gmake PLATFORM=x PLATFORMSUB=y clean' does not appear to remove any .flt ,
which seems odd to me - isn't it supposed to remove all binaries and intermediates, except for
those in /bin and /tools ?
Fixed this (for now) by replacing
Quote
cp $(topdir)core/modules/*.flt $(topdir)CHDK/MODULE
with
Quote
mv $(topdir)core/modules/*.flt $(topdir)CHDK/MODULE

cheers,

wim

Re: new branch - CHDK : Elf Edition - Developers wanted
« Reply #61 on: 13 / December / 2011, 18:31:09 »
One small consequence of all this is that it will no longer be possible to update a camera by simply copying the diskboot.bin file over the USB port via chdkptp.   Rather than copying all the module files over ptp manually,  I guess its back to swapping SD cards if this all becomes standard ?

Ported :   A1200    SD940   G10    Powershot N    G16

Re: new branch - CHDK : Elf Edition - Developers wanted
« Reply #62 on: 13 / December / 2011, 18:58:57 »
Does this capture what was discussed today ?  If so,  how are versions 1494 & 1496 ( on the 1.0 bug fix branch) labelled ? When you try to download the 1.0 stable you get whatever is the farthest version out on that branch and its called 1.0 ?

Ported :   A1200    SD940   G10    Powershot N    G16

*

Offline philmoz

  • *****
  • 3450
    • Photos
Re: new branch - CHDK : Elf Edition - Developers wanted
« Reply #63 on: 13 / December / 2011, 19:02:25 »
One small consequence of all this is that it will no longer be possible to update a camera by simply copying the diskboot.bin file over the USB port via chdkptp.   Rather than copying all the module files over ptp manually,  I guess its back to swapping SD cards if this all becomes standard ?



I use a text file of chdkptp commands to update the camera files - easily extended to include the modules.

chdkptp command line:
Code: [Select]
chdkptp.exe -i -c < update_cam.txt

command file:
Code: [Select]
upload bin\diskboot.bin A/diskboot.bin
upload bin\ps.fi2 A/ps.fi2
reboot

I have batch files to do the above so I don't have to type the command line all the time.

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)
  g7x2 (1.01a, 1.01b, 1.10b)


Re: new branch - CHDK : Elf Edition - Developers wanted
« Reply #64 on: 13 / December / 2011, 19:07:47 »
I use a text file of chdkptp commands to update the camera files - easily extended to include the modules.

That works.  I was using something pretty simple in a one line batch file.

Code: [Select]
chdkptp -c -e"u diskboot.bin"
Now I just have to extend it.
Ported :   A1200    SD940   G10    Powershot N    G16

*

Offline philmoz

  • *****
  • 3450
    • Photos
Re: new branch - CHDK : Elf Edition - Developers wanted
« Reply #65 on: 13 / December / 2011, 19:14:30 »
When you try to download the 1.0 stable you get whatever is the farthest version out on that branch and its called 1.0 ?

Isn't this identical to what happens today in the main trunk?
Why would it need to be different because it's a 'stable' branch?

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)
  g7x2 (1.01a, 1.01b, 1.10b)

Re: new branch - CHDK : Elf Edition - Developers wanted
« Reply #66 on: 13 / December / 2011, 19:29:16 »
Isn't this identical to what happens today in the main trunk?
Why would it need to be different because it's a 'stable' branch?
Okay - that makes sense.  The bug fix patches go out on a branch from a "stable" release and when you ask for that release you get the latest patched version on that branch.   The latest release on the main trunk is the current "dev" release.
Ported :   A1200    SD940   G10    Powershot N    G16

Re: new branch - CHDK : Elf Edition - Developers wanted
« Reply #67 on: 16 / December / 2011, 00:49:56 »
Flat modules branch is updated in CHDK SVN

With 1489rev it have everything what was planned by me.
Now no need to hardcode regular modules in core chdk, no need to hunt them with fileselector.
Just place script to modules directory and organize them with subdirectories (if no issues with long paths on your camera). They will be cleanly automatically mapped to menu on camera start.
You even can use them in usermenu just like usual menu items.
« Last Edit: 16 / December / 2011, 00:51:38 by tsvstar »


*

Offline reyalp

  • ******
  • 14039
Re: new branch - CHDK : Elf Edition - Developers wanted
« Reply #68 on: 17 / December / 2011, 16:25:23 »
Flat modules branch is updated in CHDK SVN

With 1489rev it have everything what was planned by me.
Now no need to hardcode regular modules in core chdk, no need to hunt them with fileselector.
Just place script to modules directory and organize them with subdirectories (if no issues with long paths on your camera). They will be cleanly automatically mapped to menu on camera start.
You even can use them in usermenu just like usual menu items.
This sounds great, I'll try to get it in the "unstable" autobuild as soon as I have that set up. Hopefully this weekend.

The  reyalp-flt branch currently fails to build with
Code: [Select]
module_load.c: In function 'module_load':
module_load.c:325:43: error: 'CHDK_BUILD_NUM' undeclared (first use in this function)
module_load.c:325:43: note: each undeclared identifier is reported only once for each function it appears in
make[1]: *** [module_load.o] Error 1
make: *** [all-recursive] Error 1
Grepping the tree, I can't see where this is supposed to be defined.[/code]
« Last Edit: 17 / December / 2011, 16:26:58 by reyalp »
Don't forget what the H stands for.

*

Offline philmoz

  • *****
  • 3450
    • Photos
Re: new branch - CHDK : Elf Edition - Developers wanted
« Reply #69 on: 17 / December / 2011, 16:48:53 »
The  reyalp-flt branch currently fails to build with
Code: [Select]
module_load.c: In function 'module_load':
module_load.c:325:43: error: 'CHDK_BUILD_NUM' undeclared (first use in this function)
module_load.c:325:43: note: each undeclared identifier is reported only once for each function it appears in
make[1]: *** [module_load.o] Error 1
make: *** [all-recursive] Error 1
Grepping the tree, I can't see where this is supposed to be defined.

It's generated in tools/makeexport.c - looks like the code is trying to convert the BUILD_NUMBER from version.inc into a numeric value.

I changed the code to this - now generates 99 for the current 0.9.9 build and should generate 100 for 1.0.0 etc:
Code: [Select]
    // Separate CHDK build num
    char* build = BUILD_NUMBER;
    int build_num=0;
    for ( ; *build; build++) {
        if (isdigit(*build))
        {
            build_num = build_num * 10 + strtol(build, NULL, 0/*autodetect base oct-dec-hex*/);   
        }
    }
    fprintf(out_h,"#define CHDK_BUILD_NUM %d\n",build_num);

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)
  g7x2 (1.01a, 1.01b, 1.10b)

 

Related Topics