# HG changeset patch # User heinrichsweikamp # Date 1344162029 -7200 # Node ID e7b675c28896b8583947913e2185ac9f5ddce7c5 # Parent 963383a9b624dd6970db150977d20ce7e565347c 2.29beta release diff -r 963383a9b624 -r e7b675c28896 code_part1/OSTC_code_asm_part1/changelog.txt --- a/code_part1/OSTC_code_asm_part1/changelog.txt Sun Aug 05 09:45:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/changelog.txt Sun Aug 05 12:20:29 2012 +0200 @@ -1,7 +1,9 @@ New in 2.29: INFO: This update will reset CFIII menu to defaults BETA Version - Do NOT use for diving! -New CF66: Show GF in NDL (If GF > CF08) +NEW CF66: Show GF in NDL (If GF > CF08) +NEW: Show total dives in Battery Information menu +CHANGE: CF01 default to 75cm New in 2.28: BETA Version - Do NOT use for diving! diff -r 963383a9b624 -r e7b675c28896 code_part1/OSTC_code_asm_part1/definitions.asm --- a/code_part1/OSTC_code_asm_part1/definitions.asm Sun Aug 05 09:45:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/definitions.asm Sun Aug 05 12:20:29 2012 +0200 @@ -22,7 +22,7 @@ ; ToDo: #DEFINE softwareversion_x d'2' ; Software version XX.YY -#DEFINE softwareversion_y d'29' ; Software version XX.YY +#DEFINE softwareversion_y d'30' ; Software version XX.YY #DEFINE softwareversion_beta 1 ; (and 0 for release) diff -r 963383a9b624 -r e7b675c28896 code_part1/OSTC_code_asm_part1/english_text.asm --- a/code_part1/OSTC_code_asm_part1/english_text.asm Sun Aug 05 09:45:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/english_text.asm Sun Aug 05 12:20:29 2012 +0200 @@ -360,7 +360,7 @@ TCODE .7, .2, "Custom Functions III" ;225 Custom Functions III TCODE .85, .125, "pSCR-GF " ;226 pSCR-GF TCODE .90, .54, "SafetyStop" ;227 SafetyStop - TCODE .0, .0, "" ;228 unused + TCODE .0, .0, "Total Dives: " ;228 Total Dives: TCODE .0, .0, "" ;229 unused TCODE .0, .0, "" ;230 unused TCODE .0, .0, "" ;231 unused diff -r 963383a9b624 -r e7b675c28896 code_part1/OSTC_code_asm_part1/french_text.asm --- a/code_part1/OSTC_code_asm_part1/french_text.asm Sun Aug 05 09:45:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/french_text.asm Sun Aug 05 12:20:29 2012 +0200 @@ -361,7 +361,7 @@ TCODE .7, .2, "Config Fonctions III" ;225 Custom Functions III TCODE .85, .125, "pSCR-GF " ;226 pSCR-GF TCODE .90, .54, "PalierSécu" ;227 SafetyStop - TCODE .0, .0, "" ;228 unused + TCODE .0, .0, "Plongées totales: " ;228 Total Dives: TCODE .0, .0, "" ;229 unused TCODE .0, .0, "" ;230 unused TCODE .0, .0, "" ;231 unused diff -r 963383a9b624 -r e7b675c28896 code_part1/OSTC_code_asm_part1/german_text.asm --- a/code_part1/OSTC_code_asm_part1/german_text.asm Sun Aug 05 09:45:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/german_text.asm Sun Aug 05 12:20:29 2012 +0200 @@ -360,7 +360,7 @@ TCODE .7, .2, "Custom Funktionen III" ;225 Custom Functions III TCODE .85, .125, "pSCR-GF " ;226 pSCR-GF TCODE .90, .54, "Sicherheit" ;227 SafetyStop - TCODE .0, .0, "" ;228 unused + TCODE .0, .0, "Anzahl TG: " ;228 Total Dives: TCODE .0, .0, "" ;229 unused TCODE .0, .0, "" ;230 unused TCODE .0, .0, "" ;231 unused diff -r 963383a9b624 -r e7b675c28896 code_part1/OSTC_code_asm_part1/italian_text.asm --- a/code_part1/OSTC_code_asm_part1/italian_text.asm Sun Aug 05 09:45:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/italian_text.asm Sun Aug 05 12:20:29 2012 +0200 @@ -359,7 +359,7 @@ TCODE .7, .2, "Funzioni Custom III" ;225 Custom Functions III TCODE .85, .125, "pSCR-GF " ;226 pSCR-GF TCODE .90, .54, "SafetyStop" ;227 SafetyStop - TCODE .0, .0, "" ;228 unused + TCODE .0, .0, "Immersioni totali: " ;228 Total Dives: TCODE .0, .0, "" ;229 unused TCODE .0, .0, "" ;230 unused TCODE .0, .0, "" ;231 unused diff -r 963383a9b624 -r e7b675c28896 code_part1/OSTC_code_asm_part1/menu_battery.asm --- a/code_part1/OSTC_code_asm_part1/menu_battery.asm Sun Aug 05 09:45:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_battery.asm Sun Aug 05 12:20:29 2012 +0200 @@ -51,7 +51,7 @@ output_16 STRCAT_PRINT ")" - WIN_TOP .65 + WIN_TOP .63 lfsr FSR2,letter OUTPUTTEXT .117 ; Last Complete at: read_int_eeprom d'47' ; Month @@ -63,7 +63,7 @@ call PLED_convert_date ; coverts into "DD/MM/YY" or "MM/DD/YY" or "YY/MM/DD" in postinc2 call word_processor - WIN_TOP .95 + WIN_TOP .91 lfsr FSR2,letter OUTPUTTEXT .118 ; Lowest Battery: read_int_eeprom d'40' ; Batt LOW @@ -77,7 +77,7 @@ bcf leftbind STRCAT_PRINT TXT_VOLT1 - WIN_TOP .125 + WIN_TOP .119 lfsr FSR2,letter OUTPUTTEXT .119 ; Lowest Battery at: read_int_eeprom d'42' ; Month @@ -89,7 +89,7 @@ call PLED_convert_date ; coverts into "DD/MM/YY" or "MM/DD/YY" or "YY/MM/DD" in postinc2 call word_processor - WIN_TOP .155 + WIN_TOP .147 lfsr FSR2,letter OUTPUTTEXT .120 ; Temp min: read_int_eeprom d'54' ; TEMP_min LOW @@ -112,7 +112,7 @@ call PLED_convert_date ; coverts into "DD/MM/YY" or "MM/DD/YY" or "YY/MM/DD" in postinc2 STRCAT_PRINT ") " - WIN_TOP .185 + WIN_TOP .175 lfsr FSR2,letter OUTPUTTEXT .121 ; Temp max: read_int_eeprom d'59' ; TEMP_max LOW @@ -135,6 +135,17 @@ call PLED_convert_date ; coverts into "DD/MM/YY" or "MM/DD/YY" or "YY/MM/DD" in postinc2 STRCAT_PRINT ") " + WIN_TOP .203 + lfsr FSR2,letter + OUTPUTTEXT .228 ; Total Dives: + read_int_eeprom d'2' ; Total dives low + movff EEDATA,lo + read_int_eeprom d'3' ; Total dives high + movff EEDATA,hi + bsf leftbind ; left orientated output + output_16 + STRCAT_PRINT "" + call wait_switches ; Waits until switches are released, resets flag if button stays pressed! bcf menubit2 menu_battery_state_loop: diff -r 963383a9b624 -r e7b675c28896 code_part1/OSTC_code_asm_part1/menu_reset.asm --- a/code_part1/OSTC_code_asm_part1/menu_reset.asm Sun Aug 05 09:45:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm Sun Aug 05 12:20:29 2012 +0200 @@ -109,7 +109,7 @@ ;---- BANK0 custom function defaults ------------------------------------- ; DEFAULT MIN MAX CF_DEFAULT CF_CENTI, d'100', d'50', d'250' ; CF00 dive_threshold 100cm - CF_DEFAULT CF_CENTI, d'50', d'20', d'100' ; CF01 surf_threshold 50cm + CF_DEFAULT CF_CENTI, d'75', d'20', d'100' ; CF01 surf_threshold 75cm CF_DEFAULT CF_INT15, d'240', d'0', d'600' ; CF02 diveloop_timeout 240s CF_DEFAULT CF_SEC, d'120', d'30', d'240' ; CF03 surfloop_timeout 120s CF_DEFAULT CF_SEC, d'5', d'1', d'30' ; CF04 premenu_timeout 5s diff -r 963383a9b624 -r e7b675c28896 code_part1/OSTC_code_asm_part1/russian_text.asm --- a/code_part1/OSTC_code_asm_part1/russian_text.asm Sun Aug 05 09:45:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/russian_text.asm Sun Aug 05 12:20:29 2012 +0200 @@ -363,7 +363,7 @@ TCODE .12, .2, "Äîï. Ïàðàìåòðû III" ;225 Custom Functions III TCODE .85, .125, "pSCR-GF " ;226 pSCR-GF TCODE .90, .54, "SafetyStop" ;227 SafetyStop - TCODE .0, .0, "" ;228 unused + TCODE .0, .0, "Total Dives: " ;228 Total Dives: TCODE .0, .0, "" ;229 unused TCODE .0, .0, "" ;230 unused TCODE .0, .0, "" ;231 unused diff -r 963383a9b624 -r e7b675c28896 code_part1/OSTC_code_asm_part1/spanish_text.asm --- a/code_part1/OSTC_code_asm_part1/spanish_text.asm Sun Aug 05 09:45:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/spanish_text.asm Sun Aug 05 12:20:29 2012 +0200 @@ -359,7 +359,7 @@ TCODE .7, .2, "Func.Personaliz. III" ;225 Custom Functions III TCODE .85, .125, "pSCR-GF " ;226 pSCR-GF TCODE .90, .54, "SafetyStop" ;227 SafetyStop - TCODE .0, .0, "" ;228 unused + TCODE .0, .0, "Total Dives: " ;228 Total Dives: TCODE .0, .0, "" ;229 unused TCODE .0, .0, "" ;230 unused TCODE .0, .0, "" ;231 unused diff -r 963383a9b624 -r e7b675c28896 code_part1/OSTC_code_asm_part1/turkish_text.asm --- a/code_part1/OSTC_code_asm_part1/turkish_text.asm Sun Aug 05 09:45:37 2012 +0200 +++ b/code_part1/OSTC_code_asm_part1/turkish_text.asm Sun Aug 05 12:20:29 2012 +0200 @@ -362,7 +362,7 @@ TCODE .7, .2, "Ozel Fonksiyonlar III" ;225 Custom Functions III TCODE .85, .125, "pSCR-GF " ;226 pSCR-GF TCODE .90, .54, "SafetyStop" ;227 SafetyStop - TCODE .0, .0, "" ;228 unused + TCODE .0, .0, "Total Dives: " ;228 Total Dives: TCODE .0, .0, "" ;229 unused TCODE .0, .0, "" ;230 unused TCODE .0, .0, "" ;231 unused diff -r 963383a9b624 -r e7b675c28896 code_part1/OSTC_code_c_part2/p2_deco.o Binary file code_part1/OSTC_code_c_part2/p2_deco.o has changed