changeset 680:c6220d340684

Removed "Mix type" Icons and CF43
author heinrichsweikamp
date Fri, 25 Jan 2013 16:31:22 +0100
parents b93c0c72a558
children 6e456a6398e0
files code_part1/OSTC_code_asm_part1/MAIN.ASM code_part1/OSTC_code_asm_part1/changelog.txt code_part1/OSTC_code_asm_part1/dive_air.inc code_part1/OSTC_code_asm_part1/dive_icons.asm code_part1/OSTC_code_asm_part1/dive_nitrox.inc code_part1/OSTC_code_asm_part1/dive_trimix.inc code_part1/OSTC_code_asm_part1/english_text.asm code_part1/OSTC_code_asm_part1/french_text.asm code_part1/OSTC_code_asm_part1/german_text.asm code_part1/OSTC_code_asm_part1/menu_reset.asm code_part1/OSTC_code_asm_part1/russian_text.asm code_part1/OSTC_code_asm_part1/spanish_text.asm code_part1/OSTC_code_asm_part1/surfmode.asm
diffstat 13 files changed, 7 insertions(+), 403 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/MAIN.ASM	Tue Jan 08 07:12:58 2013 +0100
+++ b/code_part1/OSTC_code_asm_part1/MAIN.ASM	Fri Jan 25 16:31:22 2013 +0100
@@ -108,8 +108,6 @@
 #include    strings.asm         ; Basic string operations
 
 #include    altimeter.asm
-;=============================================================================
-#include    dive_icons.asm      ; Draw dive type icons in surface mode.
 
 ;=============================================================================
 ; Extracted from p3_wordprocessor includes:
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Tue Jan 08 07:12:58 2013 +0100
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Fri Jan 25 16:31:22 2013 +0100
@@ -1,5 +1,6 @@
 New in 2.60:
 BETA Version - Do NOT use for diving!
+CHANGE: Removed "Mix type" Icons and CF43
 
 New in 2.59:
 BETA Version - Do NOT use for diving!
--- a/code_part1/OSTC_code_asm_part1/dive_air.inc	Tue Jan 08 07:12:58 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-dive_air_width    equ .78
-dive_air_height   equ .26
-dive_air_block:
-    db  .39, .26
-    db  .5, 0
-    dw  0x0000 ; rgb=(0,0,0)
-    dw  0x31a6 ; rgb=(53,53,53)
-    dw  0x7bcf ; rgb=(122,122,122)
-    dw  0xbdd7 ; rgb=(185,185,185)
-    dw  0xffff ; rgb=(255,255,255)
-;
-    db  0x07, 0x49, 0x0f, 0x49, 0x0f, 0x41, 0x05, 0x41
-    db  0x0f, 0x41, 0x05, 0x41, 0x0e, 0x20, 0x41, 0x05
-    db  0x41, 0x20, 0x0b, 0x10, 0x30, 0x42, 0x05, 0x42
-    db  0x30, 0x10, 0x08, 0x20, 0x42, 0x20, 0x10, 0x05
-    db  0x10, 0x20, 0x42, 0x20, 0x06, 0x20, 0x41, 0x30
-    db  0x0b, 0x30, 0x41, 0x20, 0x04, 0x20, 0x41, 0x20
-    db  0x0d, 0x20, 0x41, 0x20, 0x02, 0x10, 0x41, 0x20
-    db  0x0f, 0x20, 0x41, 0x10, 0x01, 0x30, 0x40, 0x30
-    db  0xf1, 0x01, 0x30, 0x40, 0x30, 0x00, 0x10, 0x41
-    db  0x10, 0xf1, 0x01, 0x10, 0x41, 0x10, 0x20, 0x40
-    db  0x30, 0xf1, 0x03, 0x30, 0x40, 0x20, 0x30, 0x40
-    db  0x20, 0xf1, 0x03, 0x20, 0x40, 0x30, 0x41, 0x10
-    db  0xf1, 0x03, 0x10, 0x43, 0xf1, 0x05, 0x43, 0xf1
-    db  0x05, 0x43, 0xf1, 0x05, 0x43, 0xf1, 0x05, 0x43
-    db  0xf1, 0x05, 0x43, 0xf1, 0x05, 0x43, 0xf1, 0x05
-    db  0x43, 0xf1, 0x05, 0x43, 0x0f, 0x11, 0x03, 0x43
-    db  0x0b, 0x10, 0x20, 0x30, 0x41, 0x20, 0x03, 0x43
-    db  0x08, 0x10, 0x30, 0x45, 0x20, 0x03, 0x43, 0x04
-    db  0x10, 0x20, 0x30, 0x45, 0x20, 0x10, 0x05, 0x43
-    db  0x02, 0x10, 0x45, 0x30, 0x20, 0x41, 0x07, 0x43
-    db  0x02, 0x20, 0x43, 0x20, 0x02, 0x41, 0x07, 0x43
-    db  0x02, 0x20, 0x45, 0x30, 0x20, 0x41, 0x07, 0x43
-    db  0x02, 0x10, 0x30, 0x48, 0x20, 0x10, 0x05, 0x43
-    db  0x05, 0x10, 0x20, 0x30, 0x47, 0x20, 0x03, 0x43
-    db  0x09, 0x10, 0x30, 0x44, 0x20, 0x03, 0x43, 0x0c
-    db  0x10, 0x20, 0x30, 0x40, 0x20, 0x03, 0x43, 0xf1
-    db  0x00, 0x10, 0x03, 0x43, 0xf1, 0x05, 0x43, 0x06
-    db  0x30, 0x40, 0x10, 0x0b, 0x43, 0x06, 0x30, 0x40
-    db  0x10, 0x0b, 0x43, 0x06, 0x30, 0x40, 0x10, 0x0b
-    db  0x43, 0x01, 0x10, 0x21, 0x10, 0x00, 0x30, 0x40
-    db  0x30, 0x26, 0x10, 0x03, 0x43, 0x01, 0x20, 0x41
-    db  0x20, 0x00, 0x30, 0x48, 0x20, 0x03, 0x43, 0x01
-    db  0x20, 0x41, 0x20, 0x00, 0x30, 0x48, 0x20, 0x03
-    db  0x43, 0x01, 0x10, 0x21, 0x10, 0x00, 0x29, 0x10
-    db  0x03, 0x43, 0xf1, 0x05, 0x43, 0xf1, 0x05, 0x43
-    db  0xf1, 0x05, 0x43, 0xf1, 0x05, 0x43, 0x06, 0x20
-    db  0x38, 0x20, 0x03, 0x43, 0x06, 0x30, 0x48, 0x20
-    db  0x03, 0x43, 0x06, 0x30, 0x48, 0x20, 0x03, 0x43
-    db  0x07, 0x30, 0x41, 0x10, 0x09, 0x43, 0x06, 0x20
-    db  0x41, 0x10, 0x0a, 0x43, 0x06, 0x41, 0x30, 0x0b
-    db  0x43, 0x06, 0x42, 0x20, 0x0a, 0x43, 0x06, 0x42
-    db  0x30, 0x0a, 0x43, 0x06, 0x23, 0x0a, 0x43, 0xf1
-    db  0x05, 0x43, 0xf1, 0x05, 0x43, 0xf1, 0x05, 0x43
-    db  0xf1, 0x05, 0x43, 0xf1, 0x05, 0x43, 0xf1, 0x05
-    db  0x43, 0xf1, 0x05, 0x43, 0xf1, 0x05, 0x43, 0xf1
-    db  0x05, 0x43, 0xf1, 0x05, 0x43, 0x10, 0xf1, 0x03
-    db  0x10, 0x41, 0x30, 0x40, 0x10, 0xf1, 0x03, 0x10
-    db  0x40, 0x30, 0x20, 0x40, 0x30, 0xf1, 0x03, 0x30
-    db  0x40, 0x20, 0x10, 0x41, 0xf1, 0x03, 0x41, 0x10
-    db  0x00, 0x30, 0x40, 0x20, 0xf1, 0x01, 0x20, 0x40
-    db  0x30, 0x01, 0x10, 0x41, 0x10, 0x0f, 0x10, 0x41
-    db  0x10, 0x02, 0x30, 0x41, 0x10, 0x0d, 0x10, 0x41
-    db  0x30, 0x04, 0x30, 0x41, 0x10, 0x0b, 0x10, 0x41
-    db  0x30, 0x06, 0x30, 0x41, 0x20, 0x09, 0x20, 0x41
-    db  0x30, 0x08, 0x30, 0x42, 0x30, 0x11, 0x01, 0x11
-    db  0x30, 0x42, 0x30, 0x0a, 0x10, 0x30, 0x49, 0x30
-    db  0x10, 0x0d, 0x10, 0x20, 0x30, 0x43, 0x30, 0x20
-    db  0x10, 0x07
--- a/code_part1/OSTC_code_asm_part1/dive_icons.asm	Tue Jan 08 07:12:58 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
-;=============================================================================
-;
-;    File dive_icons.asm
-;
-;    Draw Air/Nitrox/Trimix colored icon on surface mode.
-;
-;    This program is free software: you can redistribute it and/or modify
-;    it under the terms of the GNU General Public License as published by
-;    the Free Software Foundation, either version 3 of the License, or
-;    (at your option) any later version.
-;
-;    This program is distributed in the hope that it will be useful,
-;    but WITHOUT ANY WARRANTY; without even the implied warranty of
-;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;    GNU General Public License for more details.
-;
-;    You should have received a copy of the GNU General Public License
-;    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-;
-;    Copyright (c) 2010, JD Gascuel.
-;=============================================================================
-; HISTORY
-;  2010-12-21 : [jDG] Creation
-;  2011-01-03 : [jDG] Force first gas to be active from depth=0.
-;
-; RATIONALS: Enabled gazes are used to predict TTS in divemode, hence they
-;            are a critical aspect that should be double-checked before dive.
-;
-; Known bug:
-;=============================================================================
-mixtype_icons   code
-
-;=============================================================================
-; Display either Air, Nitrox, or Trimix icon (in surface mode).
-; Inputs:  None: explore the gaz list.
-; Ouputs:  None.
-; Trashed: hi:lo, PROD, and registers trashed by color_processor.asm
-dive_type_icons:
-            ;---- Don't display when not in the right deco mode --------------
-            btfsc   FLAG_apnoe_mode     ; Apnoe selected ?
-            return                      ; YES: just return.
-            btfsc   gauge_mode          ; gauge mode ?
-            return                      ; YES: also return.
-            btfsc   FLAG_const_ppO2_mode; Not in CC modes
-            return
-            
-            ;---- Don't display CF#41 is false -------------------------------
-            GETCUSTOM8  d'41'           ; Read CF#41
-            btfss   WREG,0              ; Set ?
-            return                      ; NO: return
-
-            ;---- Common setup -----------------------------------------------
-            movlw   .170
-            movff   WREG, win_top
-            movlw   .110
-            movff   WREG, win_leftx2
-            movlw   UPPER(dive_air_block)
-            movwf   TBLPTRU
-
-            ;---- Explore gas list -------------------------------------------
-            ; EEADR <-- 4*gas# + 6
-            ; EEADR-2 = default O2%
-            ; EEADR-1 = default He%
-            ; EEADR+0 = current O2%
-            ; EEADR+1 = current He%
-            ; EEADR+4 = next gaz current O2%
-            
-            clrf    EEADRH              ; read gas flag register --> hi
-            movlw   .27
-            movwf   EEADR
-            call    read_eeprom
-          	movff   EEDATA,hi
-          	rlcf    hi,F                ; Push a dummy bit.
-          	setf    lo                  ; Start with gas# -1
-	        clrf    PRODL               ; =0 : no nitrox found yet.
-
-            movlw   .33                 ; Read first gas #.
-            movwf   EEADR
-            call    read_eeprom
-            movff   EEDATA,PRODH        ; first --> PRODH (1..5)
-
-dive_type_loop:
-            incf    lo,F                ; Next gaz number. Range 0..4
-
-            rrcf    hi,F                ; Rotate BEFORE checking active gas!
-
-            incf    lo,W                ; Current gas# 1..5
-            subwf   PRODH,W             ; == first gas ?
-            bz      dive_type_loop_2    ; YES: analyse that gas !
-
-            btfss   hi,0                ; Is this gas enabled ?
-            bra     dive_type_loop_9    ; No: disabled.
-            
-            movlw   .28                 ; Switch depth is at gas#+28
-            addwf   lo,W
-            movwf   EEADR               ; address in EEPROM.
-            call    read_eeprom         ; Read depth
-            clrf    WREG                
-            cpfsgt  EEDATA              ; is depth > 0 ?
-            bra      dive_type_loop_9   ; NO: disabled too.
-
-dive_type_loop_2:
-            rlncf   lo,W                ; Gas# times 4
-            rlncf   WREG
-            addlw   4+2                 ; 6 + 4 * gas#
-            movwf   EEADR               ; address in EEPROM for current O2.
-            call    read_eeprom         ; Read O2 %
-
-            movlw   .21
-            cpfseq  EEDATA              ; O2 == 21% ?
-            setf    PRODL               ; NO: not simple air !
-
-            incf    EEADR               ; Read He %
-            call    read_eeprom
-            decf    EEADR
-            clrf    WREG                ; H2 == 0% ?
-            cpfseq  EEDATA
-            bra     dive_trimix_icon    ; No: go for the Tx icon, now.
-            
-dive_type_loop_9:
-            movlw   4                   ; Already done all gas ? (index 0..4)
-            cpfseq  lo                  ; gas# == 4 ?
-            bra     dive_type_loop      ; NO: loop...
-	        
-	        btfsc   PRODL,0             ; Did we find a nitrox gaz ?
-	        bra     dive_nitrox_icon    ; YES: display nitrox icon.;.
-
-            ;---- Draw air ---------------------------------------------------
-dive_air_icon:
-            movlw   HIGH(dive_air_block)
-            movwf   TBLPTRH
-            movlw   LOW(dive_air_block)
-            movwf   TBLPTRL
-            bra     dive_gaz_99
-
-dive_nitrox_icon:
-            movlw   HIGH(dive_nitrox_block)
-            movwf   TBLPTRH
-            movlw   LOW(dive_nitrox_block)
-            movwf   TBLPTRL
-            bra     dive_gaz_99
-
-dive_trimix_icon:
-            movlw   HIGH(dive_trimix_block)
-            movwf   TBLPTRH
-            movlw   LOW(dive_trimix_block)
-            movwf   TBLPTRL
-
-dive_gaz_99:
-            call    color_image
-            movlb   1                   ; Back to bank 1.
-            return
-
-;=============================================================================
-
-#include    dive_air.inc
-#include    dive_nitrox.inc
-#include    dive_trimix.inc
-
--- a/code_part1/OSTC_code_asm_part1/dive_nitrox.inc	Tue Jan 08 07:12:58 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-dive_nitrox_width    equ .78
-dive_nitrox_height   equ .26
-dive_nitrox_block:
-    db  .39, .26
-    db  .9, 0
-    dw  0x0000 ; rgb=(0,0,0)
-    dw  0x10c0 ; rgb=(19,25,6)
-    dw  0x4303 ; rgb=(71,96,24)
-    dw  0x74c4 ; rgb=(115,154,38)
-    dw  0x8dc5 ; rgb=(138,185,46)
-    dw  0x9e66 ; rgb=(153,204,51)
-    dw  0x2181 ; rgb=(37,49,12)
-    dw  0x5bc3 ; rgb=(90,120,29)
-    dw  0x0860 ; rgb=(9,12,3)
-;
-    db  0xf0, 0x07, 0x59, 0x0f, 0x59, 0x0f, 0x59, 0x0f
-    db  0x59, 0x0e, 0x20, 0x59, 0x20, 0x0b, 0x60, 0x30
-    db  0x5b, 0x30, 0x60, 0x08, 0x20, 0x5f, 0x20, 0x06
-    db  0x70, 0xf1, 0x51, 0x70, 0x04, 0x20, 0x52, 0x40
-    db  0x3c, 0x40, 0x51, 0x20, 0x02, 0x10, 0x40, 0x52
-    db  0x20, 0x0c, 0x20, 0x51, 0x40, 0x10, 0x01, 0x70
-    db  0x53, 0x20, 0x04, 0x67, 0x70, 0x52, 0x70, 0x00
-    db  0x10, 0x54, 0x30, 0x10, 0x03, 0x60, 0x30, 0x5a
-    db  0x10, 0x20, 0x56, 0x70, 0x80, 0x03, 0x60, 0x30
-    db  0x58, 0x20, 0x30, 0x57, 0x40, 0x20, 0x80, 0x03
-    db  0x20, 0x40, 0x56, 0x30, 0x40, 0x59, 0x40, 0x20
-    db  0x04, 0x20, 0x40, 0x54, 0x40, 0x5c, 0x40, 0x20
-    db  0x03, 0x80, 0x30, 0x5a, 0x20, 0x0c, 0x20, 0x5a
-    db  0x20, 0x0c, 0x20, 0xf4, 0x52, 0x70, 0x20, 0x40
-    db  0xf1, 0x56, 0x60, 0x00, 0x30, 0xf1, 0x56, 0x60
-    db  0x00, 0x30, 0xf1, 0x56, 0x60, 0x00, 0x30, 0xf1
-    db  0x51, 0x20, 0x01, 0x20, 0x50, 0x60, 0x08, 0x20
-    db  0x59, 0x20, 0x01, 0x20, 0x50, 0x60, 0x08, 0x20
-    db  0x59, 0x20, 0x01, 0x20, 0x50, 0x60, 0x08, 0x20
-    db  0xf7, 0x56, 0x20, 0x00, 0x20, 0xf1, 0x56, 0x20
-    db  0x00, 0x20, 0xf1, 0x53, 0x20, 0x08, 0x80, 0x60
-    db  0x30, 0x5c, 0x20, 0x0b, 0x30, 0x5b, 0x20, 0x0b
-    db  0x60, 0x5e, 0x20, 0x00, 0x20, 0x53, 0x40, 0x60
-    db  0x00, 0x60, 0x5e, 0x20, 0x00, 0x20, 0x54, 0x20
-    db  0x00, 0x60, 0x5e, 0x20, 0x00, 0x20, 0x54, 0x20
-    db  0x00, 0x60, 0x5e, 0x30, 0x20, 0x30, 0x54, 0x61
-    db  0x70, 0xf4, 0x52, 0x39, 0x40, 0x5e, 0x60, 0x08
-    db  0x20, 0x5e, 0x60, 0x08, 0x20, 0x5e, 0x70, 0x60
-    db  0x01, 0x60, 0x24, 0x30, 0x5e, 0x30, 0x01, 0x20
-    db  0xf1, 0x55, 0x60, 0x00, 0x10, 0xf1, 0x56, 0x01
-    db  0x60, 0xf1, 0x56, 0x02, 0x60, 0xf1, 0x55, 0x80
-    db  0x01, 0x60, 0xf3, 0x51, 0x30, 0x20, 0x62, 0x20
-    db  0x40, 0xf1, 0x51, 0x20, 0x05, 0x80, 0x70, 0x5f
-    db  0x30, 0x07, 0x80, 0x40, 0x5e, 0x60, 0x00, 0x80
-    db  0x20, 0x32, 0x20, 0x01, 0x20, 0x5e, 0x01, 0x30
-    db  0x54, 0x20, 0x00, 0x60, 0x5e, 0x01, 0x40, 0x54
-    db  0x30, 0x00, 0x60, 0x5e, 0x01, 0x20, 0x53, 0x40
-    db  0x60, 0x00, 0x60, 0x5e, 0x60, 0x01, 0x10, 0x60
-    db  0x20, 0x60, 0x80, 0x01, 0x70, 0x5e, 0x30, 0x80
-    db  0x06, 0x60, 0x40, 0x5f, 0x30, 0x10, 0x04, 0x60
-    db  0x40, 0xf1, 0x52, 0x30, 0x70, 0x20, 0x70, 0x30
-    db  0xf1, 0x51, 0x70, 0x40, 0x56, 0x71, 0x5e, 0x60
-    db  0x10, 0x30, 0x53, 0x40, 0x20, 0x00, 0x20, 0x5e
-    db  0x60, 0x01, 0x20, 0x40, 0x50, 0x30, 0x60, 0x01
-    db  0x70, 0x54, 0x40, 0x58, 0x60, 0x02, 0x10, 0x20
-    db  0x80, 0x01, 0x70, 0x54, 0x40, 0x30, 0x58, 0x40
-    db  0x60, 0x04, 0x10, 0x30, 0x55, 0x30, 0x20, 0x5a
-    db  0x20, 0x03, 0x10, 0x30, 0x55, 0x20, 0x60, 0x59
-    db  0x30, 0x80, 0x05, 0x20, 0x40, 0x53, 0x60, 0x00
-    db  0x30, 0x57, 0x70, 0x01, 0x80, 0x30, 0x70, 0x80
-    db  0x02, 0x20, 0x52, 0x30, 0x01, 0x60, 0x57, 0x60
-    db  0x00, 0x60, 0x40, 0x51, 0x40, 0x60, 0x01, 0x20
-    db  0x52, 0x60, 0x02, 0x70, 0x56, 0x60, 0x20, 0x55
-    db  0x70, 0x80, 0x20, 0x51, 0x70, 0x03, 0x80, 0x30
-    db  0x55, 0x40, 0x57, 0x40, 0x30, 0x50, 0x30, 0x80
-    db  0x04, 0x80, 0x30, 0x5f, 0x30, 0x80, 0x06, 0x80
-    db  0x30, 0x5d, 0x30, 0x80, 0x09, 0x60, 0x30, 0x59
-    db  0x30, 0x60, 0x0d, 0x60, 0x70, 0x30, 0x53, 0x30
-    db  0x70, 0x60, 0x07
--- a/code_part1/OSTC_code_asm_part1/dive_trimix.inc	Tue Jan 08 07:12:58 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-dive_trimix_width    equ .78
-dive_trimix_height   equ .26
-dive_trimix_block:
-    db  .39, .26
-    db  .12, 0
-    dw  0x0000 ; rgb=(0,0,0)
-    dw  0x1881 ; rgb=(26,17,8)
-    dw  0x3942 ; rgb=(63,41,19)
-    dw  0x59e3 ; rgb=(95,60,26)
-    dw  0x6a23 ; rgb=(107,68,30)
-    dw  0x7264 ; rgb=(117,76,36)
-    dw  0x61c2 ; rgb=(96,56,19)
-    dw  0xb4f1 ; rgb=(176,157,139)
-    dw  0x8349 ; rgb=(134,104,76)
-    dw  0xffff ; rgb=(255,255,255)
-    dw  0xde98 ; rgb=(217,208,199)
-    dw  0xa44e ; rgb=(160,137,115)
-;
-    db  0xf0, 0x07, 0x59, 0x0f, 0x59, 0x0f, 0x51, 0x65
-    db  0x51, 0x0f, 0x51, 0x65, 0x51, 0x0e, 0x10, 0x51
-    db  0x65, 0x51, 0x10, 0x0b, 0x10, 0x30, 0x52, 0x65
-    db  0x52, 0x30, 0x10, 0x08, 0x20, 0x52, 0x40, 0x67
-    db  0x40, 0x52, 0x20, 0x06, 0x20, 0x51, 0x81, 0x50
-    db  0x69, 0x40, 0x51, 0x20, 0x04, 0x10, 0x51, 0x40
-    db  0x70, 0x90, 0x70, 0x6a, 0x40, 0x51, 0x10, 0x02
-    db  0x10, 0x40, 0x50, 0x40, 0x60, 0x70, 0x90, 0x70
-    db  0x6b, 0x40, 0x50, 0x40, 0x10, 0x01, 0x20, 0x50
-    db  0x40, 0x61, 0x70, 0x90, 0x70, 0x6c, 0x40, 0x50
-    db  0x20, 0x00, 0x10, 0x51, 0x62, 0x70, 0x90, 0xa0
-    db  0x7a, 0x80, 0x61, 0x51, 0x10, 0x20, 0x50, 0x40
-    db  0x62, 0x70, 0x9c, 0x70, 0x61, 0x40, 0x50, 0x20
-    db  0x30, 0x50, 0x40, 0x62, 0x70, 0x9c, 0x70, 0x61
-    db  0x40, 0x50, 0x30, 0x40, 0x50, 0x63, 0x70, 0x90
-    db  0xa0, 0x7a, 0x80, 0x62, 0x50, 0x40, 0x51, 0x63
-    db  0x70, 0x90, 0x70, 0x6e, 0x53, 0x63, 0x70, 0x90
-    db  0x70, 0x6e, 0x53, 0x63, 0x70, 0x90, 0x70, 0x6e
-    db  0x53, 0x63, 0x80, 0x70, 0x80, 0x6e, 0x53, 0xf1
-    db  0x65, 0x53, 0x67, 0xb0, 0x78, 0x80, 0x62, 0x53
-    db  0x67, 0xa0, 0x98, 0x70, 0x62, 0x53, 0x67, 0xa0
-    db  0x98, 0x70, 0x62, 0x53, 0x67, 0x80, 0xa0, 0x91
-    db  0xb0, 0x84, 0x50, 0x62, 0x53, 0x67, 0x70, 0x91
-    db  0x80, 0x69, 0x53, 0x67, 0xa0, 0x90, 0xa0, 0x6a
-    db  0x53, 0x67, 0x91, 0xa0, 0x80, 0x69, 0x53, 0x67
-    db  0x92, 0xa0, 0x69, 0x53, 0x67, 0xa2, 0x70, 0x69
-    db  0x53, 0xf1, 0x65, 0x53, 0xf1, 0x65, 0x53, 0x67
-    db  0x70, 0xa0, 0x80, 0x6a, 0x53, 0x67, 0xa0, 0x90
-    db  0x80, 0x6a, 0x53, 0x67, 0xa0, 0x90, 0x80, 0x6a
-    db  0x53, 0x62, 0x50, 0x81, 0x50, 0x60, 0xa0, 0x90
-    db  0xb0, 0x86, 0x50, 0x62, 0x53, 0x62, 0x70, 0x91
-    db  0x70, 0x60, 0xa0, 0x98, 0x70, 0x62, 0x53, 0x62
-    db  0x70, 0x91, 0x70, 0x60, 0xa0, 0x98, 0x70, 0x62
-    db  0x53, 0x62, 0x80, 0x71, 0x80, 0x60, 0xb0, 0x78
-    db  0x80, 0x62, 0x53, 0xf1, 0x65, 0x53, 0xf1, 0x65
-    db  0x53, 0xf1, 0x65, 0x53, 0x67, 0x70, 0xa8, 0xb0
-    db  0x62, 0x53, 0x67, 0xa0, 0x98, 0x70, 0x62, 0x53
-    db  0x67, 0xb0, 0xa0, 0x90, 0xa0, 0x75, 0x80, 0x62
-    db  0x53, 0x67, 0x70, 0x91, 0x86, 0x50, 0x62, 0x53
-    db  0x67, 0x99, 0x70, 0x62, 0x53, 0x67, 0xa0, 0x98
-    db  0x70, 0x62, 0x53, 0x67, 0x80, 0xa0, 0x90, 0x70
-    db  0x85, 0x50, 0x62, 0x53, 0x67, 0x92, 0x76, 0x80
-    db  0x62, 0x53, 0x67, 0x99, 0x70, 0x62, 0x53, 0x67
-    db  0x80, 0xa8, 0xb0, 0x62, 0x53, 0xf1, 0x65, 0x53
-    db  0xf1, 0x65, 0x53, 0x67, 0x70, 0xa0, 0x80, 0x6a
-    db  0x53, 0x67, 0xa0, 0x90, 0x80, 0x6a, 0x53, 0x67
-    db  0xa0, 0x90, 0x80, 0x6a, 0x53, 0x62, 0x50, 0x81
-    db  0x50, 0x60, 0xa0, 0x90, 0xb0, 0x86, 0x50, 0x62
-    db  0x53, 0x62, 0x70, 0x91, 0x70, 0x60, 0xa0, 0x98
-    db  0x70, 0x62, 0x53, 0x62, 0x70, 0x91, 0x70, 0x60
-    db  0xa0, 0x98, 0x70, 0x62, 0x53, 0x62, 0x80, 0x71
-    db  0x80, 0x60, 0xb0, 0x78, 0x80, 0x62, 0x53, 0xf1
-    db  0x65, 0x53, 0xf1, 0x65, 0x53, 0xf1, 0x61, 0x50
-    db  0x62, 0x53, 0x67, 0x70, 0x80, 0x65, 0x40, 0xa0
-    db  0x70, 0x62, 0x53, 0x67, 0xa0, 0x90, 0x70, 0x40
-    db  0x62, 0x80, 0xa0, 0x90, 0x70, 0x62, 0x53, 0x67
-    db  0xa0, 0x91, 0xa0, 0x80, 0x60, 0x70, 0x92, 0x80
-    db  0x62, 0x51, 0x40, 0x50, 0x67, 0x70, 0x93, 0xa0
-    db  0x91, 0xa0, 0x80, 0x63, 0x50, 0x40, 0x30, 0x50
-    db  0x30, 0x67, 0xb0, 0x94, 0xa0, 0x40, 0x63, 0x30
-    db  0x50, 0x30, 0x20, 0x50, 0x40, 0x68, 0xb0, 0x94
-    db  0x70, 0x40, 0x62, 0x40, 0x50, 0x20, 0x10, 0x51
-    db  0x67, 0x70, 0x96, 0xa0, 0x80, 0x61, 0x51, 0x10
-    db  0x00, 0x30, 0x50, 0x40, 0x65, 0xa0, 0x91, 0xa0
-    db  0x40, 0x50, 0xa0, 0x92, 0x70, 0x60, 0x40, 0x50
-    db  0x30, 0x01, 0x10, 0x51, 0x30, 0x64, 0xa0, 0x90
-    db  0x70, 0x63, 0xb0, 0x91, 0x70, 0x30, 0x51, 0x10
-    db  0x02, 0x20, 0x51, 0x64, 0x70, 0x80, 0x65, 0x50
-    db  0xa0, 0x70, 0x51, 0x20, 0x04, 0x30, 0x51, 0x30
-    db  0x6b, 0x30, 0x80, 0x50, 0x30, 0x06, 0x30, 0x51
-    db  0x40, 0x69, 0x40, 0x51, 0x30, 0x08, 0x20, 0x52
-    db  0x40, 0x30, 0x63, 0x30, 0x40, 0x52, 0x30, 0x0a
-    db  0x10, 0x30, 0x59, 0x30, 0x10, 0x0d, 0x10, 0x20
-    db  0x30, 0x53, 0x30, 0x20, 0x10, 0x07
--- a/code_part1/OSTC_code_asm_part1/english_text.asm	Tue Jan 08 07:12:58 2013 +0100
+++ b/code_part1/OSTC_code_asm_part1/english_text.asm	Fri Jan 25 16:31:22 2013 +0100
@@ -293,7 +293,7 @@
     TCODE    .40,   .35,     "Divemode secs. "           ;160 Divemode secs. 
     TCODE    .40,   .35,     "Adjust fixed SP"           ;161 Adjust fixed SP
     TCODE    .40,   .35,     "Warn Ceiling   "           ;162 Warn Ceiling
-    TCODE    .40,   .35,     "Mix type icons "           ;163 Mix type icons
+    TCODE    .40,   .35,     "unused         "           ;163 unused
     TCODE    .40,   .35,     "Blink BetterGas"           ;164 Blink BetterGas	(Remainder in divemode to switch to a better decompression gas).
 	TCODE    .40,   .35,     "DepthWarn[mbar]"           ;165 DepthWarn[mbar]
     TCODE    .40,   .35,     "CNS warning [%]"           ;166 CNS warning [%]
--- a/code_part1/OSTC_code_asm_part1/french_text.asm	Tue Jan 08 07:12:58 2013 +0100
+++ b/code_part1/OSTC_code_asm_part1/french_text.asm	Fri Jan 25 16:31:22 2013 +0100
@@ -295,7 +295,7 @@
     TCODE    .40,   .35,     "Secs.TempsPlong"           ;160 Divemode secs. 
     TCODE    .40,   .35,     "Ajuster SP fixe"           ;161 Adjust fixed SP
     TCODE    .40,   .35,     "Alarme Plafond "           ;162 Warn Ceiling
-    TCODE    .40,   .35,     "Icone Type Mйl."           ;163 Mix type icons
+    TCODE    .40,   .35,     "unused         "           ;163 unused
     TCODE    .40,   .35,     "Aff.MeilleurGaz"           ;164 Blink BetterGas	(Remainder in divemode to switch to a better decompression gas).
     TCODE    .40,   .35,     "AlarmProf[mbar]"           ;165 DepthWarn[mbar]
     TCODE    .40,   .35,     "Alarme CNS  [%]"           ;166 CNS warning [%]
--- a/code_part1/OSTC_code_asm_part1/german_text.asm	Tue Jan 08 07:12:58 2013 +0100
+++ b/code_part1/OSTC_code_asm_part1/german_text.asm	Fri Jan 25 16:31:22 2013 +0100
@@ -294,7 +294,7 @@
     TCODE    .40,   .35,     "Tauchmodus Sek."           ;160 Divemode secs. 
     TCODE    .40,   .35,     "Festen SP дnde."           ;161 Adjust fixed SP
     TCODE    .40,   .35,     "Warnung Ceiling"           ;162 Warn Ceiling
-    TCODE    .40,   .35,     "Gas Mix Symbole"           ;163 Mix type icons
+    TCODE    .40,   .35,     "unbenutzt      "           ;163 unused
     TCODE    .40,   .35,     "BesseresGasAnz "           ;164 Blink BetterGas	(Remainder in divemode to switch to a better decompression gas).
     TCODE    .40,   .35,     "TiefeWarn[mbar]"           ;165 DepthWarn[mbar]
     TCODE    .40,   .35,     "CNS Warnung [%]"           ;166 CNS warning [%]
--- a/code_part1/OSTC_code_asm_part1/menu_reset.asm	Tue Jan 08 07:12:58 2013 +0100
+++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm	Fri Jan 25 16:31:22 2013 +0100
@@ -160,7 +160,7 @@
 	CF_DEFAULT    CF_BOOL,	    d'0',   0,      0       ; CF38 show_seconds_divemode		=1 Show the seconds in Divemode
 	CF_DEFAULT    CF_BOOL,     	0,      0,      0 		; CF39 Adjust SetPoint if Diluent ppO2 > SetPoint
 	CF_DEFAULT    CF_BOOL,	    d'1',   0,      0       ; CF40 warn_ceiling_divemode		=1 Warn ceiling violation in divemode
-	CF_DEFAULT    CF_BOOL,      d'1',   0,      0 		; CF41 Show mix type is surfmode
+	CF_DEFAULT    CF_BOOL,      d'1',   0,      0 		; CF41 unused
 
 	CF_DEFAULT    CF_BOOL,	    d'1',   0,      0       ; CF42 blink_gas_divemode 		=1 blink better gas
 	CF_DEFAULT    CF_INT15,     d'13000', 0,   d'13000' ; CF43 color_warn_depth_mbar		Warn depths
--- a/code_part1/OSTC_code_asm_part1/russian_text.asm	Tue Jan 08 07:12:58 2013 +0100
+++ b/code_part1/OSTC_code_asm_part1/russian_text.asm	Fri Jan 25 16:31:22 2013 +0100
@@ -294,7 +294,7 @@
     TCODE    .40,   .35,     "Время погр.сек."           ;160 Divemode secs.
     TCODE    .40,   .35,     "Поправ. фикс.SP"           ;161 Adjust fixed SP
     TCODE    .40,   .35,     "Предупреж. стоп"           ;162 Warn Ceiling
-    TCODE    .40,   .35,     "Картинки газов "           ;163 Mix type icons
+    TCODE    .40,   .35,     "unused         "           ;163 unused
     TCODE    .40,   .35,     "Напом. лучш.газ"           ;164 Blink BetterGas	(Remainder in divemode to switch to a better decompression gas).
 	TCODE    .40,   .35,     "Трев.глуб[мбар]"           ;165 DepthWarn[mbar]
     TCODE    .40,   .35,     "ЦНС предупр.[%]"           ;166 CNS warning [%]
--- a/code_part1/OSTC_code_asm_part1/spanish_text.asm	Tue Jan 08 07:12:58 2013 +0100
+++ b/code_part1/OSTC_code_asm_part1/spanish_text.asm	Fri Jan 25 16:31:22 2013 +0100
@@ -290,7 +290,7 @@
     TCODE    .40,   .35,     "SegundosModoBuc"           ;160 Divemode secs. 
     TCODE    .40,   .35,     "Ajusta SP fijo "           ;161 Adjust fixed SP
     TCODE    .40,   .35,     "Aviso Techo    "           ;162 Warn Ceiling
-    TCODE    .40,   .35,     "Iconos TipoMezl"           ;163 Mix type icons
+    TCODE    .40,   .35,     "unused         "           ;163 unused
     TCODE    .40,   .35,     "Parp. Mejor Gas"           ;164 Blink BetterGas	(Remainder in divemode to switch to a better decompression gas).
     TCODE    .40,   .35,     "AvisoProf[mbar]"           ;165 DepthWarn[mbar]
     TCODE    .40,   .35,     "Aviso CNS   [%]"           ;166 CNS warning [%]
--- a/code_part1/OSTC_code_asm_part1/surfmode.asm	Tue Jan 08 07:12:58 2013 +0100
+++ b/code_part1/OSTC_code_asm_part1/surfmode.asm	Fri Jan 25 16:31:22 2013 +0100
@@ -135,7 +135,6 @@
 	call	set_leds_surfmode			; Sets Warning and No-Fly LEDs
 	call    check_customfunctions       ; Checks CF functions and displays warning symbol if something critical is wrong
 	call	surfcustomview_second		; Do every-second tasks for the custom view area
-  	call    dive_type_icons             ; Draw Air/Nitrox/Trimix color icon.
 
 ; Every 2 seconds, overwrite with GF value (if needed to display)
     btfsc   secs,1                      ; Alternating every 2sec (if needed)