# HG changeset patch # User heinrichsweikamp # Date 1321254733 -3600 # Node ID 4c7f7807b250f5145466c52b491bbb88facb6a17 # Parent 06db5dd9149fd43279785a9e5da22b9d359aa5ac minor fixes in german layout diff -r 06db5dd9149f -r 4c7f7807b250 code_part1/OSTC_code_asm_part1/changelog.txt --- a/code_part1/OSTC_code_asm_part1/changelog.txt Wed Nov 09 16:17:11 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/changelog.txt Mon Nov 14 08:12:13 2011 +0100 @@ -1,5 +1,6 @@ New in 2.05 beta: BETA Version - Do NOT use for diving! +BUGFIX: German text layout in Divemode New in 2.04 beta: BETA Version - Do NOT use for diving! diff -r 06db5dd9149f -r 4c7f7807b250 code_part1/OSTC_code_asm_part1/divemode.asm --- a/code_part1/OSTC_code_asm_part1/divemode.asm Wed Nov 09 16:17:11 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/divemode.asm Mon Nov 14 08:12:13 2011 +0100 @@ -149,7 +149,7 @@ call test_switches_divemode_menu ; Yes, check switches divemode menu btfss divemode ; Dive finished? - bra end_dive ; Dive finished! + goto end_dive ; Dive finished! btfsc pressure_refresh ; new pressure available? call update_divemode1 ; Yes, display new depth @@ -190,6 +190,7 @@ bcf premenu ; Yes, so clear "Menu?" and clear pre_menu bit call PLED_menu_clear ; Remove "Menu?" + call PLED_divemode_mask ; And redraw mask (Redraw missing "T" from "Tauchzeit" in german text version) return divemode_apnoe_tasks: ; 1 sec. Apnoe tasks diff -r 06db5dd9149f -r 4c7f7807b250 code_part1/OSTC_code_asm_part1/pled_outputs.asm --- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm Wed Nov 09 16:17:11 2011 +0100 +++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm Mon Nov 14 08:12:13 2011 +0100 @@ -610,13 +610,13 @@ bcf timeout_display ; Clear flag bra PLED_display_clear_common_y1 -PLED_display_velocity_graphical_clear: +PLED_display_velocity_graph_clr: WIN_BOX_BLACK .20, .90, .65, .75 ; Clear graphic display bra PLED_display_velocity ; Continue with normal output PLED_display_velocity_graphical: btfss neg_flag - bra PLED_display_velocity_graphical_clear + bra PLED_display_velocity_graph_clr bsf pled_velocity_display ; divA+0 holding the ascend speed in m/min movff divA+0,hi ; Copy