Mercurial > public > hwos_code

diff src/tft_outputs.asm @ 147:fdd4e30846ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some cleanup
author heinrichsweikamp
date Wed, 06 Aug 2014 11:59:04 +0200
parents e3ac5b2021bc
children 5cb177f0948a
line wrap: on
line diff
--- a/src/tft_outputs.asm	Tue Aug 05 17:11:48 2014 +0200
+++ b/src/tft_outputs.asm	Wed Aug 06 11:59:04 2014 +0200
@@ -1243,25 +1243,6 @@
     call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
     output_16
 	STRCAT_PRINT "  "
-
-;    WIN_TINY	.20,.86
-;    STRCPY  "DX:"
-;    movff   compass_DX_f+0,lo
-;    movff   compass_DX_f+1,hi
-;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;    output_16
-;    STRCAT  ", DY:"
-;    movff   compass_DY_f+0,lo
-;    movff   compass_DY_f+1,hi
-;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;    output_16
-;    STRCAT  ", DZ:"
-;    movff   compass_DZ_f+0,lo
-;    movff   compass_DZ_f+1,hi
-;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;    output_16
-;    STRCAT_PRINT  "     "
-
     return
 
     global  TFT_show_timeout_testmode
@@ -1294,416 +1275,6 @@
     STRCAT_PRINT "!"
     return
 
-;	global	TFT_update_raw_data
-;TFT_update_raw_data:
-;    call	TFT_standard_color
-;	WIN_TINY	.0,.0
-;	STRCPY  "pres:"
-;    SAFE_2BYTE_COPY amb_pressure, lo
-;    movlw   .5  ;>1280mbar
-;    cpfslt  hi
-;    call	TFT_warnings_color
-;	bsf		leftbind
-;	output_16
-;	STRCAT_PRINT "mbar "
-;	WIN_TINY	.80,.0
-;	STRCPY  "temp:"
-;    SAFE_2BYTE_COPY temperature, lo
-;	call	TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;	movlw	d'3'
-;	movwf	ignore_digits
-;	output_16dp	d'2'					; temperature
-;	STRCAT_PRINT "°C "
-;
-;    call	TFT_standard_color
-;	call	get_battery_voltage			; get battery voltage
-;	WIN_TINY	.0,.18
-;	STRCPY  "AN06:"
-;	movff	ADRESL,lo
-;	movff	ADRESH,hi
-;	output_16
-;	STRCAT_PRINT ""
-;	WIN_TINY	.80,.18
-;	STRCPY  "BATT:"
-;	movff	batt_voltage+0,lo
-;	movff	batt_voltage+1,hi
-;	output_16
-;	STRCAT_PRINT "mV "
-;
-;	call	get_ambient_level			; get ambient light level
-;	WIN_TINY	.0,.36
-;	STRCPY  "AN07:"
-;	movff	ADRESL,lo
-;	movff	ADRESH,hi
-;	output_16
-;	STRCAT_PRINT " "
-;	WIN_TINY	.80,.36
-;	STRCPY  "Amb.:"
-;	movff	ambient_light+0,lo
-;	movff	ambient_light+1,hi
-;    output_16
-;    STRCAT_PRINT " "
-;
-;;	call	get_rssi_level              ; get rssi level
-;;	WIN_TINY	.0,.54
-;;	STRCPY  "AN17:"
-;;	movff	ADRESL,lo
-;;	movff	ADRESH,hi
-;;	output_16
-;;	STRCAT_PRINT " "
-;;	WIN_TINY	.80,.54
-;;	STRCPY  "RSSI:"
-;;	movff	rssi_value,lo
-;;    output_8
-;;	STRCAT_PRINT " "
-;
-;	WIN_TINY	.0,.72
-;	STRCPY  "HUD_Status:"
-;	movff	hud_status_byte,lo
-;	output_8
-;	STRCAT_PRINT "  "
-;	WIN_TINY	.80,.72
-;	STRCPY  "HUD_BATT:"
-;	movff	hud_battery_mv+0,lo
-;	movff	hud_battery_mv+1,hi
-;	output_16
-;	STRCAT_PRINT "mV   "
-;
-;;    call    disable_ir
-;;    bsf     mcp_power
-;;    btfss   mcp_power
-;;    bra $-4
-;;    call    get_analog_inputs
-;	WIN_TINY	.0,.90
-;	STRCPY  "Sens1.:"
-;    movff	o2_mv_sensor1+0,lo
-;    movff	o2_mv_sensor1+1,hi
-;    output_16dp d'4'
-;	STRCAT_PRINT "mV   "
-;	WIN_TINY	.80,.90
-;	STRCPY  "Sens2:"
-;	movff	o2_mv_sensor2+0,lo
-;	movff	o2_mv_sensor2+1,hi
-;	output_16dp d'4'
-;	STRCAT_PRINT "mV   "
-;
-;	WIN_TINY	.0,.108
-;	STRCPY  "Sens3.:"
-;    movff	o2_mv_sensor3+0,lo
-;    movff	o2_mv_sensor3+1,hi
-;    output_16dp d'4'
-;	STRCAT_PRINT "mV   "
-;	WIN_TINY	.80,.108            ; Space
-;
-;    WIN_TINY	.0,.128
-;    STRCPY  "ccDX:"
-;    movff	compass_DX_f+0,lo           ; Display calibrated data
-;    movff   compass_CX_f+0,WREG         ; by substracting compass_CX_f
-;    subwf   lo,F                        ; lo := lo - W
-;    movff	compass_DX_f+1,hi
-;    movff   compass_CX_f+1,WREG
-;    subwfb  hi,F
-;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;    output_16
-;    STRCAT_PRINT "    "
-;    WIN_TINY	.80,.128
-;    STRCPY  "ccDY:"
-;    movff	compass_DY_f+0,lo
-;    movff   compass_CY_f+0,WREG
-;    subwf   lo,F
-;    movff	compass_DY_f+1,hi
-;    movff   compass_CY_f+1,WREG
-;    subwfb  hi,F
-;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;    output_16
-;    STRCAT_PRINT "    "
-;    WIN_TINY	.0,.146
-;    STRCPY  "ccDZ:"
-;    movff	compass_DZ_f+0,lo
-;    movff   compass_CZ_f+0,WREG
-;    subwf   lo,F
-;    movff	compass_DZ_f+1,hi
-;    movff   compass_CZ_f+1,WREG
-;    subwfb  hi,F
-;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;    output_16
-;	STRCAT_PRINT "    "
-;	WIN_TINY	.80,.146                ; Space
-;
-;	WIN_TINY	.0,.164
-;	STRCPY  "AcDX:"
-;    movff	accel_DX_f+0,lo
-;    movff	accel_DX_f+1,hi
-;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;    output_16
-;	STRCAT_PRINT "mg   "
-;	WIN_TINY	.80,.164
-;	STRCPY  "AcDY:"
-;    movff	accel_DY_f+0,lo
-;    movff	accel_DY_f+1,hi
-;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;    output_16
-;	STRCAT_PRINT "mg   "
-;	WIN_TINY	.0,.182
-;	STRCPY  "AcDZ:"
-;    movff	accel_DZ_f+0,lo
-;    movff	accel_DZ_f+1,hi
-;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;    output_16
-;	STRCAT_PRINT "mg   "
-;
-;	WIN_TINY	.80,.182
-;    STRCPY  "Head:"
-;    movff	compass_heading+0,lo
-;    movff	compass_heading+1,hi
-;
-;    btfsc   hi,7                        ; Uncalibrated compass ?
-;    bra     TFT_update_compass_1
-;
-;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;    output_16
-;    STRCAT_PRINT "   "
-;    bra     TFT_update_compass_2
-;
-;TFT_update_compass_1:
-;    STRCAT_PRINT "---"
-;
-;TFT_update_compass_2:
-;    WIN_TINY	.0,.200
-;    STRCPY  "calX:"
-;    movff   compass_CX_f+0,lo
-;    movff   compass_CX_f+1,hi
-;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;    output_16
-;    STRCAT  ", "
-;    movff   compass_CY_f+0,lo
-;    movff   compass_CY_f+1,hi
-;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;    output_16
-;    STRCAT  ", "
-;    movff   compass_CZ_f+0,lo
-;    movff   compass_CZ_f+1,hi
-;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;    output_16
-;    STRCAT_PRINT  "     "
-;
-;    WIN_TINY    .0,.218
-;    STRCPY  "Roll:"
-;    movff   compass_roll+0,lo
-;    movff   compass_roll+1,hi
-;    call    TFT_convert_signed_16bit
-;    output_16
-;    STRCAT_PRINT "   "
-;
-;    WIN_TINY    .80, .218
-;    STRCPY  "Pitch:"
-;    movff   compass_pitch+0,lo
-;    movff   compass_pitch+1,hi
-;    call    TFT_convert_signed_16bit
-;    output_16
-;    STRCAT_PRINT  "     "
-;
-;    ;   call    TFT_serial
-;    bcf     leftbind
-;    return
-;
-;	global	TFT_update_raw_data2
-;TFT_update_raw_data2:
-;    call	TFT_standard_color
-;	WIN_TINY	.0,.0
-;	STRCPY  "pres:"
-;    SAFE_2BYTE_COPY amb_pressure, lo
-;    movlw   .5  ;>1280mbar
-;    cpfslt  hi
-;    call	TFT_warnings_color
-;	bsf		leftbind
-;	output_16
-;	STRCAT_PRINT "mbar "
-;	WIN_TINY	.80,.0
-;	STRCPY  "temp:"
-;    SAFE_2BYTE_COPY temperature, lo
-;	call	TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;	movlw	d'3'
-;	movwf	ignore_digits
-;	output_16dp	d'2'					; temperature
-;	STRCAT_PRINT "°C "
-;
-;    call	TFT_standard_color
-;	WIN_TINY	.0,.18
-;	STRCPY  "D1:"
-;	movff	D1+0,lo
-;	movff	D1+1,hi
-;	output_16
-;	STRCAT_PRINT ""
-;	WIN_TINY	.80,.18
-;	STRCPY  "D2:"
-;	movff	D2+0,lo
-;	movff	D2+1,hi
-;	output_16
-;	STRCAT_PRINT ""
-;
-;    ; C1-C6
-;	WIN_TINY	.0,.36
-;	STRCPY  "C1:"
-;	movff	C1+0,lo
-;	movff	C1+1,hi
-;	output_16
-;	STRCAT_PRINT ""
-;	WIN_TINY	.80,.36
-;	STRCPY  "C2:"
-;	movff	C2+0,lo
-;	movff	C2+1,hi
-;    output_16
-;    STRCAT_PRINT ""
-;
-;	WIN_TINY	.0,.54
-;	STRCPY  "C3:"
-;	movff	C3+0,lo
-;	movff	C3+1,hi
-;	output_16
-;	STRCAT_PRINT ""
-;	WIN_TINY	.80,.54
-;	STRCPY  "C4:"
-;	movff	C4+0,lo
-;	movff	C4+1,hi
-;	output_16
-;	STRCAT_PRINT ""
-;
-;	WIN_TINY	.0,.72
-;	STRCPY  "C5:"
-;	movff	C5+0,lo
-;	movff	C5+1,hi
-;	output_16
-;	STRCAT_PRINT ""
-;	WIN_TINY	.80,.72
-;	STRCPY  "C6:"
-;	movff	C6+0,lo
-;	movff	C6+1,hi
-;	output_16
-;	STRCAT_PRINT ""
-;
-;;	WIN_TINY	.0,.90
-;;	STRCPY  "Sens1.:"
-;;    movff	o2_mv_sensor1+0,lo
-;;    movff	o2_mv_sensor1+1,hi
-;;    output_16dp d'4'
-;;	STRCAT_PRINT "mV   "
-;;	WIN_TINY	.80,.90
-;;	STRCPY  "Sens2:"
-;;	movff	o2_mv_sensor2+0,lo
-;;	movff	o2_mv_sensor2+1,hi
-;;	output_16dp d'4'
-;;	STRCAT_PRINT "mV   "
-;;
-;;	WIN_TINY	.0,.108
-;;	STRCPY  "Sens3.:"
-;;    movff	o2_mv_sensor3+0,lo
-;;    movff	o2_mv_sensor3+1,hi
-;;    output_16dp d'4'
-;;	STRCAT_PRINT "mV   "
-;;	WIN_TINY	.80,.108            ; Space
-;;
-;;    WIN_TINY	.0,.128
-;;    STRCPY  "ccDX:"
-;;    movff	compass_DX_f+0,lo           ; Display calibrated data
-;;    movff   compass_CX_f+0,WREG         ; by substracting compass_CX_f
-;;    subwf   lo,F                        ; lo := lo - W
-;;    movff	compass_DX_f+1,hi
-;;    movff   compass_CX_f+1,WREG
-;;    subwfb  hi,F
-;;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;;    output_16
-;;    STRCAT_PRINT "    "
-;;    WIN_TINY	.80,.128
-;;    STRCPY  "ccDY:"
-;;    movff	compass_DY_f+0,lo
-;;    movff   compass_CY_f+0,WREG
-;;    subwf   lo,F
-;;    movff	compass_DY_f+1,hi
-;;    movff   compass_CY_f+1,WREG
-;;    subwfb  hi,F
-;;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;;    output_16
-;;    STRCAT_PRINT "    "
-;;    WIN_TINY	.0,.146
-;;    STRCPY  "ccDZ:"
-;;    movff	compass_DZ_f+0,lo
-;;    movff   compass_CZ_f+0,WREG
-;;    subwf   lo,F
-;;    movff	compass_DZ_f+1,hi
-;;    movff   compass_CZ_f+1,WREG
-;;    subwfb  hi,F
-;;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;;    output_16
-;;	STRCAT_PRINT "    "
-;;	WIN_TINY	.80,.146                ; Space
-;;
-;;	WIN_TINY	.0,.164
-;;	STRCPY  "AcDX:"
-;;    movff	accel_DX_f+0,lo
-;;    movff	accel_DX_f+1,hi
-;;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;;    output_16
-;;	STRCAT_PRINT "mg   "
-;;	WIN_TINY	.80,.164
-;;	STRCPY  "AcDY:"
-;;    movff	accel_DY_f+0,lo
-;;    movff	accel_DY_f+1,hi
-;;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;;    output_16
-;;	STRCAT_PRINT "mg   "
-;;	WIN_TINY	.0,.182
-;;	STRCPY  "AcDZ:"
-;;    movff	accel_DZ_f+0,lo
-;;    movff	accel_DZ_f+1,hi
-;;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;;    output_16
-;;	STRCAT_PRINT "mg   "
-;;
-;;	WIN_TINY	.80,.182
-;;    STRCPY  "Head:"
-;;    movff	compass_heading+0,lo
-;;    movff	compass_heading+1,hi
-;;
-;;    WIN_TINY	.0,.200
-;;    STRCPY  "calX:"
-;;    movff   compass_CX_f+0,lo
-;;    movff   compass_CX_f+1,hi
-;;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;;    output_16
-;;    STRCAT  ", "
-;;    movff   compass_CY_f+0,lo
-;;    movff   compass_CY_f+1,hi
-;;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;;    output_16
-;;    STRCAT  ", "
-;;    movff   compass_CZ_f+0,lo
-;;    movff   compass_CZ_f+1,hi
-;;    call    TFT_convert_signed_16bit	; converts lo:hi into signed-short and adds '-' to POSTINC2 if required
-;;    output_16
-;;    STRCAT_PRINT  "     "
-;;
-;;    WIN_TINY    .0,.218
-;;    STRCPY  "Roll:"
-;;    movff   compass_roll+0,lo
-;;    movff   compass_roll+1,hi
-;;    call    TFT_convert_signed_16bit
-;;    output_16
-;;    STRCAT_PRINT "   "
-;;
-;;    WIN_TINY    .80, .218
-;;    STRCPY  "Pitch:"
-;;    movff   compass_pitch+0,lo
-;;    movff   compass_pitch+1,hi
-;;    call    TFT_convert_signed_16bit
-;;    output_16
-;;    STRCAT_PRINT  "     "
-;
-;    call    TFT_serial
-;    bcf     leftbind
-;    return
-;
-
     global  TFT_surface_decosettings    ; Show all deco settings
 TFT_surface_decosettings:
    ; Deco Mode