Mercurial > public > mk2
changeset 451:f6f818edf333
BUGFIX bad first Tp? and ceiling in logbook curves.
* Computing Tp? max during logbook profile reading.
author | JeanDo |
---|---|
date | Thu, 18 Aug 2011 23:33:24 +0200 |
parents | 26e5bb28891d |
children | 05ec97e106da |
files | code_part1/OSTC_code_asm_part1/changelog.txt code_part1/OSTC_code_asm_part1/menu_logbook.asm |
diffstat | 2 files changed, 34 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt Mon Aug 15 10:23:27 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/changelog.txt Thu Aug 18 23:33:24 2011 +0200 @@ -1,3 +1,6 @@ +New in 1.98 beta: +BUGFIX bad first Tp° and ceiling values in logbook curves. + New in 1.97 beta: NEW: Logbook displays ceilings and temperature curve. BUGFIX: Decoplanner accumulates CNS during ascent.
--- a/code_part1/OSTC_code_asm_part1/menu_logbook.asm Mon Aug 15 10:23:27 2011 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_logbook.asm Thu Aug 18 23:33:24 2011 +0200 @@ -35,6 +35,7 @@ logbook_cur_tp:2 ; Current temperature, for drawing profile. logbook_last_tp ; Y of the last item in Tp° curve. logbook_min_tp:2 ; Min temperature, for drawing profile. + logbook_max_tp:2 ; Maximum temperature, for drawing profile. logbook_ceiling ; Current ceiling, for drawing profile. ENDC @@ -620,7 +621,16 @@ movwf logbook_last_tp ; Initialise for Tp° curve too. incf timeout_counter3,W ; Init Column + movlw LOW(-.100) ; Initialize max tp° to -10.0 °C. + movwf logbook_max_tp+0 + movlw HIGH 0xFFFF & (-.100) + movwf logbook_max_tp+1 + setf logbook_cur_tp+0 ; Initialize Tp°, before the first recorded point. + setf logbook_cur_tp+1 + clrf logbook_last_tp ; Also reset previous Y for Tp° + clrf logbook_ceiling ; Ceiling = 0, correct value for no ceiling. + INIT_PIXEL_WROTE timeout_counter3 ; pixel x2 (Also sets standard Color!) profile_display_loop: @@ -673,6 +683,11 @@ movf divisor_temperature,W bz profile_display_skip_temp + movf logbook_cur_tp+0,W ; Did we had already a valid Tp°C record ? + andwf logbook_cur_tp+1,W + incf WREG + bz profile_display_skip_temp ; No: just skip drawing. + movlw LOW((.153*.256)/.370) ; fixed tp° scale: (-2 .. +35°C * scaleé56 )/153pix movwf xB+0 movlw HIGH((.153*.256)/.370) @@ -697,14 +712,15 @@ movwf xC+1 cpfsgt xC+0 movff xC+1,xC+0 - - movlw color_pink call PLED_set_color - movff logbook_last_tp,xC+1 + movf logbook_last_tp,W ; do we have a valid previous value ? + bz profile_display_temp_1 ; No: skip the vertical line. + movwf xC+1 call profile_display_fill ; In this column between this row (xC+0) and the last row (xC+1) +profile_display_temp_1: movff xC+0,logbook_last_tp PIXEL_WRITE timeout_counter3,xC+0 ; Set col(0..159) x row (0..239), put a current color pixel. @@ -1209,6 +1225,18 @@ decf timeout_counter2,F movff divisor_temperature,count_temperature ; Restart counter. + ; Compute Tp° max on the fly... + movff logbook_cur_tp+0,sub_a+0 ; Compare cur_tp > max_tp ? + movff logbook_cur_tp+1,sub_a+1 + movff logbook_max_tp+0,sub_b+0 + movff logbook_max_tp+1,sub_b+1 + call sub16 ; SIGNED sub_a - sub_b + btfsc neg_flag + bra profile_view_get_depth_no_tp + + movff logbook_cur_tp+0,logbook_max_tp+0 + movff logbook_cur_tp+1,logbook_max_tp+1 + ;---- Read deco, if any AND divisor=0 AND bytes available ---------------- profile_view_get_depth_no_tp: movf divisor_deco,W