Mercurial > public > hwos_code
changeset 328:bd7f4c1bdb33 new_screen_layout
Fix: missing attention coloring for standard (static) ascend rate limit
| author | janos_kovacs <kovjanos@gmail.com> |
|---|---|
| date | Sun, 14 Jun 2015 11:06:20 +0200 |
| parents | ca5df826437a |
| children | 0532cac03ccd |
| files | src/hwos.inc src/tft_outputs.asm |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hwos.inc Sun Jun 14 00:16:00 2015 +0200 +++ b/src/hwos.inc Sun Jun 14 11:06:20 2015 +0200 @@ -152,6 +152,7 @@ #DEFINE color_code_cns_high .100 ; [%] #DEFINE color_code_gf_warn_high .101 ; [%] #DEFINE color_code_velocity_warn_high .10 ;[m/min] +#DEFINE color_code_velocity_attn_high .8 ;[m/min] ; Velocity threshold #DEFINE velocity_display_threshold_1 .7 ; [m/min]
--- a/src/tft_outputs.asm Sun Jun 14 00:16:00 2015 +0200 +++ b/src/tft_outputs.asm Sun Jun 14 11:06:20 2015 +0200 @@ -940,12 +940,23 @@ subwf lo,W btfsc STATUS,C bra TFT_velocity_std_warn + bcf STATUS,C + movff divA+0,lo + movlw color_code_velocity_attn_high ; Velocity attn [m/min] + subwf lo,W + btfsc STATUS,C + bra TFT_velocity_std_attn bra TFT_velocity_disp TFT_velocity_std_warn: call TFT_warnings_color ; Set to warning color bsf velocity_warn - ;bsf TFT_velocity_disp + bra TFT_velocity_disp + +TFT_velocity_std_attn: + call TFT_attention_color ; Set to attention color + bsf velocity_attn + ;bra TFT_velocity_disp TFT_velocity_disp: WIN_SMALL dm_velocity_text_column, dm_velocity_text_row