Remaining RAW+JPG shots + filespace icon/text- done :D

[PhyrePhoX]

is it a coincidence or did you spy in my brain? my space-bar almost looks the same as yours
the SD card icon looks really great!
i guess we can include that
so that would boil down to three alternatives:
your SD card icon
my space bar vertical / horizontal (in different sizes: fullscreen width/height, half screen width/height and quarter screen width/height).
this should be a toggle in the OSD menu.
nice!
so you only code at work?

[Jucifer]

Should contain all the changes up to reply #147 and be OK.

I think.

Don't want to make many more patches against trunk for this project. :/
(At least in the next few days. :P)

Would someone be kind enough to commit this to trunk, pretty please? Or tell me, why this shouldn't be committed..? :I

- Changed RAW indicator to PhyrePhox's remaining RAWs -calc (chdk.setepontos.com/index.php/topic,468.0.html) (plus new menu entry to toggle it - enabled by default when RAW is enabled as well).
- Raised used-definable parameters in script menu to 26.
- Motion detection's immediate shoot is now more "shoot_full" than "shoot". (Sorry, can't remember whose version, but from chdk.setepontos.com.)
- Changed keys for setting focus (in manual focus) to infinity/hyperfocal to up/down for all cameras.
- There are lines for changing the tv override selection to 1/3EV-selectable (commented with "for 1/3EV-mod")
- New "Filespace Icon" and Filespace Text (Percent & Megabyte) with new menu entries in OSD menu (icon and MB text enabled by default)
- new conf.osd_color_warn (used in RAW icon, filespace & battery icon) can be set in visual settings menu (red & transparent by default)
- disabled battery & filespace & raw icons to be shown in shutter half_press mode
- updated english lang file
- updated all platform's lib.c file with function char camera_jpeg_count_str()
new files: core/gui_space.c & gui_space.h

[PhyrePhoX]

i will incorporate a switch that lets you select your 1/3 tv override stuff somehow. if this is done, there really is no reason as to why this shouldnt be committed

[whim]

@Jucifer

Don't want to make many more patches against trunk for this project. :/
(At least in the next few days. )

Would someone be kind enough to commit this to trunk, pretty please? Or tell me, why this shouldn't be committed..? :I

@PhyrePhox

Oh-Oh ! Another trunk version was just released, and guess what:

ANOTHER entry in  gui_lang.c  --> more shifting to do !

BTW Jucifer your diff applied on 303 gives me errors & refuses to compile:

Code: [Select]

../lib/ubasic/libubasic.a(ubasic.o): In function `shutdown_statement':
ubasic.c:(.text+0x113c): undefined reference to `camera_shutdown_in_a_second'
collect2: ld returned 1 exit status
E:\CHDK\gcc\bin\gmake[2]: *** [main.elf] Error 1
gmake[1]: *** [all-recursive] Error 1
gmake: *** [batch-zip] Error 2

 

[PhyrePhoX]

damn it. they are so fast
okay. in 304 they seem to have included some of jucifers stuff already. hm, i'm gonna diff now only the gui raw & space stuff.

[Jucifer]

whim, really don't know about your problem. :/
It compiles for me...
Someone more experienced might be able to tell.
Or if you figure it out, please do share you knowledge. :]

PhyrePhox, the 1/3EV tv override -stuff is actually basically fingalo's, I just adapted it. ;)

I wonder what 305 brings... and how soon. :P

[whim]

@Jucifer
Thanks for answering, I've just started all over (have to do it manually)
so just wanted to be sure 

wim

[Jucifer]

..and while waiting for 305, here's a patch for 304. ;)

It's getting late. Not sure, if I got it all right (edit: but I think I did (edit2: though I didn't know I only thought)). Did compile, though.

Off to bed.

- Changed RAW indicator to PhyrePhox's remaining RAWs -calc (chdk.setepontos.com/index.php/topic,468.0.html) (plus new menu entry to toggle it - enabled by default when RAW is enabled as well. Either the original or the counter RAW indicator is shown at a time.)
- There are lines for changing the tv override selection to 1/3EV-selectable (commented with "for 1/3EV-mod")
- New "Filespace Icon" and Filespace Text (Percent & Megabyte) with new menu entries in OSD menu (icon and MB text enabled by default)
- new conf.osd_color_warn (used in RAW icon, filespace & battery icon) can be set in visual settings menu (red & transparent by default)
- disabled battery & filespace & raw icons to be shown in shutter half_press mode
- updated english lang file
- updated all platform's lib.c file with function char camera_jpeg_count_str()
new files: core/gui_space.c & gui_space.h

edit2: Didn't get it right the first time. :P

edit3: Changed little something while fixing... now only one RAW indicator (not both, not none) should be visible, when appropriate.

[PhyrePhoX]

now only one RAW indicator (not both, not none) should be visible, when appropriate.

huh?

edit: will send devs a PM about hopefully committing the diff.
by the way how do you apply the diffs@jucifer?

edit: deleted compiled binaries from thread

[whim]

@PhyrePhox

by the way how do you apply the diffs@jucifer?

Simple, you just open up your editor, start <Ctrl> C / <Ctrl> V 'ing and praying 

Again, great work guys ! In the mean time another #305 has appeared, gonna XREF that, than zzzzzzzzz

wim

edit: Oh, and while I was at it - the mods for 305 were small & not incompatible with Juci's EvTv-diff (which I had already
applied to 304) so I went ahead  - compiles & runs fine AFAIK.  Here's the source

trunk305jucievtvdiff.zip - 0.73MB

and  a bin for Barney is attached (S3_IS)  (removed, appears not to work)

[Barney Fife]

Deleted

[Jucifer]

PhyrePhox, whim, applying patches can be even easier: with (Win&)TortoiseSVN installed, just drag with mouse and select "Apply patch..." 

Barney, shouldn't firmware update menu be shown even if there's just a bogus .FIR? 

[GrAnd]

Hmm... now that's just the oddest thing. I've never seen this happen before with any build of CHDK, not even highly experimental builds.
...

Known problem. It already happened before.
The problem is: the size of CHDK code exceeds the limit reserved for it. Now the limit is 192K (0x30000) . When you compile the sources you can see the following:

Code: [Select]

-> main.elf
   text    data     bss     dec     hex filename
 133536    7048   56712  197296   302b0 main.elf

The last number says that the size is more than 0x30000 bytes.

[GrAnd]

To solving this you can try incrementing 'MEMISOSTART' and 'MEMISOSIZE' values in files "platform/sub/###/makefile.inc" by another "0x10000" to increase the limit to 0x40000 (256KB).

[PhyrePhoX]

Thanks. I thought maybe the reason was the old chdk cfg file,as we changed the menu and such.
will changing this value have any sideeffects? what are the limits? how big can chdk be? i guess this is depending on camera model. strange that my a620 can use this as it is and the s3is cant.

PhyrePhox, whim, applying patches can be even easier: with (Win&)TortoiseSVN installed, just drag with mouse and select "Apply patch..."

well i'm on linux and when i try to apply your diff using the patch command, i get a lot of errors, even after unix2dos'ing the file.on the other hand, i'm not that experienced. maybe grand can shed a light on this