comparison src/logbook.asm @ 549:7c408bfaf2e8

2.26 stable RC1 BUGFIX: O2 Sensor readings were not updated in fixed setpoint mode CHANGE: Minor logbook layout fix
author heinrichsweikamp
date Mon, 25 Sep 2017 19:02:42 +0200
parents d36f9fca10ae
children b7eb98dbd800
comparison
equal deleted inserted replaced
548:abf3cbd5815e 549:7c408bfaf2e8
1788 1788
1789 logbook_page3: ; Show even more info 1789 logbook_page3: ; Show even more info
1790 rcall log_details_header ; Shows number, time/date and basic dive info 1790 rcall log_details_header ; Shows number, time/date and basic dive info
1791 1791
1792 ; OC/CC Gas List 1792 ; OC/CC Gas List
1793 LOG_POINT_TO log_divemode
1794 call ext_flash_byte_read_plus ; 0=OC, 1=CC, 2=Gauge, 3=Apnea into temp1
1795 WIN_SMALL .5,.65
1796 WIN_COLOR color_greenish
1797 STRCPY_TEXT_PRINT tGaslist
1798 bcf leftbind 1793 bcf leftbind
1799 LOG_POINT_TO log_gas1 1794 LOG_POINT_TO log_gas1
1800 movlw color_white ; Color for Gas 1 1795 movlw color_white ; Color for Gas 1
1801 call TFT_set_color ; Set Color... 1796 call TFT_set_color ; Set Color...
1802 WIN_SMALL .5,.90 1797 WIN_SMALL .5,.90
1816 movlw color_cyan ; Color for Gas 5 1811 movlw color_cyan ; Color for Gas 5
1817 call TFT_set_color ; Set Color... 1812 call TFT_set_color ; Set Color...
1818 WIN_SMALL .5,.190 1813 WIN_SMALL .5,.190
1819 rcall log_show_gas_common2 1814 rcall log_show_gas_common2
1820 1815
1816 ; OC/CC Gas List
1817 WIN_SMALL .5,.65
1818 WIN_COLOR color_greenish
1819 LOG_POINT_TO log_divemode
1820 call ext_flash_byte_read_plus ; 0=OC, 1=CC, 2=Gauge, 3=Apnea into temp1
1821 decfsz temp1,w ; =1 (CC)?
1822 bra logbook_page3a
1823 STRCPY_TEXT_PRINT tGaslistCC ; CC
1824 bra logbook_page3b
1825 logbook_page3a:
1826 STRCPY_TEXT_PRINT tGaslist ; OC
1827 logbook_page3b:
1821 movlw color_lightblue 1828 movlw color_lightblue
1822 call TFT_set_color 1829 call TFT_set_color
1823 WIN_FRAME_COLOR16 .63,.220,.2,.90; Top, Bottom, Left, Right 1830 WIN_FRAME_COLOR16 .63,.220,.2,.90; Top, Bottom, Left, Right
1824 1831
1825 rcall logbook_preloop_tasks ; Clear some flags and set to Speed_eco 1832 rcall logbook_preloop_tasks ; Clear some flags and set to Speed_eco