Mercurial > public > mk2

changeset 484:65850b513f1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
beta 2.03 start...
author heinrichsweikamp
date Thu, 13 Oct 2011 09:54:21 +0200
parents 0635fbb2fcf5
children e83f883c96b2
files code_part1/OSTC_code_asm_part1/changelog.txt code_part1/OSTC_code_asm_part1/definitions.asm code_part1/OSTC_code_asm_part1/german_text.asm
diffstat 3 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/code_part1/OSTC_code_asm_part1/changelog.txt	Thu Oct 13 09:41:02 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/changelog.txt	Thu Oct 13 09:54:21 2011 +0200
@@ -1,3 +1,6 @@
+New in 2.03 beta:
+
+
 New in 2.02 beta:
 NEW: Cave divers consomation display and alarm (CF59).
 CHANGE: SAC (CF56/CF57) in range 5..50 l/min (no more decimal).
--- a/code_part1/OSTC_code_asm_part1/definitions.asm	Thu Oct 13 09:41:02 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/definitions.asm	Thu Oct 13 09:54:21 2011 +0200
@@ -22,7 +22,7 @@
 ; ToDo:
 
 #DEFINE	softwareversion_x		d'2'		; Software version  XX.YY
-#DEFINE	softwareversion_y		d'2'		; Software version  XX.YY
+#DEFINE	softwareversion_y		d'3'		; Software version  XX.YY
 
 #DEFINE softwareversion_beta 	1 			; (and 0 for release) 
 
@@ -110,8 +110,9 @@
 
 ;=============================================================================
 
-;#include "../OSTC_code_c_part2/shared_definitions.h"
-#include "ostc2_code/code_part1/OSTC_code_c_part2/shared_definitions.h"
+#include "../OSTC_code_c_part2/shared_definitions.h"
+;#include "ostc2_code/code_part1/OSTC_code_c_part2/shared_definitions.h"
+;include "shared_definitions.h"
 
 ;=============================================================================
 ; Reserve space for C-code data space. Eg.when calling log.
--- a/code_part1/OSTC_code_asm_part1/german_text.asm	Thu Oct 13 09:41:02 2011 +0200
+++ b/code_part1/OSTC_code_asm_part1/german_text.asm	Thu Oct 13 09:54:21 2011 +0200
@@ -461,7 +461,7 @@
     TCODE    .20,   .35,     "Interval:"                 ;307 Interval:
     TCODE    .0,    .0,      "Jetzt  "                   ;308 Now                   (7 chars min)
 	TCODE	 .109,	.113,	 "D-Tiefe"	 	 		 	 ;309 Average
-	TCODE	 .109,	.54,	 "Stopuhr"		 		 	 ;310 Stopwatch             (BIG Stopwatch in Gauge mode)
+	TCODE	 .109,	.54,	 "Stoppuhr"		 		 	 ;310 Stopwatch             (BIG Stopwatch in Gauge mode)
 ; Cave consomation
     TCODE    .0,    .0,      "Cave Bail."                ;311 Cave Bail.            (=10 chars.)
 ;=============================================================================