Mercurial > public > hwos_code

diff src/gaslist.inc @ 631:185ba2f91f59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
3.09 beta 1 release
author heinrichsweikamp
date Fri, 28 Feb 2020 15:45:07 +0100
parents c40025d8e750
children 4050675965ea
line wrap: on
line diff
--- a/src/gaslist.inc	Fri Feb 21 10:51:36 2020 +0100
+++ b/src/gaslist.inc	Fri Feb 28 15:45:07 2020 +0100
@@ -1,6 +1,6 @@
 ;=============================================================================
 ;
-;   File gaslist.inc                          combined next generation V3.03.1
+;   File gaslist.inc                          combined next generation V3.08.7
 ;
 ;   Interface to OSTC gas list management.
 ;
@@ -14,12 +14,30 @@
 	extern	gaslist_strcat_gas_WREG
 	extern	gaslist_strcat_gas_cd
 	extern	gaslist_show_mix				; put "Nxlo", "Txlo/hi", "Air" or "O2" into Postinc2
-	extern	do_toggle_gf_label
+	extern	label_do_toggle_gf
+	extern	label_do_gas6_or_exit
+	extern	gaslist_gastitle
+
+	; Main Gaslist Menu
+	extern	gaslist_pO2
+	extern	gaslist_mO2
+	extern	gaslist_GasDepth
+	extern	gaslist_show_type
+	extern	gaslist_toggle_type
+	extern	gaslist_cleanup_list
 
- IFDEF _cave_mode
-	extern	do_turn_dive_label
- ENDIF
+	; Depth Sub-Menu
+	extern	gaslist_pDepth
+	extern	gaslist_mDepth
+	extern	gaslist_MOD_END
+	extern	gaslist_ppo2
+	extern	gaslist_reset_mod_title
+	extern	gaslist_reset_mod
 
+	; Tank Sub-Menu
+	extern	gaslist_tank_size_pres
+	extern	gaslist_tank_size
+	extern	gaslist_tank_pres
 
 	; Setpoints and Diluents
  IFDEF _ccr_pscr
@@ -30,39 +48,21 @@
 	extern	gaslist_copy_dil_to_oc
  ENDIF
 
-
-	; Select currently edited Gas
-	extern	gaslist_gastitle
-
-
-	; Main Gaslist Menu
-	extern	gaslist_pO2
-	extern	gaslist_mO2
-	extern	gaslist_GasDepth
-	extern	gaslist_show_type
-	extern	gaslist_toggle_type
-	extern	gaslist_cleanup_list
-
+	; Helium Editing
  IFDEF _helium
 	extern	gaslist_pHe
 	extern	gaslist_mHe
  ENDIF
 
+	; Cave Mode
+ IFDEF _cave_mode
+	extern	label_do_turn_dive
+	extern	label_do_wp_set
+	extern	label_do_wp_out
+	extern	label_do_wp_in
+ ENDIF
 
-	; Depth Sub-Menu
-	extern	gaslist_pDepth
-	extern	gaslist_mDepth
-	extern	gaslist_MOD_END
-	extern	gaslist_ppo2
-	extern	gaslist_reset_mod_title
-	extern	gaslist_reset_mod
-
-
-	; Tank Sub-Menu
-	extern	gaslist_tank_size_pres
-	extern	gaslist_tank_size
-	extern	gaslist_tank_pres
-
+	; RX Functions
  IFDEF _rx_functions
 	extern	gaslist_tank_id_pres
 	extern	gaslist_tank_pairing