Mercurial > public > mk2
changeset 815:2a0e5d884fc3
BUGFIX: Fix licence in German
BUGFIX: Fix minor layout bug in surface mode
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/MAIN.ASM Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/MAIN.ASM Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2008-2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify @@ -114,7 +114,7 @@ #include aa_fonts.asm ;============================================================================= - MESSG "OSTC - diving computer code, Copyright (C) 2015 HeinrichsWeikamp" + MESSG "OSTC Mk.2, 2N and 2C - diving computer code, Copyright (C) 2015 HeinrichsWeikamp" MESSG "This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the" MESSG "Free Software Foundation, either version 3 of the License, or (at your option) any later version." MESSG "This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY"
--- a/code_part1/OSTC_code_asm_part1/adc_rtc.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/adc_rtc.asm Tue May 12 11:30:35 2015 +0200 @@ -1,4 +1,4 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/changelog.txt Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/changelog.txt Tue May 12 11:30:35 2015 +0200 @@ -1,3 +1,7 @@ +New in 3.04: +Stable Release +BUGFIX: Fix licence in German +BUGFIX: Fix minor layout bug in surface mode New in 3.03: Stable Release
--- a/code_part1/OSTC_code_asm_part1/customview.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/customview.asm Tue May 12 11:30:35 2015 +0200 @@ -1,4 +1,4 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/definitions.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/definitions.asm Tue May 12 11:30:35 2015 +0200 @@ -1,4 +1,4 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modifyn 3 of the License, or @@ -22,16 +22,16 @@ ; ToDo: #DEFINE softwareversion_x d'3' ; Software version XX.YY -#DEFINE softwareversion_y d'03' ; Software version XX.YY +#DEFINE softwareversion_y d'04' ; Software version XX.YY #DEFINE softwareversion_beta 0 ; (and 0 for release) #DEFINE max_custom_number d'73' ; Number of last used custom function ; International extension. Selecting messages source: -#DEFINE ENGLISH ; Use english_text.asm +;#DEFINE ENGLISH ; Use english_text.asm ;#DEFINE FRENCH ; Use french_text.asm -;#DEFINE GERMAN ; Use german_text.asm +#DEFINE GERMAN ; Use german_text.asm ;#DEFINE SPANISH ; Use spanish_text.asm ;#DEFINE RUSSIAN ; Use russian_text.asm ;#DEFINE ITALIAN ; Use italian_text.asm
--- a/code_part1/OSTC_code_asm_part1/display_lowlevel.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/display_lowlevel.asm Tue May 12 11:30:35 2015 +0200 @@ -1,4 +1,4 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2009 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/displaytext.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/displaytext.asm Tue May 12 11:30:35 2015 +0200 @@ -1,4 +1,4 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify @@ -122,7 +122,12 @@ display_text_exit: btfss output_to_postinc_only ; output to postinc only? - goto word_processor + bra display_text_exit2 bcf output_to_postinc_only return + +display_text_exit2: + clrf WREG + movff WREG,letter+.22 + goto word_processor
--- a/code_part1/OSTC_code_asm_part1/divemode.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/divemode.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/divemode_menu.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/divemode_menu.asm Tue May 12 11:30:35 2015 +0200 @@ -1,4 +1,4 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/eeprom_rs232.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/eeprom_rs232.asm Tue May 12 11:30:35 2015 +0200 @@ -1,4 +1,4 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/english_text.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/english_text.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ ;============================================================================= -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/french_text.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/french_text.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ ;============================================================================= -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/german_text.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/german_text.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ ;============================================================================= -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; ; This program is free software: you can redistribute it and/or modify @@ -195,9 +195,9 @@ ; End of function descriptor I ; ;licence: - TCODE .0, .35, "Dieses Programm wird in" ;068 This program is - TCODE .0, .65, "der Hoffnung bereit-" ;069 distributed in the - TCODE .0, .95, "gestellt, dass es nütz-" ;070 hope that it will be + TCODE .0, .35, "Dieses Programm wird" ;068 This program is + TCODE .0, .65, "in der Hoffnung bereit" ;069 distributed in the + TCODE .0, .95, "gestellt, dass es nütz" ;070 hope that it will be TCODE .0, .125, "lich ist, aber OHNE" ;071 useful, but WITHOUT TCODE .0, .155, "JEDE GEWAEHRLEISTUNG," ;072 ANY WARRANTY TCODE .0, .185, "auch keine implizierte" ;073 even the implied
--- a/code_part1/OSTC_code_asm_part1/i2c_eeprom.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/i2c_eeprom.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify ; it under the terms of the GNU General Public License as published by
--- a/code_part1/OSTC_code_asm_part1/interface.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/interface.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/isr.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/isr.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/italian_text.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/italian_text.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ ;============================================================================= -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/math.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/math.asm Tue May 12 11:30:35 2015 +0200 @@ -1,4 +1,4 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/menu.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/menu_battery.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_battery.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/menu_custom.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_custom.asm Tue May 12 11:30:35 2015 +0200 @@ -1,4 +1,4 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/menu_gassetup.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_gassetup.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/menu_logbook.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_logbook.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/menu_ppO2.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_ppO2.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/menu_reset.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_reset.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/menu_settime.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/menu_settime.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/ms5535.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/ms5535.asm Tue May 12 11:30:35 2015 +0200 @@ -1,4 +1,4 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/multilang_text.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/multilang_text.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/outputs.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/outputs.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/russian_text.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/russian_text.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ ;============================================================================= -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/simulator.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/simulator.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/sleepmode.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/sleepmode.asm Tue May 12 11:30:35 2015 +0200 @@ -1,4 +1,4 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify ; it under the terms of the GNU General Public License as published by
--- a/code_part1/OSTC_code_asm_part1/spanish_text.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/spanish_text.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ ;============================================================================= -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/start.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/start.asm Tue May 12 11:30:35 2015 +0200 @@ -1,4 +1,4 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/surfmode.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/surfmode.asm Tue May 12 11:30:35 2015 +0200 @@ -1,4 +1,4 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify @@ -463,8 +463,9 @@ bra timeout_premenu2 ; Skip in Apnoe mode timeout_premenu2: - call update_surf_press ; rewrite serial number + call update_surf_press ; rewrite surf pressure call DISP_serial ; rewrite serial number + call surfcustomview_mask ; rewrite customview clrf timeout_counter3 ; Also clear timeout bcf switch_left ; and debounce switches bcf switch_right
--- a/code_part1/OSTC_code_asm_part1/sync_clock.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/sync_clock.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/temp_extrema.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/temp_extrema.asm Tue May 12 11:30:35 2015 +0200 @@ -1,5 +1,5 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/valconv.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/valconv.asm Tue May 12 11:30:35 2015 +0200 @@ -1,4 +1,4 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_asm_part1/wait.asm Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_asm_part1/wait.asm Tue May 12 11:30:35 2015 +0200 @@ -1,4 +1,4 @@ -; OSTC - diving computer code +; OSTC Mk.2, 2N and 2C - diving computer code ; Copyright (C) 2015 HeinrichsWeikamp GbR ; This program is free software: you can redistribute it and/or modify ; it under the terms of the GNU General Public License as published by
--- a/code_part1/OSTC_code_c_part2/p2_deco.c Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_c_part2/p2_deco.c Tue May 12 11:30:35 2015 +0200 @@ -7,7 +7,7 @@ // ************************************************************** ////////////////////////////////////////////////////////////////////////////// -// OSTC - diving computer code +// OSTC Mk.2, 2N and 2C - diving computer code // Copyright (C) 2011 HeinrichsWeikamp GbR // // This program is free software: you can redistribute it and/or modify
--- a/code_part1/OSTC_code_c_part2/p2_definitions.h Mon May 04 13:53:36 2015 +0200 +++ b/code_part1/OSTC_code_c_part2/p2_definitions.h Tue May 12 11:30:35 2015 +0200 @@ -3,7 +3,7 @@ // ********************************************************* ////////////////////////////////////////////////////////////////////////////// -// OSTC - diving computer code +// OSTC Mk.2, 2N and 2C - diving computer code // Copyright (C) 2015 HeinrichsWeikamp GbR // // This program is free software: you can redistribute it and/or modify