comparison code_part1/OSTC_code_asm_part1/definitions.asm @ 340:ecbbbd423e86

BUGFIX save negativ temperatures in logbook (bbbug #6) BUGFIX temperature & amb_pressure averaging done in private variable. BUGFIX Signed averaging of temperature.
author JeanDo
date Fri, 20 May 2011 00:39:05 +0200
parents 8b347e0eae26
children 797e2ac42d24
comparison
equal deleted inserted replaced
339:cb77d1fa4535 340:ecbbbd423e86
186 186
187 ext_ee_temp1 res 1 ; External EEPROM Temp 1 used in I2C EEPROM 187 ext_ee_temp1 res 1 ; External EEPROM Temp 1 used in I2C EEPROM
188 ext_ee_temp2 res 1 ; External EEPROM Temp 2 used in I2C EEPROM 188 ext_ee_temp2 res 1 ; External EEPROM Temp 2 used in I2C EEPROM
189 189
190 isr1_temp res 1 ; ISR temp variables 190 isr1_temp res 1 ; ISR temp variables
191 isr3_temp res 2
192 191
193 timer1int_counter1 res 1 ;Timer 1 counter 192 timer1int_counter1 res 1 ;Timer 1 counter
194 timer1int_counter2 res 1 ;Timer 1 counter 193 timer1int_counter2 res 1 ;Timer 1 counter
195 194
196 uart1_temp res 1 ;RS232 temp variables 195 uart1_temp res 1 ;RS232 temp variables
233 xdT res 2 ; Tmp for temperature compensation (in ISR) 232 xdT res 2 ; Tmp for temperature compensation (in ISR)
234 xdT2 res 2 233 xdT2 res 2
235 OFF res 2 234 OFF res 2
236 SENS res 2 235 SENS res 2
237 236
237 amb_pressure_avg res 2 ; ambient pressure summing buffer[mBar]
238 amb_pressure res 2 ; ambient pressure [mBar] 238 amb_pressure res 2 ; ambient pressure [mBar]
239 rel_pressure res 2 ; amb_pressure - surface pressure [mBar] 239 rel_pressure res 2 ; amb_pressure - surface pressure [mBar]
240 max_pressure res 2 ; Max. pressure for the dive [mBar] 240 max_pressure res 2 ; Max. pressure for the dive [mBar]
241 avr_rel_pressure res 2 ; Average rel. pressure (Average depth) for the dive [mBar], Resettable 241 avr_rel_pressure res 2 ; Average rel. pressure (Average depth) for the dive [mBar], Resettable
242 avr_rel_pressure_total res 2 ; Average rel. pressure (Average depth) for the dive [mBar], Non-Resettable 242 avr_rel_pressure_total res 2 ; Average rel. pressure (Average depth) for the dive [mBar], Non-Resettable
243 last_pressure res 2 243 last_pressure res 2
244 temperature_avg res 2 ; Temperature summing buffer.
244 temperature res 2 245 temperature res 2
245 last_temperature res 2 246 last_temperature res 2
246 temperature_temp res 2
247 Dx res 2 247 Dx res 2
248 248
249 last_surfpressure res 2 ; Divemode 249 last_surfpressure res 2 ; Divemode
250 last_surfpressure_15min res 2 250 last_surfpressure_15min res 2
251 last_surfpressure_30min res 2 251 last_surfpressure_30min res 2
385 385
386 ; Bank0 flags 386 ; Bank0 flags
387 #DEFINE win_flip_screen win_flags,0 ; 180° rotation of the OLED screen. 387 #DEFINE win_flip_screen win_flags,0 ; 180° rotation of the OLED screen.
388 388
389 ; Flags 389 ; Flags
390 #DEFINE tts_extra_time flag1,0 ; unused 390 #DEFINE tts_extra_time flag1,0 ; Show Futur TTS in customview
391 #DEFINE FLAG_2 flag1,1 ; unused 391 #DEFINE FLAG_2 flag1,1 ; unused
392 #DEFINE pre_zero_flag flag1,2 ; leading zeros 392 #DEFINE pre_zero_flag flag1,2 ; leading zeros
393 #DEFINE neg_flag flag1,3 ; e.g. Sub_16 (sub_c = sub_a - sub_b) 393 #DEFINE neg_flag flag1,3 ; e.g. Sub_16 (sub_c = sub_a - sub_b)
394 #DEFINE FLAG_3 flag1,4 ; unused 394 #DEFINE FLAG_3 flag1,4 ; unused
395 #DEFINE leading_zeros flag1,5 ; display leading zeros? 395 #DEFINE leading_zeros flag1,5 ; display leading zeros?
438 #DEFINE cv_active flag6,1 ;=1: Constant Voltage mode aktive (Charger) 438 #DEFINE cv_active flag6,1 ;=1: Constant Voltage mode aktive (Charger)
439 #DEFINE ignore_digit5 flag6,2 ;=1: ignores digit 5 in valconv 439 #DEFINE ignore_digit5 flag6,2 ;=1: ignores digit 5 in valconv
440 #DEFINE switch_left flag6,3 ;=1: left switch pressed 440 #DEFINE switch_left flag6,3 ;=1: left switch pressed
441 #DEFINE switch_right flag6,4 ;=1: right switch pressed 441 #DEFINE switch_right flag6,4 ;=1: right switch pressed
442 #DEFINE uart_settime flag6,5 ;=1: enter time sync routine 442 #DEFINE uart_settime flag6,5 ;=1: enter time sync routine
443 #DEFINE neg_temp flag6,6 ;=1: temperature below zero 443 #DEFINE FLAG_1 flag6,6 ;=1: unused
444 #DEFINE twosecupdate flag6,7 ;=1: after any two seconds 444 #DEFINE twosecupdate flag6,7 ;=1: after any two seconds
445 445
446 #DEFINE dekostop_active flag7,0 ;=1: in deocompression mode 446 #DEFINE dekostop_active flag7,0 ;=1: in deocompression mode
447 #DEFINE all_dives_shown flag7,1 ;=1: all dives in loogbook shown, abort further scanning 447 #DEFINE all_dives_shown flag7,1 ;=1: all dives in loogbook shown, abort further scanning
448 #DEFINE return_from_profileview flag7,2 ;=1: set cursor to same position again 448 #DEFINE return_from_profileview flag7,2 ;=1: set cursor to same position again