Mercurial > public > hwos_code

changeset 229:e1e5876bd777

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor cleanup
author mh@mh-THINK
date Wed, 18 Feb 2015 23:07:04 +0100
parents b17acfa2e5d9
children f6548e8f06f5
files src/menu_processor.asm src/tft_outputs.asm
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/menu_processor.asm	Thu Feb 05 14:51:24 2015 +0100
+++ b/src/menu_processor.asm	Wed Feb 18 23:07:04 2015 +0100
@@ -22,9 +22,9 @@
 #include "tft_outputs.inc"
 #include "eeprom_rs232.inc"
 #include "adc_lightsensor.inc"
-#include "calibrate.inc"
+
 
-;NOTE: should be idenric in .inc and .asm !
+;NOTE: should be identic in .inc and .asm !
 #define MENU_LINES_MAX  .7              ; Number of lines per screen?
 #define MENU_TITLE_FONT WIN_STD         ; Font should contains lower/UPPER alpha
 #define MENU_LINE_FONT  WIN_SMALL       ; Font should contains lower/UPPER alpha
@@ -335,7 +335,6 @@
         btfss	quarter_second_update   ; 1/4 second?
         bra     menu_line_loop1         ; Not yet...
 
-        call    compute_ppo2			; compute mv_sensorX and ppo2_sensorX arrays
         btfsc   menu_show_sensors2      ; In the "Calibrate" menu?
         call    TFT_menu_calibrate      ; Yes, update mV data
         bcf     quarter_second_update   ; Clear flag
--- a/src/tft_outputs.asm	Thu Feb 05 14:51:24 2015 +0100
+++ b/src/tft_outputs.asm	Wed Feb 18 23:07:04 2015 +0100
@@ -27,6 +27,7 @@
 #include    "customview.inc"
 #include    "i2c.inc"
 #include    "colorschemes.inc"
+#include    "calibrate.inc"
 
 	extern	aa_wordprocessor
 
@@ -1159,6 +1160,7 @@
 
     global  TFT_menu_calibrate
 TFT_menu_calibrate:     ; update mV data in calibration menu
+    call    compute_ppo2			; compute mv_sensorX and ppo2_sensorX arrays
     call    TFT_attention_color         ; show in yellow
     bsf     leftbind
     WIN_SMALL   surf_menu_sensor1_column,surf_menu2_sensor1_row