--- a/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Tue Oct 12 21:18:47 2010 +0200
+++ b/code_part1/OSTC_code_asm_part1/pled_outputs.asm	Wed Oct 13 13:02:20 2010 +0200
@@ -380,7 +380,7 @@
 	rcall	PLED_clear_decoarea	
 ; total deco time word
 	call		PLED_divemask_color	; Set Color for Divemode mask
-	DISPLAYTEXT	d'85'			; DECOSUM
+	DISPLAYTEXT	d'85'			; TTS
 	call	PLED_standard_color
 	return
 
@@ -2495,7 +2495,7 @@
 PLED_decoplan_gf_page1x_next_6m:
 	movlw	d'6'
 	movwf	temp7
-incf	temp5,F
+	incf	temp5,F
 PLED_decoplan_gf_page1y:
 	movlw	d'3'
 	addwf	temp7,F			; Add 3m for next stop
@@ -2527,9 +2527,11 @@
 	call	word_processor	
 	WIN_LEFT	.140
 	movff	temp6,win_top
-	lfsr	FSR1,0x251
+;	lfsr	FSR1,0x251
+	lfsr	FSR1,0x0E1						; Gf_decolist_copy
 	movf	temp5,W							; number of entry
-	movff	PLUSW1,lo
+	movff	PLUSW1,lo						; Stop length
+incf	lo,F							; add one dummy minute
 	lfsr	FSR2,letter	
 	output_99x								; outputs into Postinc2!
 	movlw	d'39'							;"'"
@@ -3402,507 +3404,6 @@
 	call		PLED_display_clear_common_y1
 	return
 
-
-;PLED_const_ppO2_DEBUG:
-;	movlw	.007
-;	call	PLED_SetColumn
-;	movlw	.032
-;	call	PLED_SetRow
-;	lfsr	FSR2,letter
-;	movff	char_O_diluent,lo
-;	output_8
-;	movlw	.001
-;	movwf	scaleY
-;	call	word_processor
-;	movlw	.007
-;	call	PLED_SetColumn
-;	movlw	.024
-;	call	PLED_SetRow
-;	lfsr	FSR2,letter
-;	movff	last_diluent,lo
-;	output_8
-;	movlw	.001
-;	movwf	scaleY
-;	call	word_processor
-;	movlw	.007
-;	call	PLED_SetColumn
-;	movlw	.016
-;	call	PLED_SetRow
-;	lfsr	FSR2,letter
-;	movff	char_O_deco_status,lo
-;	output_8
-;	movlw	.001
-;	movwf	scaleY
-;	call	word_processor
-;	return
-;
-
-;PLED_gaschange_DEBUG:
-;	WIN_LEFT	.0
-;	WIN_TOP		.160
-;	lfsr	FSR2,letter
-;	movff	char_I_deco_He_ratio,lo
-;	output_8
-;	call	word_processor
-;
-;	WIN_LEFT	.25
-;	WIN_TOP		.160
-;	call	PLED_SetRow
-;	lfsr	FSR2,letter
-;	movff	char_I_deco_N2_ratio,lo
-;	output_8
-;	call	word_processor
-;
-;	WIN_LEFT	.50
-;	WIN_TOP		.160
-;	lfsr	FSR2,letter
-;	movff	char_I_deco_gas_change,lo
-;	output_8
-;	call	word_processor
-;
-;	WIN_LEFT	.75
-;	WIN_TOP		.160
-;	lfsr	FSR2,letter
-;	movff	hi,lo
-;	output_8
-;	call	word_processor
-;	return
-
-;
-;PLED_MultiGF_deco_all:
-;	movff	char_O_actual_pointer,wait_temp
-;	movff	char_O_GF_low_pointer,waitms_temp
-;	movf	waitms_temp,F
-;		bz		PLED_MultiGF_no_deco
-;	call	PLED_MultiGF_table				; input wait_temp
-;	return
-;
-;PLED_MultiGF_no_deco:
-;	DISPLAYTEXT	d'242'			;"no deco"
-;	return
-;
-;PLED_MultiGF_table:
-;	movlw	d'9'
-;	movwf	temp5			; number of stops
-;	movlw	.231
-;	movwf	temp6			; row
-;	lfsr	FSR1,char_IO_deco_table+0
-;
-;PLED_MultiGF_table2:
-;	movlw	d'25'
-;	addwf	temp6,F
-;	call	PLED_MultiGF_show_stop
-;	decfsz	temp5,F
-;	bra		PLED_MultiGF_table2
-;	return
-;
-;PLED_MultiGF_show_stop:
-;	bsf		leftbind
-;	WIN_LEFT	.100
-;	movff	temp6,win_top
-;	movff	temp6,hi						; copy for PLED_decoplan_bargraph
-;;	call	PLED_SetRow						; Set Row
-;
-;
-;	movff	POSTINC1,lo		; Get Depth
-;	movf	lo,w
-;
-;	lfsr	FSR2,letter	
-;;	btfsc	STATUS,Z						; =0
-;;	goto	PLED_decoplan_delete			; Yes, quit display		
-;	output_8								; outputs into Postinc2!
-;	movlw	'm'
-;	movwf	POSTINC2
-;	call	word_processor	
-;	WIN_LEFT	.140
-;	movff	temp6,win_top
-;
-;	movff	POSTINC1,lo		; Get length for this stop
-;
-;	lfsr	FSR2,letter		
-;	output_99x								; outputs into Postinc2!
-;	movlw	d'39'							;"'"
-;	movwf	POSTINC2
-;	call	word_processor	
-;;	call	PLED_decoplan_bargraph			; draws a box representing the decotime (stored in lo...) for this depth
-;	return
-;
-;
-;
-;;	movlw	.043
-;;	movwf	temp5
-;;	movlw	.48	+ .8
-;;	movwf	temp6
-;;	movff	char_O_GF_low_pointer,wait_temp
-;;
-;;PLED_MultiGF_loop:
-;;	decfsz	wait_temp,F
-;;	bra		PLED_MulitGF_nextentry
-;;
-;;	bra		PLED_MultiGF_calc_tissue_counter
-;;PLED_MGF_lp_calc_tis_counter:
-;;
-;;PLED_MGF_lp_clear_rem_space:
-;;	lfsr	FSR2,letter	
-;;	movlw	' '
-;;	movwf	POSTINC2
-;;	movlw	' '
-;;	movwf	POSTINC2
-;;	movlw	' '
-;;	movwf	POSTINC2
-;;	movlw	' '
-;;	movwf	POSTINC2
-;;	movlw	' '
-;;	movwf	POSTINC2
-;;	movlw	' '
-;;	movwf	POSTINC2
-;;	movlw	.8
-;;	subwf	temp6,F
-;;	bnz		PLED_MultiGF_column_ok_space
-;;	movlw	.21
-;;	subwf	temp5,F
-;;	bc		PLED_MultiGF_new_row_space
-;;		return
-;;PLED_MultiGF_new_row_space:
-;;	movlw	.48
-;;	movwf	temp6
-;;PLED_MultiGF_column_ok_space:
-;;	movf	temp5,W
-;;	call	PLED_SetColumn
-;;	movlw	.8
-;;	subwf	temp6,W
-;;	call	PLED_SetRow
-;;	call	word_processor
-;;	bra		PLED_MGF_lp_clear_rem_space
-;;
-;;PLED_MulitGF_nextentry:
-;;	lfsr	FSR2,letter	
-;;	movff	wait_temp,lo				; pointer to meter
-;;	movf	lo,W
-;;	rlncf	lo,F
-;;	addwf	lo,F
-;;	decfsz	wait_temp,W
-;;		bra		PLED_MGF_skip_last_deco2 	
-;;	movff	char_I_depth_last_deco,lo
-;;PLED_MGF_skip_last_deco2:
-;;	output_99
-;;	movlw	0x02
-;;	movwf	POSTINC2
-;;	movlw	':'
-;;	movwf	POSTINC2
-;;	movlw	0x02
-;;	movwf	POSTINC2
-;;	lfsr	FSR0,0x250
-;;	movf	wait_temp,W
-;;	movff	PLUSW0,lo
-;;	movlw	d'10'			; gray code
-;;	tstfsz	lo
-;;	movlw	 b'00001111'	; gray code
-;;	movwf	grayvalue
-;;	bsf		leftbind
-;;	output_99
-;;	bcf		leftbind
-;;	movlw	' '
-;;	movwf	POSTINC2
-;;	movlw	.8
-;;	subwf	temp6,F
-;;	bnz		PLED_MultiGF_column_ok
-;;	movlw	.21
-;;	subwf	temp5,F
-;;	bc		PLED_MultiGF_new_row
-;;		return
-;;PLED_MultiGF_new_row:
-;;	movlw	.48
-;;	movwf	temp6
-;;PLED_MultiGF_column_ok:
-;;	movf	temp5,W
-;;	call	PLED_SetColumn
-;;	movlw	.8
-;;	subwf	temp6,W
-;;	call	PLED_SetRow
-;;	call	word_processor
-;;	movlw	 b'00001111'	; gray code
-;;	movwf	grayvalue
-;;	bra		PLED_MultiGF_loop
-;;
-;;
-;;PLED_MultiGF_depth:
-;;	lfsr	FSR2,letter
-;;	movff	rel_pressure+0,lo
-;;	movff	rel_pressure+1,hi
-;;	call	adjust_depth_with_salinity			; computes salinity setting into lo:hi [mBar]
-;;	bsf		leftbind
-;;	bsf		ignore_digit5		; do not display 1cm depth
-;;	output_16dp	d'3'
-;;	bcf		leftbind
-;;	movlw	.004
-;;	movwf	wait_temp
-;;	movff	wait_temp,0x086	; left
-;;	movlw	.049
-;;	movwf	wait_temp
-;;	movff	wait_temp,0x087	; top
-;;	movlw	.015
-;;	movwf	wait_temp
-;;	movff	wait_temp,0x088	; heightmax
-;;	movff	dd_oled_brightness_offset,wait_temp
-;;	movff	wait_temp,0x089	; oled_brightness_offset_const
-;;	call	main_DD2_write_incon24
-;;	movlb	b'00000001'				; Back to Bank1
-;;	return
-;;
-;;PLED_MultiGF_deco_depth_actual:
-;;	lfsr	FSR2,letter	
-;;	movff	char_O_actual_pointer,lo				; pointer to meter
-;;	movf	lo,W
-;;	rlncf	lo,F
-;;	addwf	lo,F
-;;	movff	char_O_actual_pointer,wait_temp			; test last_deco
-;;	decfsz	wait_temp,F
-;;		bra		PLED_MGF_skip_last_deco_depth 	
-;;	movff	char_I_depth_last_deco,lo
-;;PLED_MGF_skip_last_deco_depth:
-;;	output_99
-;;	movlw	'm'
-;;	movwf	POSTINC2
-;;	movlw	' '
-;;	movwf	POSTINC2
-;;	movlw	.23
-;;	call	PLED_SetColumn
-;;	movlw	.57
-;;	call	PLED_SetRow
-;;	goto	word_processor
-;;	
-;;PLED_MultiGF_gradient:
-;;	lfsr	FSR2,letter
-;;	movff	char_O_gradient_factor,lo
-;;	bsf		leftbind
-;;	output_99
-;;	bcf		leftbind
-;;	movlw	'%'
-;;	movwf	POSTINC2
-;;	movlw	' '
-;;	movwf	POSTINC2
-;;	movlw	.23
-;;	call	PLED_SetColumn
-;;	movlw	.49
-;;	call	PLED_SetRow
-;;	goto	word_processor
-;;
-;;PLED_MultiGF_time_at_deco:
-;;	movlw	.045
-;;	movwf	wait_temp
-;;	movff	wait_temp,0x086	; left
-;;	movlw	.050
-;;	movwf	wait_temp
-;;	movff	wait_temp,0x087	; top
-;;	movlw	.015
-;;	movwf	wait_temp
-;;	movff	wait_temp,0x088	; heightmax
-;;	movff	dd_oled_brightness_offset,wait_temp
-;;	movff	wait_temp,0x089	; oled_brightness_offset_const
-;;	lfsr	FSR2,letter
-;;	lfsr	FSR0,0x250
-;;	movff	char_O_actual_pointer,lo
-;;	movf	lo,W
-;;	movff	PLUSW0,lo
-;;	bsf		leftbind
-;;	output_99
-;;	movlw	'<'				; Textmapping to "'"!
-;;	movwf	POSTINC2
-;;	call	main_DD2_write_incon24
-;;	movlb	b'00000001'				; Back to Bank1
-;;	return
-;;
-;;PLED_MultiGF_clear_behind_depth:
-;;	movlw	0x01
-;;	movwf	wait_temp
-;;	movff	wait_temp,width	; font select left side before decpoint
-;;	movff	wait_temp,box_temp+5	; font select right side decpoint and after
-;;	movlw	.063
-;;	movwf	wait_temp
-;;	movff	wait_temp,box_temp+1	; bottom row 
-;;	movlw	.020
-;;	movwf	wait_temp
-;;	movff	wait_temp,box_temp+2	; start column
-;;	movlw	.063
-;;	movwf	wait_temp
-;;	movff	wait_temp,box_temp+3	; end column
-;;	movlw	.051	
-;;	movwf	wait_temp
-;;	movff	wait_temp,box_temp+4	; start column dec point
-;;	lfsr	FSR2,letter
-;;;	call	DD_Main
-;;	return
-;;;	movlw	0x31
-;;	movwf	wait_temp
-;;	movff	wait_temp,box_temp+1	; row
-;;	movlw	0x00
-;;	movwf	wait_temp
-;;	movff	wait_temp,box_temp+0	; color
-;;	call	DD_hline
-;;	return
-;;
-;
-;;PLED_MulitGF_nextentry_tissues:
-;;	lfsr	FSR2,letter
-;;	lfsr	FSR0,0x200
-;;	rlncf	wait_temp,W
-;;	movff	PLUSW0,lo
-;;	addlw	.001
-;;	movff	PLUSW0,hi
-;;	output_16
-;;	movlw	' '
-;;	movwf	POSTINC2
-;;	movlw	.8
-;;	subwf	temp6,F
-;;	bnz		PLED_MultiGF_column_ok_tissues
-;;	movlw	 b'00001111'	; gray code
-;;	movwf	grayvalue
-;;	movlw	.21
-;;	subwf	temp5,F
-;;	bc		PLED_MultiGF_new_row_tissues
-;;		return
-;;PLED_MultiGF_new_row_tissues:
-;;	movlw	.48
-;;	movwf	temp6
-;;PLED_MultiGF_column_ok_tissues:
-;;	movf	temp5,W
-;;	call	PLED_SetColumn
-;;	movlw	.8
-;;	subwf	temp6,W
-;;	call	PLED_SetRow
-;;	call	word_processor
-;;	bra		PLED_MultiGF_loop_tissues
-;;
-;
-;;PLED_MultiGF_uart_out:
-;;	call	rs232_wait_tx
-;;; header ff ff
-;;	movlw	0xff
-;;	movwf	wait_temp
-;;	movff	wait_temp,TXREG
-;;	call	rs232_wait_tx
-;;	movff	wait_temp,TXREG
-;;	call	rs232_wait_tx
-;;; 2sec counter
-;;	movff	0x290,TXREG
-;;	call	rs232_wait_tx
-;;	movff	0x291,TXREG
-;;	call	rs232_wait_tx
-;;;	movff	,TXREG
-;;; pres_respiration
-;;	movff	amb_pressure,TXREG
-;;	call	rs232_wait_tx
-;;	movff	amb_pressure+1,TXREG
-;;	call	rs232_wait_tx
-;;; pres_surface
-;;	movff	last_surfpressure,TXREG
-;;	call	rs232_wait_tx
-;;	movff	last_surfpressure+1,TXREG
-;;	call	rs232_wait_tx
-;;; tissue pres
-;;	lfsr	FSR0,0x200
-;;	movlw	.64
-;;	movwf	wait_temp
-;;pled_multigraf_tissue_uart_loop:
-;;	movff	POSTINC0,TXREG
-;;	call	rs232_wait_tx
-;;	decfsz	wait_temp
-;;		bra	pled_multigraf_tissue_uart_loop
-;;; movff	,TXREG
-;;; call	rs232_wait_tx
-;;	return
-;
-;;PLED_MulitGF_nextentry_debug:
-;;	lfsr	FSR2,letter
-;;	movff	wait_temp,lo		
-;;	output_99
-;;	movlw	0x02
-;;	movwf	POSTINC2
-;;	movlw	':'
-;;	movwf	POSTINC2
-;;	movlw	0x02
-;;	movwf	POSTINC2
-;;	lfsr	FSR0,0x300
-;;	movf	wait_temp,W			
-;;	movff	PLUSW0,lo
-;;	output_99
-;;	movlw	' '
-;;	movwf	POSTINC2
-;;	movlw	.8
-;;	subwf	temp6,F
-;;	bnz		PLED_MultiGF_column_ok_debug
-;;	movlw	 b'00001111'	; gray code
-;;	movwf	grayvalue
-;;	movlw	.21
-;;	subwf	temp5,F
-;;	bc		PLED_MultiGF_new_row_debug
-;;		return
-;;PLED_MultiGF_new_row_debug:
-;;	movlw	.48
-;;	movwf	temp6
-;;PLED_MultiGF_column_ok_debug:
-;;	movf	temp5,W
-;;	call	PLED_SetColumn
-;;	movlw	.8
-;;	subwf	temp6,W
-;;	call	PLED_SetRow
-;;	call	word_processor
-;;	bra		PLED_MultiGF_loop_debug
-;
-;;PLED_MultiGF_calc_tissue_counter:
-;;	movlw	d'8'	; gray code
-;;	movwf	grayvalue
-;;	movff	0x290,lo		
-;;	movff	0x291,hi		
-;;	movlw	'('
-;;	movwf	POSTINC2
-;;	output_16
-;;	movlw	')'
-;;	movwf	POSTINC2
-;;	movlw	.8
-;;	subwf	temp6,F
-;;	bnz		PLED_MGF_ok_col_calc_tis_cter
-;;	movlw	 b'00001111'	; gray code
-;;	movwf	grayvalue
-;;	movlw	.21
-;;	subwf	temp5,F
-;;	bc		PLED_MGF_n_row_calc_tis_cter
-;;		return
-;;PLED_MGF_n_row_calc_tis_cter:
-;;	movlw	.48
-;;	movwf	temp6
-;;PLED_MGF_ok_col_calc_tis_cter:
-;;	movf	temp5,W
-;;	call	PLED_SetColumn
-;;	movlw	.8
-;;	subwf	temp6,W
-;;	call	PLED_SetRow
-;;	call	word_processor
-;;	bra		PLED_MGF_lp_calc_tis_counter
-;;
-;
-;;PLED_debug_deko:
-;;	movlw	.009
-;;	call	PLED_SetColumn
-;;	movlw	.008
-;;	call	PLED_SetRow
-;;	lfsr	FSR2,letter
-;;	movff	char_O_deco_status,lo
-;;	output_8
-;;	call	word_processor
-;;
-;;	movlw	.009
-;;	call	PLED_SetColumn
-;;	movlw	.016
-;;	call	PLED_SetRow
-;;	lfsr	FSR2,letter
-;;	movff	char_O_array_decodepth+0,lo
-;;	output_8
-;;	call	word_processor
-;;	return
-;;
-;
 PLED_simdata_screen:			;Display Pre-Dive Screen
 	; List active gases/Setpoints
 	btfsc	FLAG_const_ppO2_mode		; in ppO2 mode?