# HG changeset patch # User heinrichsweikamp # Date 1295332781 -3600 # Node ID 54cc1346ac15b837b9752d6db502968802619dee # Parent 3f4d60385f9cf966c90f99a467a6fb40a53d4cdb 1.80RC diff -r 3f4d60385f9c -r 54cc1346ac15 code_part1/OSTC_code_asm_part1/definitions.asm --- a/code_part1/OSTC_code_asm_part1/definitions.asm Sun Jan 16 21:17:24 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/definitions.asm Tue Jan 18 07:39:41 2011 +0100 @@ -23,9 +23,9 @@ ;#DEFINE NO_SENSOR_MODE ; uses Dummy values #DEFINE softwareversion_x d'1' ; Software version XX.YY -#DEFINE softwareversion_y d'77' ; Software version XX.YY +#DEFINE softwareversion_y d'80' ; Software version XX.YY -#DEFINE softwareversion_beta 1 ; (and 0 for release) +#DEFINE softwareversion_beta 0 ; (and 0 for release) #DEFINE max_custom_number d'53' ; Number of last used custom function diff -r 3f4d60385f9c -r 54cc1346ac15 code_part1/OSTC_code_asm_part1/menu_reset.asm --- a/code_part1/OSTC_code_asm_part1/menu_reset.asm Sun Jan 16 21:17:24 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm Tue Jan 18 07:39:41 2011 +0100 @@ -144,7 +144,7 @@ ;---- BANK1 custom function defaults ------------------------------------- cf_default_table1: ; DEFAULT MIN MAX - CF_DEFAULT CF_PERCENT, d'30', d'10', d'90' ; GF_low_default 30% + CF_DEFAULT CF_PERCENT, d'30', d'5', d'90' ; GF_low_default 30% CF_DEFAULT CF_PERCENT, d'90', d'30', d'95' ; GF_high_default 90% CF_DEFAULT CF_COLOR, d'199', 0, 0 ; color_battery_surface Color Battery sign: Deep blue CF_DEFAULT CF_COLOR, d'255', 0, 0 ; color_standard1 Color Standard: White @@ -164,7 +164,7 @@ CF_DEFAULT CF_INT8, d'15', d'7', d'20' ; color_warn_celocity_mmin warn at xx m/min CF_DEFAULT CF_SEC, d'42', d'0', d'240' ; time_correction_value_default Adds to Seconds on Midnight - CF_DEFAULT CF_BOOL, d'1', 0, 0 ; CF#49 Show Altimeter in surface mode + CF_DEFAULT CF_BOOL, d'0', 0, 0 ; CF#49 Show Altimeter in surface mode CF_DEFAULT CF_BOOL, d'0', 0, 0 ; CF50 Show Log-Marker CF_DEFAULT CF_BOOL, d'1', 0, 0 ; CF51 Show Stopwatch @@ -336,16 +336,17 @@ clrf EEDATA write_int_eeprom d'35' ; Do not use O2 Sensor in CC Modes - movlw d'0' clrf EEDATA write_int_eeprom d'39' ; Disable Debugbode clrf EEDATA write_int_eeprom d'90' ; Disable Brightness offset? (Dim=1, Normal = 0) movlw d'1' + movwf EEDATA write_int_eeprom d'91' ; Reset Date format to DD.MM.YY movlw d'100' + movwf EEDATA write_int_eeprom d'26' ; Salinity default: 1.00 kg/l movlw b'00011111' diff -r 3f4d60385f9c -r 54cc1346ac15 code_part1/OSTC_code_asm_part1/pled_outputs.asm --- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm Sun Jan 16 21:17:24 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm Tue Jan 18 07:39:41 2011 +0100 @@ -980,12 +980,11 @@ movff WREG,letter+5 ; collision with sat graphs bcf leftbind call word_processor - rcall PLED_active_gas_divemode_better_gas ; show *, if required - return - +; rcall PLED_active_gas_divemode_better_gas ; show *, if required +; return PLED_active_gas_divemode_better_gas: WIN_TOP .192 - WIN_LEFT .42 + WIN_LEFT .43 WIN_FONT FT_SMALL call PLED_standard_color lfsr FSR2,letter diff -r 3f4d60385f9c -r 54cc1346ac15 code_part1/OSTC_code_asm_part1/start.asm --- a/code_part1/OSTC_code_asm_part1/start.asm Sun Jan 16 21:17:24 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/start.asm Tue Jan 18 07:39:41 2011 +0100 @@ -124,7 +124,7 @@ movwf EEDATA call write_eeprom ; write version y clrf EEADRH ; Reset EEADRH -; goto reset_all_cf ; resets all custom functions bank0 and bank1 and jumps to "restart" + goto reset_all_cf ; resets all custom functions bank0 and bank1 and jumps to "restart" ; goto reset_all_cf_bank1 ; resets all custom functions bank1 and jumps to "restart" restart: