Changeset 469

Timestamp:

08/05/08 23:38:24 (2 years ago)

Author:

phyrephox

Message:

+ added Fahrenheit conversion of the temperature. Kicks in when you enable the 12h clock format, there is NO extra menu item
* cleaned out a little bit, deleted & moved some stuff (now grids, fonts & all lang files are zipped into the big zip)
* changed a few conf values

Files:

• branches/juciphox/CHDK/FONTS/Arial14.rbf (copied) (copied from branches/juciphox/fonts/Arial14.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Arial14b.rbf (copied) (copied from branches/juciphox/fonts/Arial14b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Arial16.rbf (copied) (copied from branches/juciphox/fonts/Arial16.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Arial16b.rbf (copied) (copied from branches/juciphox/fonts/Arial16b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Arial18.rbf (copied) (copied from branches/juciphox/fonts/Arial18.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Arial18b.rbf (copied) (copied from branches/juciphox/fonts/Arial18b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Arial20.rbf (copied) (copied from branches/juciphox/fonts/Arial20.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Arial20b.rbf (copied) (copied from branches/juciphox/fonts/Arial20b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Courier14.rbf (copied) (copied from branches/juciphox/fonts/Courier14.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Courier14b.rbf (copied) (copied from branches/juciphox/fonts/Courier14b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Courier16.rbf (copied) (copied from branches/juciphox/fonts/Courier16.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Courier16b.rbf (copied) (copied from branches/juciphox/fonts/Courier16b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Courier18.rbf (copied) (copied from branches/juciphox/fonts/Courier18.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Courier18b.rbf (copied) (copied from branches/juciphox/fonts/Courier18b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Courier20.rbf (copied) (copied from branches/juciphox/fonts/Courier20.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Courier20b.rbf (copied) (copied from branches/juciphox/fonts/Courier20b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Lucida14.rbf (copied) (copied from branches/juciphox/fonts/Lucida14.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Lucida16.rbf (copied) (copied from branches/juciphox/fonts/Lucida16.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Lucida18.rbf (copied) (copied from branches/juciphox/fonts/Lucida18.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Lucida20.rbf (copied) (copied from branches/juciphox/fonts/Lucida20.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Menu-A16b.rbf (copied) (copied from branches/juciphox/fonts/Menu-A16b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Menu-A20.rbf (copied) (copied from branches/juciphox/fonts/Menu-A20.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Menu-AN18b.rbf (copied) (copied from branches/juciphox/fonts/Menu-AN18b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Menu-AN20b.rbf (copied) (copied from branches/juciphox/fonts/Menu-AN20b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Tahoma14.rbf (copied) (copied from branches/juciphox/fonts/Tahoma14.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Tahoma14b.rbf (copied) (copied from branches/juciphox/fonts/Tahoma14b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Tahoma16.rbf (copied) (copied from branches/juciphox/fonts/Tahoma16.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Tahoma16b.rbf (copied) (copied from branches/juciphox/fonts/Tahoma16b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Tahoma18.rbf (copied) (copied from branches/juciphox/fonts/Tahoma18.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Tahoma18b.rbf (copied) (copied from branches/juciphox/fonts/Tahoma18b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Tahoma20.rbf (copied) (copied from branches/juciphox/fonts/Tahoma20.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Tahoma20b.rbf (copied) (copied from branches/juciphox/fonts/Tahoma20b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Times14.rbf (copied) (copied from branches/juciphox/fonts/Times14.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Times14b.rbf (copied) (copied from branches/juciphox/fonts/Times14b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Times16.rbf (copied) (copied from branches/juciphox/fonts/Times16.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Times16b.rbf (copied) (copied from branches/juciphox/fonts/Times16b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Times18.rbf (copied) (copied from branches/juciphox/fonts/Times18.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Times18b.rbf (copied) (copied from branches/juciphox/fonts/Times18b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Times20.rbf (copied) (copied from branches/juciphox/fonts/Times20.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Times20b.rbf (copied) (copied from branches/juciphox/fonts/Times20b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Verdana14.rbf (copied) (copied from branches/juciphox/fonts/Verdana14.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Verdana14b.rbf (copied) (copied from branches/juciphox/fonts/Verdana14b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Verdana16.rbf (copied) (copied from branches/juciphox/fonts/Verdana16.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Verdana16b.rbf (copied) (copied from branches/juciphox/fonts/Verdana16b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Verdana18.rbf (copied) (copied from branches/juciphox/fonts/Verdana18.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Verdana18b.rbf (copied) (copied from branches/juciphox/fonts/Verdana18b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Verdana20.rbf (copied) (copied from branches/juciphox/fonts/Verdana20.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/Verdana20b.rbf (copied) (copied from branches/juciphox/fonts/Verdana20b.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/arialround16.rbf (copied) (copied from branches/juciphox/fonts/arialround16.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/arialround18.rbf (copied) (copied from branches/juciphox/fonts/arialround18.rbf) (1 prop)
• branches/juciphox/CHDK/FONTS/readme.txt (deleted)
• branches/juciphox/CHDK/GRIDS/3to2grid.grd (copied) (copied from branches/juciphox/grids/3to2grid.grd) (1 prop)
• branches/juciphox/CHDK/GRIDS/3to8grid.grd (copied) (copied from branches/juciphox/grids/3to8grid.grd) (1 prop)
• branches/juciphox/CHDK/GRIDS/golden1.grd (copied) (copied from branches/juciphox/grids/golden1.grd) (1 prop)
• branches/juciphox/CHDK/GRIDS/golden2.grd (copied) (copied from branches/juciphox/grids/golden2.grd) (1 prop)
• branches/juciphox/CHDK/GRIDS/id.grd (copied) (copied from branches/juciphox/grids/id.grd) (1 prop)
• branches/juciphox/CHDK/GRIDS/readme.txt (copied) (copied from branches/juciphox/grids/readme.txt) (1 prop)
• branches/juciphox/CHDK/GRIDS/rulecross.grd (copied) (copied from branches/juciphox/grids/rulecross.grd) (1 prop)
• branches/juciphox/CHDK/GRIDS/rulers.grd (copied) (copied from branches/juciphox/grids/rulers.grd) (1 prop)
• branches/juciphox/CHDK/GRIDS/sports.grd (copied) (copied from branches/juciphox/grids/sports.grd) (1 prop)
• branches/juciphox/CHDK/GRIDS/stolen.grd (copied) (copied from branches/juciphox/grids/stolen.grd) (1 prop)
• branches/juciphox/CHDK/GRIDS/third_h.grd (copied) (copied from branches/juciphox/grids/third_h.grd) (1 prop)
• branches/juciphox/CHDK/GRIDS/third_v.grd (copied) (copied from branches/juciphox/grids/third_v.grd) (1 prop)
• branches/juciphox/CHDK/LANG/Finnish.lng (modified) (22 diffs)
• branches/juciphox/CHDK/LANG/russian.lng (copied) (copied from branches/juciphox/lang/russian.lng) (1 prop)
• branches/juciphox/CHDK/LANG/russian_bigfonts.lng (copied) (copied from branches/juciphox/lang/russian_bigfonts.lng) (1 prop)
• branches/juciphox/CHDK/SCRIPTS/examples/eggtimer.bas (modified) (9 diffs)
• branches/juciphox/CHDK/SCRIPTS/readme.txt (deleted)
• branches/juciphox/Symbols (deleted)
• branches/juciphox/core/conf.c (modified) (2 diffs)
• branches/juciphox/core/gui_osd.c (modified) (2 diffs)
• branches/juciphox/doc/version.txt (modified) (1 diff)
• branches/juciphox/fonts (deleted)
• branches/juciphox/grids (deleted)
• branches/juciphox/lang (deleted)
• branches/juciphox/version.inc (modified) (1 diff)

branches/juciphox/CHDK/LANG/Finnish.lng

@@ -4 +4 @@
-//   <id>   - pit�i olla positiivinen numero
-//   <text> - teksti suljettuna lainausmerkkeihin
-3
+5
-1 "P�alikko"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-10 "Palauta oletusasetukset..."
-11 "Tallenna asetukset nyt..."
@@ -30 +19 @@
-
-
-
+-asetukset
-
-14 "Tallenna RAW-muodossa"
@@ -39 +28 @@
-
-
-
-
-
-
+
+
+
-23 "N��rvot"
-24 " Zoomin arvo"
-OF-arvo
+er�ysalue
-26 "N��ello"
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-31 "Histogrammin asettelu"
-32 "Histogrammin muoto"
@@ -62 +49 @@
-
-
-
+n asetukset
-
-37 "N��eepra"
@@ -68 +55 @@
-39 "Alivalotuksen raja"
-40 "Ylivalotuksen raja"
-
-
-
-
-
+
+
+
+
-
-45 "Avaa skripti tiedosto..."
@@ -83 +69 @@
-
-50 "Kieli..."
-OSD:n k
-RBF-
+K
+
-53 "V�t"
-OSD:n t
-OSD:n t
+Kuvaruutun��
+Kuvaruutun��
-56 "Histogrammi"
-57 "Histogrammin tausta"
@@ -118 +104 @@
-
-
-
+-asetukset
-
-80 "N��ropCaset"
@@ -128 +114 @@
-
-
-ku
+un tietojen asetukset
-
-87 "J�ite MAX"
-88 "J�ite MIN"
-89 "25+ askel"
-teina
-teina
-
+it
+it
+kun k
-
-
@@ -283 +269 @@
-200 "N��uudukko"
-201 "Avaa ruudukko tiedosto..."
-
-
-
-
+
+
+
-205 "Nykyinen ruudukko"
-
@@ -295 +280 @@
-209 "T�t�i"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-220 "Muita arvoja"
-221 "N��sikatselussa"      
-N��
-N��
-N��
-N��
-SO v
-N��
-N��
-N��
-N��
-N��liv.
-N��
+Z
+T
+T
+I
+
+A
+M
+A
+M
+Ylivalotus
+A
- 
-233 "Videoasetukset"
-
-asetukse
+
-235 "Videomuoto"
-236 "Video bittivirta"
@@ -331 +315 @@
- 
- 
-lis�
-
-ien lis�etukse
+as
+
+a
-240 "Sulkijannopeus arvo"
-241 " Arvon kerroin"
@@ -342 +326 @@
-246 " Arvon muutos(mm)"
-
- 
-
- 
+-
+
+-
-249 "TV Haarukointi"
-250 "AV Haarukointi"
@@ -366 +350 @@
-264 "Tyhjenn�rvot k�nistyksess�
-
-N��
+C
- 
-266 "RAW:n kehittely"
@@ -375 +359 @@
-271 "Muistikortilla ei ole tilaa:\n%dM tarvitaan, %dM k�ett�ss�
- 
-N��SD es
+Kuvaruutun�t�
-273 "N��arametrin tiedot"
- 
@@ -395 +379 @@
-285 "N��ist. Valot. taulukko"
-
-OSD varoitukset
-OSD v
+Varoituksen teksti
+V
-288 "Tilakuvake"
-289 "N��iedostotilan ikoni"
@@ -432 +416 @@
-316 "@puolilaukaisu painettu"
-
-
-
-
-
-
+
+
+
+
-
-320 "Tiedostotila"
@@ -458 +441 @@
-335 "Vaimenna zoomauksen aikana"
-
-Huonojen pikselien poisto
+Poista huonot pikselit
-337 "Pois"
-338 "Keskim."
@@ -467 +450 @@
-342 "Korvaaminen ei k��"
-343 " AutoIso:lla & Haarukoinni:lla"
-OSD 
-
+
+n
-346 "N��ikaa j�ell�
-347 " P�itysnopeus(~sek)"
@@ -485 +468 @@
-359 "Oma valikko ensimm�en�
-
-Symboli-fontti
-symboli
-Symboli
-Symboli
-Symboli
+Kuvakkeet...
+kuvake
+Kuvakkee
+Kuvake
+Kuvakkee
-
-365 "Omat k��
@@ -495 +478 @@
-366 "Omat k��
-367 "Avaa k��ofiili tiedosto..."
- k��
+
-369 "Valitse tiedosto"
-
-ojen n�t�371 "Reunojen n�t�
-2 "Reunojen n�t�yt�"
-3 "Reunojen kynnys
-4 "Reunojen v�
-
-
-6 "Kaukok�t�rametri
-
+an n��setukset"
+1 "Reunan n�t�
+2 "N��eunat
+3 "Reunan kynnystaso
+
+
+5 "Kaukok�t�etukse
+6 "Kaukok�t�37
-378 "Tahdistus k��"
-379 "Tahdistuksen viive k��"
@@ -521 +504 @@
-
-389 "Poikkeavuudet"
-ksien valinta
+det
-391 "Varoita poikkeavuuksista"
-392 "Valitse valikon ensimm�en"
@@ -530 +513 @@
-397 "N����a"
-398 "Videolaadun valvonta"
+399 "Kauko-ohjattu zoomaus"
+400 "Zoomin odotusviive 0.1s"

branches/juciphox/CHDK/SCRIPTS/examples/eggtimer.bas

@@ -4 +4 @@
-rem Die Eieruhr - f�iphox User und alle Kameras!!!, Autor: gehtnix  
-rem Timer zum Eierkochen
-Die Eieruh
-Weich Minuten
+eggtime
+soft minutes
-@default a 5
-Mittel Minuten
+medium minutes
-@default b 7
-Hart Minuten
+hard minutes
-@default c 10
-Sekunden f. Mittel
+seconds f. medium
-@default d 30
-Sekunden f. Alle
+seconds f. all
-@default e 0
-Taster 0=ein 1=aus
+remote 0=On 1=off
-@default r 1
-
@@ -32 +32 @@
-rem --- Men�le 1
-  cls
-DIE EIERUH
-Weich"  else print "  Kurz      =     Weich
-Mittel" else print "  Lang      =     Mittel
-Hart" else print "  L�er    =     Hart
-Ausl.     =     Ende" else print "  Ausl.
+EGGTIME
+Soft"  else print       "  short     =     soft
+medium" else print "  long      =     medium
+hard" else print        "  longer    =     hard
+USB       =     Ende" else print        "  USB  
-  gosub "taster"
-  cls
-
-  select P
-
-
-
-
+
+
+
-  end_select
-  
@@ -51 +50 @@
-end
-
-weich
+soft
-select e
-        case 0; A=a*60*1000
@@ -59 +58 @@
-print "************************"
-print "*                      *"
-   Weiches Ei 
+Softboiled egg
-print "*                      *"
-print "************************"
@@ -65 +64 @@
-return
-
-ittel
+edium
-select e
-        case 0; A=(d+b*60)*1000
@@ -73 +72 @@
-print "************************"
-print "*                      *"
-Mittelweiches Ei
+mediumboiled egg
-print "*                      *"
-print "************************"
@@ -79 +78 @@
-return
-
-t
+d
-select e
-        case 0; A=c*60*1000
@@ -87 +86 @@
-print "************************"
-print "*                      *"
-   Hartes Ei  
+hardboiled egg
-print "*                      *"
-print "************************"
@@ -102 +101 @@
-print "************************"
-print "*                      *"
-Das Ei ist fertig!
+  Yay! Finished! 
-print "*                      *"
-print "************************"

branches/juciphox/core/conf.c

@@ -265 +265 @@
-    CONF_INFO(130, conf.osd_color_warn,         CONF_DEF_VALUE, cl:MAKE_COLOR(COLOR_BG, COLOR_RED), NULL),
-    CONF_INFO(131, conf.space_color,            CONF_DEF_VALUE, cl:MAKE_COLOR(COLOR_BG, COLOR_FG), NULL),
-1
+0
-    CONF_INFO(133, conf.space_icon_pos,         CONF_DEF_PTR, ptr:&def_space_icon_pos, NULL),
-    CONF_INFO(134, conf.space_perc_show,        CONF_DEF_VALUE, i:0, NULL),
@@ -431 +431 @@
-    def_clock_pos.x=vid_get_bitmap_screen_width()-5*FONT_WIDTH-2;
-    def_clock_pos.y=0;
-8
+9
-    def_temp_pos.y=1*FONT_HEIGHT;
-}

branches/juciphox/core/gui_osd.c

@@ -37 +37 @@
-    {LANG_OSD_LAYOUT_EDITOR_SPACE_TEXT,   &conf.space_txt_pos,     {5*FONT_WIDTH, FONT_HEIGHT}     },
-    {LANG_OSD_LAYOUT_EDITOR_CLOCK,      &conf.clock_pos,        {5*FONT_WIDTH, FONT_HEIGHT}     },
-8
+9
-    {LANG_OSD_LAYOUT_EDITOR_VIDEO,     &conf.mode_video_pos,   {9*FONT_WIDTH, 2*FONT_HEIGHT}   },
-    {LANG_OSD_LAYOUT_EDITOR_EV,     &conf.mode_ev_pos,   {12*FONT_WIDTH, FONT_HEIGHT}   },
@@ -994 +994 @@
-                if (conf.show_temp==1||0)
-                        {
-
+
+
+
+
+
+
+
+
-                                draw_string(conf.temp_pos.x, conf.temp_pos.y, osd_buf, conf.osd_color);
-                        }
-                if (conf.show_temp==2)
-                        {
-
+
+
+
+
+
+
+
+
-                                draw_string(conf.temp_pos.x, conf.temp_pos.y, osd_buf, conf.osd_color);
-                        }
-                if (conf.show_temp==3)
-                        {
-
+
+
+
+
+
+
+
+
-                                draw_string(conf.temp_pos.x, conf.temp_pos.y, osd_buf, conf.osd_color);
-                        }
-                if (conf.show_temp==4)
-                        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

branches/juciphox/doc/version.txt

@@ -1 +1 @@
-first version of a history file. will be automated and cleaned hopefully soon.
+
+467 / 0.2.31
+PhyrePhoX
+
+* cleaned out a little bit, deleted & moved some stuff (now grids, fonts & all lang files are zipped into the big zip)
+* changed a few conf values 
++ added Fahrenheit conversion of the temperature. Kicks in when you enable the 12h clock format, there is NO extra menu item
-
-Revision: 468, version 0.2.3

branches/juciphox/version.inc

@@ -1 @@
-
+1