--- a/src/tft_outputs.inc	Thu Mar 05 15:06:14 2020 +0100
+++ b/src/tft_outputs.inc	Tue Apr 28 17:34:31 2020 +0200
@@ -1,6 +1,6 @@
 ;=============================================================================
 ;
-;   File tft_outputs.inc                      next combined generation V3.08.8
+;   File tft_outputs.inc                    * combined next generation V3.09.5
 ;
 ;
 ;   Copyright (c) 2011, JD Gascuel, HeinrichsWeikamp, all right reserved.
@@ -8,112 +8,154 @@
 ; HISTORY
 ;  2011-08-07 : [mH] moving from OSTC code
 
+
+;-----------------------------------------------------------------------------
 ; Surface Mode
-	extern	TFT_surface_lastdive
-	extern	TFT_show_OC_startgas_surface		; first gas and "OSTC2-like" active gases
-	extern	TFT_time_surfmode
-	extern	TFT_date_surfmode
-	extern	TFT_desaturation_time
-	extern	TFT_nofly_time
-	extern	TFT_gaslist_surfmode
-	extern	TFT_pres_surfmode
-	extern	TFT_temp_surfmode					; current temperature (common core with divemode temp)
-	extern	TFT_batt_surfmode
-	extern	TFT_decotype_surface
-	extern	TFT_decotype_logbook				; used from logbook
-	extern	TFT_custom_text						; the custom text
-	extern	TFT_surface_tissues					; tissue diagram in surface mode
-	extern	TFT_surface_decosettings			; all deco settings
-	extern	show_fw_mesg_update					; firmware is updated message
-	extern	show_fw_mesg_kept					; firmware is kept    message
-	extern	TFT_cat_serial						; add serial           to current string
-	extern	TFT_cat_firmware					; add firmware version to current string
-	extern	TFT_cat_beta_release				; add beta/release     to current string
+
+	extern	TFT_surfmode_time					; current time
+	extern	TFT_surfmode_date					; current date
+	extern	TFT_surfmode_pres					; print current pressure, unconditional
+	extern	TFT_surfmode_pres_fast				; print current pressure, but only if change > threshold
+	extern	TFT_surfmode_temp					; current temperature (common core with divemode temp)
+	extern	TFT_surfmode_batt					; battery status      (also used in sleep mode)
+	extern	TFT_surfmode_decotype				; deco mode (OC, CCR, ...)
+	extern	TFT_surfmode_startgas				; first gas and "OSTC2-like" active gases
+
+ IFDEF _rx_functions
+	extern	TFT_surfmode_tankpres				; tank data for surface mode screen
+ ENDIF
+
+
+;-----------------------------------------------------------------------------
+; Surface Mode Custom Views
+
+	extern	TFT_surf_cv_lastdive				; last dive summery
+	extern	TFT_surf_cv_list_gas				; OC gases list
+	extern	TFT_surf_cv_text					; the custom text
+	extern	TFT_surf_cv_tissues					; tissue diagram (also used by logbook)
+	extern	TFT_surf_cv_settings				; all deco settings
+
+ IFDEF _rx_functions
+	extern	TFT_surf_cv_tankdata				; show the tank pressure data in surface customview
+ ENDIF
 
  IFDEF _compass
-	extern	TFT_surf_set_bearing
+	extern	TFT_surf_cv_compass_bearing			; "set bearing" dialog
  ENDIF
 
  IFDEF _ccr_pscr
-	extern	TFT_dillist_surfmode
-	extern	TFT_splist_surfmode					; setpoint list
+	extern	TFT_surf_cv_list_dil				; diluents list
+	extern	TFT_surf_cv_list_sp					; setpoint list
  ENDIF
 
+
+;-----------------------------------------------------------------------------
+; Surface Mode Messages
+
+	extern	TFT_surf_mesg_desat					; desaturation time
+	extern	TFT_surf_mesg_nofly					; no-fly/alt   time
+
+
+;-----------------------------------------------------------------------------
+; Imprints called by Housekeeping
+
+	extern	TFT_imprint_time_date				; imprint current     time and date
+	extern	TFT_imprint_time_date_fast			; imprint last cahced time and date
+	extern	TFT_imprint_color_schemes			; imprint color schemes (animated dive time)
+
  IFDEF _external_sensor
-	extern	TFT_menu_calibrate					; update mV data in menu
-	extern	TFT_surface_sensor					; update sensor data in surface mode
-	extern	TFT_sensor_surface_warning			; sensor end-of-lifetime symbol
+	extern	TFT_imprint_menu_mV					; imprint sensor data in menu    mode - mv
+	extern	TFT_imprint_surf_ppO2				; imprint sensor data in surface mode - ppO2
+	extern	TFT_imprint_surf_mV					; imprint sensor data in surface mode - mV
+	extern	TFT_imprint_surf_sensor_eol			; imprint sensor data in surface mode - end of life
+ ENDIF
+
+ IFDEF _rx_functions
+	extern	TFT_imprint_tank_pres				; imprint tank data in tank setup menu
  ENDIF
 
 
-; Menu
-	extern	TFT_LogOffset
-	extern	TFT_show_color_schemes				; update the color schemes
-	extern	TFT_show_time_date_menu
-	extern	TFT_show_time_date_menu_fast
-	extern	TFT_show_serial_and_firmware
-	extern	TFT_show_firmware
-	extern	info_menu_total_dives
-
+;-----------------------------------------------------------------------------
 ; Dive Mode
-	extern	TFT_show_cns
-	extern	TFT_show_divetime
-	extern	TFT_show_depth
-	extern	TFT_show_max_depth
-	extern	TFT_show_temp_divemode					; current temperature (common core with surface temp)
-	extern	TFT_show_active_gas_divemode			; active gas and setpoint
-	extern	TFT_show_divemode_mask
-	extern	TFT_show_menu_cursor_divemode			; the divemode cursor
-	extern	TFT_show_ndl_mask
-	extern	TFT_show_ndl
-	extern	TFT_show_tts
-	extern	TFT_show_deco_mask
-	extern	TFT_show_deco
-	extern	TFT_divemode_sign_show
-	extern	TFT_divemode_sign_clear
-	extern	TFT_velocity_show
-	extern	TFT_velocity_clear
-	extern	TFT_show_ppo2_mask
-	extern	TFT_show_ppo2_warning
-	extern	TFT_msg_batt_percent_divemode
-	extern	TFT_show_apnoe_times
-	extern	TFT_clear_apnoe_surface
-	extern	TFT_show_apnoe_surface
-	extern	TFT_show_apnoe_max_depth
-	extern	TFT_show_ftts
+
+	extern	TFT_show_divemode_mask				; show  static layout
+	extern	TFT_show_ndl_mask					; show  NDL    layout add-on
+	extern	TFT_show_deco_mask					; show  deco   layout add-on
+
+	extern	TFT_show_divetime					; show  dive time
+	extern	TFT_show_depth						; show  current depth
+	extern	TFT_show_max_depth					; show  maximum depth
+	extern	TFT_show_apnoe_max_depth			; show  maximum depth - apnoe mode
+	extern	TFT_show_temp_divemode				; show  temperature (common core with surface temp)
+	extern	TFT_show_active_gas_divemode		; show  active gas and setpoint
+	extern	TFT_show_ndl						; show  NDL time
+	extern	TFT_show_tts						; show  TTS time
+	extern	TFT_show_deco						; show  deco stop data
+
+	extern	TFT_show_apnoe_times				; show  apnoe current and overall time
+	extern	TFT_show_apnoe_surface				; show  apnoe surface mode data
+	extern	TFT_clear_apnoe_surface				; clear apnoe surface data
+
+	extern	TFT_clear_deco_data					; clear deco data (NDL or stop & TTS)
 	extern	TFT_clear_divemode_menu				; clear the divemode menu
-	extern	TFT_clear_message_window
-	extern	TFT_clear_message_window_row2
-	extern	TFT_warning_saturation
-	extern	TFT_warning_agf						; show a warning if aGF is selected
-	extern	TFT_divetimeout						; show timeout counter
-	extern	TFT_safety_stop_show				; show the safety stop
+
+	extern	TFT_velocity_show					; show  vertical velocity
+	extern	TFT_velocity_clear					; clear vertical velocity
+
+	extern	TFT_divemode_sign_show				; show  sign
+	extern	TFT_divemode_sign_clear				; clear sign
+
+	extern	TFT_safety_stop_show				; show  safety stop
 	extern	TFT_safety_stop_clear				; clear safety stop
-	extern	TFT_clear_deco_data					; clear deco data (NDL or stop & TTS)
-	extern	TFT_warning_fallback				; show fallback warning
-	extern	TFT_warning_gas_needs
-	extern	TFT_attention_gas_needs
-	extern	TFT_advice_gas_change
-	extern	TFT_warning_no_BO_gas
-	extern	TFT_warning_eod_cns
-	extern	TFT_warning_mbubbles
-	extern	TFT_warning_outside
-	extern	TFT_warning_depth
-	extern	TFT_info_deco
+
+
+;-----------------------------------------------------------------------------
+; Dive Mode Mesages
+
+	extern	TFT_message_ftts					; fTTS
+	extern	TFT_message_ppo2					; ppO2
+	extern	TFT_message_battery_percent			; battery
+	extern	TFT_message_cns						; current     CNS
+	extern	TFT_message_cns_eod					; end-of-dive CNS
+	extern	TFT_message_saturation				; Saturation
+	extern	TFT_message_agf						; aGF is selected
+	extern	TFT_message_divetimeout				; dive timeout counter
+	extern	TFT_message_gas_needs				; gas needs
+	extern	TFT_message_gas_change				; gas change advice
+	extern	TFT_message_no_BO_gas				; no bailout gas available
+	extern	TFT_message_mbubbles				; mico-bubbles
+	extern	TFT_message_outside					; outside of the model
+	extern	TFT_message_depth_limit				; depth limit exceeded
+	extern	TFT_message_deco_info				; decompression zone
 
  IFDEF _helium
-	extern	TFT_warning_IBCD
+	extern	TFT_message_IBCD					; INCD
+ ENDIF
+
+ IFDEF _ccr_pscr
+	extern	TFT_message_gas_density				; gas density
  ENDIF
 
  IFDEF _external_sensor
-	extern	TFT_warning_sensor_disagree
+	extern	TFT_message_divergence				; sensor ppO2 divergence
+	extern	TFT_message_fallback				; show fallback warning
  ENDIF
 
-; Date
-	extern	TFT_convert_date					; print day, month and year
-	extern	TFT_convert_date_short				; print day and month
+ IFDEF _rx_functions
+	extern	TFT_message_transmitter				; transmitter
+	extern	TFT_message_pressure				; pressure reading
+	extern	TFT_message_sac						; SAC
+	extern	TFT_message_switch_tanks			; switch advice for ind.double mode
+ ENDIF
 
+ IFDEF _cave_mode
+	extern	TFT_message_cave_mode				; cave mode status
+ ENDIF
+
+
+;-----------------------------------------------------------------------------
 ; Divemode Custom Views
+
 	extern	TFT_avr_stopwatch_mask				; mask for average depth and stopwatch
 	extern	TFT_avr_stopwatch					; data for average depth and stopwatch
 	extern	TFT_gas_needs_mask					; mask for gas needs ascent
@@ -127,7 +169,7 @@
 	extern	TFT_ppo2_ead_end_cns_mask			; mask for ppO2, END/EAD and CNS / gas density
 	extern	TFT_ppo2_ead_end_cns				; data for ppO2, END/EAD and CNS / gas density
 	extern	TFT_gf_factors_mask					; mask for GF factors
-;	extern										; data for GF factors (none)
+;	extern										; data for GF factors (not existing)
 	extern	TFT_clock_batt_surfpress_mask		; mask for clock, battery and surface pressure
 	extern	TFT_clock_batt_surfpress			; data for clock, battery and surface pressure
 
@@ -143,61 +185,61 @@
 	extern	TFT_ppo2_sensors					; data for ppO2 sensors
  ENDIF
 
+ IFDEF _rx_functions
+	extern	TFT_pressures_SAC_mask				; mask for pressures and SAC
+	extern	TFT_pressures_SAC					; data for pressures and SAC
+ ENDIF
+
  IFDEF _cave_mode
 	extern	TFT_cave_tts_mask					; mask for cave mode TTS, total stops and runtime
 	extern	TFT_cave_tts						; data for cave mode TTS, total stops and runtime
-	extern	TFT_cave_waypoints					; data for cave mode waypoints
- ENDIF
-
-
-; Surface Custom Views
-
- IFDEF _external_sensor
-	extern	TFT_sensor_mV
+	extern	TFT_cave_waypoints					; data for cave mode waypoints (no mask function)
  ENDIF
 
 
-; Color-coding
-	extern	TFT_standard_color
-	extern	TFT_disabled_color
-	extern	TFT_memo_color
-	extern	TFT_advice_color
-	extern	TFT_attention_color
-	extern	TFT_warning_color
-	extern	TFT_divemask_color
+;-----------------------------------------------------------------------------
+; Font Color Selection - pallet-based Colors
+
+	extern	TFT_load_std_color_pallet			; load standard color pallet
+	extern	TFT_load_dive_color_pallet			; load dive     color pallet
+
 
-	extern	TFT_color_code_gas
-	extern	TFT_color_code_gaslist
-	extern	TFT_color_code_cns
-	extern	TFT_color_code_tank_pres_sac
+;-----------------------------------------------------------------------------
+; Color-Coding
 
-; Misc
-	extern	convert_pres_to_depth				; converts pressure in [mbar] to depth in [cm]
-	extern	convert_cm_to_feet					; converts depth in [cm] to depth in [feet]
-	extern	convert_meter_to_feet				; converts depth in [m]  to depth in [feet]
-	extern	convert_celsius_to_fahrenheit		; converts temperature from celsius to fahrenheit
-	extern	TFT_convert_signed_16bit
-
-; Debug output
-	extern	TFT_debug_output
+	extern	TFT_color_code_gas					; color-code by gas number (1-6) in WREG
+	extern	TFT_color_code_gaslist				; color-code by gas O2% (in hi) and absolute pressure
+	extern	TFT_color_code_cns					; color-code CNS value
 
 
- IFDEF _rx_functions
-	extern	TFT_pressures_SAC_mask				; mask for pressures and SAC
-	extern	TFT_pressures_SAC					; data for pressures and SAC
-	extern	TFT_menu_tank_pres					; update tank data when in tank setup menu
-	extern	TFT_surface_tank_pres				; update tank data when in surface mode
-	extern	TFT_surface_tankdata				; show the tank pressure data in surface customview
-	extern	TFT_attention_transmitter			; show attention for transmitter
-	extern	TFT_attention_pres_reading			; show attention for pressure reading
-	extern	TFT_warning_pres_reading			; show warning   for pressure reading
-	extern	TFT_attention_sac					; show attention for SAC
-	extern	TFT_advice_switch					; show switch advice for ind.double mode
-	extern	TFT_print_firmware_rx				; show rx firmware version
- ENDIF
+;-----------------------------------------------------------------------------
+; Append / Print Firmware Data etc.
+
+	extern	TFT_cat_firmware					; append firmware version to output buffer
+	extern	TFT_cat_beta_long					; append beta/release     to output buffer (long  format)
+	extern	TFT_cat_beta_short					; append beta/release     to output buffer (short format)
+	extern	TFT_cat_serial						; append serial number    to output buffer
+
+	extern	TFT_print_serial_and_firmware		; print serial number and full firmware
+	extern	TFT_print_firmware					; print firmware and beta/release status
+	extern	TFT_print_decotype					; print OC,CCR,... (used by logbook & simulator)
+
+	extern	TFT_message_fw_update				; firmware is updated message
+	extern	TFT_message_fw_kept					; firmware is kept    message
+
 
- IFDEF _cave_mode
-	extern	TFT_info_cave_mode					; show info      that cave mode is active
-	extern	TFT_cave_shutdown_attention			; show attention that cave mode will shut down soon
-	extern	TFT_cave_shutdown_warning			; show warning   that cave mode has  shut down
- ENDIF
+
+;-----------------------------------------------------------------------------
+; Message System
+
+	extern	TFT_buffer_trim_length				; fill or trim output buffer to a given length
+	extern	TFT_clear_message_window			; clear all messages
+	extern	TFT_clear_message_window_row2		; clear only 2nd message
+
+
+;-----------------------------------------------------------------------------
+; Debug output
+
+	extern	TFT_debug_output					; used for scheduling performance, etc.
+
+;-----------------------------------------------------------------------------