Changeset 498

Timestamp:

09/03/08 17:17:58 (5 years ago)

Author:

phyrephox

Message:

small updates:

• changed grid readme again

+ added slovak lang file

• fixed warning ( ​http://chdk.setepontos.com/index.php/topic,265.msg20831.html#msg20831 )

+ changed makefiles: when you compile, the memisosize is written to caminfo.txt, along with the "maximum" size that is defined in makefile.inc for that specific camera. in batch-zip and batch-zip-complete this file file is "catted" into the logfile and then deleted. this will make searching for cameras whose bins are "out of range" much easier. Thanks to whim who basically wrote the whole code!

Note: this is a first implementation, and prone to errors, as both whim and i are no makefile pros - if you have comments, dont hesitate to let us know!

Location:

branches/juciphox

Files:

• CHDK/GRIDS/readme.txt (modified) (2 diffs)
• CHDK/LANG/slovak.lng (added)
• Makefile (modified) (2 diffs)
• bin (modified) (1 prop)
• core/Makefile (modified) (1 diff)
• doc/version.txt (modified) (1 diff)
• lib/ubasic/ubasic.c (modified) (1 diff)
• version.inc (modified) (1 diff)

branches/juciphox/CHDK/GRIDS/readme.txt

@@ -1 @@
-Format of grid file for CHDK:
+What are Grids?
+
+Grids are an overlay for your EVF/LCD display that can help you with composition, cropping, subject/image alignment, and other novel things. Normally most cameras only offer you one simple option, a "Rule of Thirds" composition grid, but with CHDK the sky is now the limit on what you want displayed on your viewfinder for these handy photographer's tools.
+
+You may Load and run your Grid files from the CHDK <ALT> + Menu path of: "OSD Parameters" > "Grid" > "Load Grid from File..." When not in <ALT> mode you may quickly turn your Grid Overlay (and all other CHDK OSD elements) on or off with a simple Half-Shutter-Press + Right-Navigation button combination. Or put the "Grid" > "Show Grid Lines" menu toggle on your fast-access Custom User-Menu if not wishing to turn off all of CHDK displays.
+
+Grids are drawn as an EVF/LCD overlay by simple graphic commands. You may edit "Grid Files" using any basic text editor. (MAC users should check that they are saved as "plain text encoding", select "Unicode (UTF-8)" when saving your files, the same as when saving uBASIC script files.) For faster loading/searching access save them to your /CHDK/GRIDS/ folder on your SD-card, the default "Load Grid from File..." location.
+
+Grid patterns are drawn on your EVF/LCD display with the coordinates of: X = 0 to 359 (horizontally) and Y = 0 to 239 (vertically), with position 0,0 being in the upper-left corner and 359,239 being in the lower-right corner.
+
+When designing your own Grid patterns you must keep in mind that the 360x240 drawing coordinate area is in a 3:2 aspect ratio, but when displayed on your EVF/LCD display they will appear in a 360x270 or 4:3 aspect ratio. Use whatever method you have to convert your drawing-coordinates between the two. For complex grid designs one prolific grid-designer found it best to draw a new grid using any decent vector-graphic editor on their computer with a 360x270 base canvas and then resizing the final grid-design with "keep proportional" turned off to the required 360x240 ratio. The new, and now-correct, drawing coordinates were then read off from the resulting 3:2 proportional image. All right-angles, complex-angles, curves, and circles were then fully proportional and appeared correctly in the EVF/LCD display. If needing to only do simple circles or squares with the 4:3 / 3:2 offset, take the X radius/dimension and multiply it by 8, then divide that result by 9, to get a proportionally equivalent Y radius/dimension.
+
+
+Format and commands for Grid Files for CHDK:
 
 @title <text to show in menu>
@@ -7 +20 @@
 @elps   x0, y0, rx, ry, borderColor
 @elpsf  x0, y0, rx, ry, fillColor
+# comment <a non-implemented note>
 
-All numbers can be either decimal or hex.
+Where:
 
-Find more grids here: http://chdk.wikia.com/wiki/Grids
+rect = hollow-rectangle
+rectf = filled-rectangle
+elps = ellipse, where x0, y0 = ellipse radius center, and rx, ry = the two radiuses/radii
+elpsf = ellipse-filled
+
+See the included sample Grid Files on their use. Spaces between commands and numbers on each line are optional. If designing a very complex grid you may need to omit all spaces to get your grid-pattern file to fit within the maximum memory of (approx.) 3886 bytes.
+
+All numbers can be either decimal or hex. Hex numbers are prefixed with "0x", as in "0x16". For color-numbers you may use your CHDK <ALT> Menu of "Miscellaneous Stuff" > "Draw Palette" to choose and preview them, or any of the "Visual Settings" color selections menus for font display colors -- which is sometimes easier because you can see all of the colors at once instead of previewing one at a time in the "Draw Palette" feature.
+
+For the most complete and latest collection of user-designed and submitted Grid Files, as well as a handy utility to create "text-grid designs", see: http://chdk.wikia.com/wiki/Grids
 
 

branches/juciphox/Makefile

@@ -187 +187 @@
         cp $(topdir)bin/$(VER)-ixus70_sd1000-101b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus70_sd1000-101a-$(BUILD_NUMBER).zip
         @echo "**** Done Copying duplicate Firmwares"
-
+        @echo "**** Summary of memisosizes"
+        cat $(topdir)bin/caminfo.txt
+        rm -f $(topdir)bin/caminfo.txt   > $(DEVNULL)
+        
 batch-zip-complete: version
         $(MAKE) -s --no-print-directory PLATFORM=a610 PLATFORMSUB=100e NO_INC_BUILD=1 firzipsubcomplete
@@ -257 +260 @@
         cp $(topdir)bin/ixus70_sd1000-101b-$(BUILD_NUMBER).zip $(topdir)bin/ixus70_sd1000-101a-$(BUILD_NUMBER).zip
         @echo "**** Done Copying duplicate Firmwares"
-
+        @echo "**** Summary of memisosizes"
+        cat $(topdir)bin/caminfo.txt
+        rm -f $(topdir)bin/caminfo.txt   > $(DEVNULL)
 
 

branches/juciphox/bin

@@ -2 +2 @@
 *.FIR
 *.zip
+caminfo.txt

@@ -2 +2 @@
 *.FIR
 *.zip
+caminfo.txt

branches/juciphox/core/Makefile

@@ -39 +39 @@
         $(CC) $(CFLAGS) -o $@ --start-group $^  $(LDLIBS) --end-group $(LDFLAGS) $(LDOPTS)
         ( $(NM) $@ | grep ' U ' > $@.syms ) && exit 1 || exit 0
-        $(SIZE) $@
+
+        $(SIZE) $@ | tee $(topdir)size.txt
+        @printf " %s-%s (%s, #%s): MEMISOSIZE used: 0x%s / %s\n" \
+   $(PLATFORM) $(PLATFORMSUB) $(PLATFORMOS) $(PLATFORMID) \
+   `tail -c16 $(topdir)size.txt | head -c5` $(MEMISOSIZE) >> $(topdir)bin/caminfo.txt
+        rm -f $(topdir)size.txt
 
 clean:

branches/juciphox/doc/version.txt

@@ -5 +5 @@
 
 log
+
+0.5.1 / PP
+
+* changed grid readme again
++ added slovak lang file
+* fixed warning ( http://chdk.setepontos.com/index.php/topic,265.msg20831.html#msg20831 )
++ changed makefiles: when you compile, the memisosize is written to caminfo.txt, along with the "maximum" size that is defined in makefile.inc for that specific camera. in batch-zip and batch-zip-complete this file file is "catted" into the logfile and then deleted. this will make searching for cameras whose bins are "out of range" much easier. Thanks to whim who basically wrote the whole code!
+        Note: this is a first implementation, and prone to errors, as both whim and i are no makefile pros - if you have comments, dont hesitate to let us know!
 
 0.5.0 / PP

branches/juciphox/lib/ubasic/ubasic.c

@@ -180 +180 @@
 factor(void)
 {
-  int r;
+  int r = 0;
 
   DEBUG_PRINTF("factor: token %d\n", tokenizer_token());

branches/juciphox/version.inc

@@ -1 @@
-BUILD_NUMBER := 0.5.0
+BUILD_NUMBER := 0.5.1

@@ -2 +2 @@
 *.FIR
 *.zip
+caminfo.txt