comparison src/logbook.asm @ 89:c34516c99ca8

BUGFIX: No average depth for end-of-dive portion (<1m) BUGFIX: Show "CC Diluents" in logbook instead of OC Gas List
author heinrichsweikamp
date Tue, 15 Apr 2014 12:16:28 +0200
parents 00636132cca6
children 24b3fd59e61f
comparison
equal deleted inserted replaced
88:2a992aba61ef 89:c34516c99ca8
1448 lfsr FSR2,buffer 1448 lfsr FSR2,buffer
1449 bsf leftbind 1449 bsf leftbind
1450 output_16 ; Air pressure before dive 1450 output_16 ; Air pressure before dive
1451 STRCAT_TEXT_PRINT tMBAR 1451 STRCAT_TEXT_PRINT tMBAR
1452 1452
1453 ; OC Gas List 1453 ; OC/CC Gas List
1454 LOG_POINT_TO log_gas1 1454 LOG_POINT_TO log_divemode
1455 call ext_flash_byte_read_plus ; 0=OC, 1=CC, 2=Gauge, 3=Apnea into temp1
1455 WIN_TINY log2_title_column,log2_title_row1 1456 WIN_TINY log2_title_column,log2_title_row1
1456 WIN_COLOR color_greenish 1457 WIN_COLOR color_greenish
1458 movlw .1
1459 cpfseq temp1 ;=CC?
1460 bra logbook_gaslist_oc
1461 STRCPY_TEXT_PRINT tGaslistCC
1462 bra logbook_gaslist_common
1463 logbook_gaslist_oc:
1457 STRCPY_TEXT_PRINT tGaslist 1464 STRCPY_TEXT_PRINT tGaslist
1465 logbook_gaslist_common:
1466 LOG_POINT_TO log_gas1
1458 WIN_FRAME_STD log2_title_row1-2, log2_gas_row5+.15, log2_title_column-2, .159 ; Top, Bottom, Left, Right 1467 WIN_FRAME_STD log2_title_row1-2, log2_gas_row5+.15, log2_title_column-2, .159 ; Top, Bottom, Left, Right
1459 bcf leftbind 1468 bcf leftbind
1460 movlw color_white ; Color for Gas 1 1469 movlw color_white ; Color for Gas 1
1461 call TFT_set_color ; Set Color... 1470 call TFT_set_color ; Set Color...
1462 WIN_TINY log2_gas_column, log2_gas_row1 1471 WIN_TINY log2_gas_column, log2_gas_row1