|
Message
From: cvs at opencores.org<cvs@o...>
Date: Tue May 27 18:36:19 CEST 2008
Subject: [cvs-checkins] MODIFIED: jop ...
Date: 00/08/05 27:18:36 Modified: jop/java/target/src/app/oebb Flash.java Gps.java Logic.java
Main.java State.java
Log:
BG V 2.07
Revision Changes Path
1.17 jop/java/target/src/app/oebb/Flash.java
http://www.opencores.org/cvsweb.shtml/jop/java/target/src/app/oebb/Flash.java.diff?r1=1.16&r2=1.17
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Flash.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/app/oebb/Flash.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- Flash.java 22 May 2008 16:29:11 -0000 1.16
+++ Flash.java 27 May 2008 16:36:18 -0000 1.17
@@ -53,8 +53,8 @@
static final int PT_FLG_NO_MOVE = 16;
static final int PT_FLG_ANM = 32;
- static final int NO_COMM_ALARM_START = -1;
- static final int NO_COMM_ALARM_END = -2;
+// static final int NO_COMM_ALARM_START = -1;
+// static final int NO_COMM_ALARM_END = -2;
static class Point {
int melnr;
@@ -73,7 +73,7 @@
StringBuffer verschubBis;
// start of Funkschatten hack
- int fs1_lat, fs1_lon, fs2_lat, fs2_lon;
+// int fs1_lat, fs1_lon, fs2_lat, fs2_lon;
Point() {
stationLine1 = new StringBuffer(19);
@@ -238,9 +238,9 @@
if (str[i].melnr == melnr) {
for(; i<lenStr; ++i) {
// Funkschatten hack
- if (str[i].melnr==0) {
- continue;
- }
+// if (str[i].melnr==0) {
+// continue;
+// }
if (str[i].melnr != melnr) {
return str[i].melnr;
}
@@ -277,13 +277,14 @@
boolean ret = true;
Point p = Flash.getPoint(melnr);
if (p!=null) {
- // Funkschatten hack
- int len = Gps.dist(p.fs1_lat-p.fs2_lat, p.fs1_lon-p.fs2_lon);
- int a = Gps.dist(p.fs1_lat-lat, p.fs1_lon-lon);
- int b = Gps.dist(p.fs2_lat-lat, p.fs2_lon-lon);
- if (a<len && b<len) {
- ret = false;
- }
+// Funkschatten disabled
+// // Funkschatten hack
+// int len = Gps.dist(p.fs1_lat-p.fs2_lat, p.fs1_lon-p.fs2_lon);
+// int a = Gps.dist(p.fs1_lat-lat, p.fs1_lon-lon);
+// int b = Gps.dist(p.fs2_lat-lat, p.fs2_lon-lon);
+// if (a<len && b<len) {
+// ret = false;
+// }
// was the original clean version
// ret = !(p.ptr==NO_COMM_ALARM_START);
}
@@ -360,34 +361,35 @@
// Funkschatten hack
// Charly sets melrn to LAST one if not
// set in the CSV!!!!
- if (p.ptr<0) {
- p.melnr = 0;
- }
+// if (p.ptr<0) {
+// p.melnr = 0;
+// }
p.flags = intVal(addr+PT_FLAGS);
p.station = (p.flags & PT_FLG_STATION)!=0;
p.anmelden = (p.flags & PT_FLG_ANM)!=0;
p.verlassen = (p.flags & PT_FLG_VERL)!=0;
p.checkDirection = (p.flags & PT_FLG_NO_DIR)==0;
p.checkMove = (p.flags & PT_FLG_NO_MOVE)==0;
- p.fs1_lat = 0;
- p.fs1_lon = 0;
- p.fs2_lat = 0;
- p.fs2_lon = 0;
- // Funkschatten hack
- if (p.melnr!=0) {
- // a real new point
last = p;
- } else if (last!=null){
- k = intVal(addr+PT_PTR); // type
- if (k==NO_COMM_ALARM_START) {
- last.fs1_lat = intVal(addr+PT_LAT);
- last.fs1_lon = intVal(addr+PT_LON);
- }
- if (k==NO_COMM_ALARM_END) {
- last.fs2_lat = intVal(addr+PT_LAT);
- last.fs2_lon = intVal(addr+PT_LON);
- }
- }
+// p.fs1_lat = 0;
+// p.fs1_lon = 0;
+// p.fs2_lat = 0;
+// p.fs2_lon = 0;
+// // Funkschatten hack
+// if (p.melnr!=0) {
+// // a real new point
+// last = p;
+// } else if (last!=null){
+// k = intVal(addr+PT_PTR); // type
+// if (k==NO_COMM_ALARM_START) {
+// last.fs1_lat = intVal(addr+PT_LAT);
+// last.fs1_lon = intVal(addr+PT_LON);
+// }
+// if (k==NO_COMM_ALARM_END) {
+// last.fs2_lat = intVal(addr+PT_LAT);
+// last.fs2_lon = intVal(addr+PT_LON);
+// }
+// }
addr += PT_LEN;
1.21 jop/java/target/src/app/oebb/Gps.java
http://www.opencores.org/cvsweb.shtml/jop/java/target/src/app/oebb/Gps.java.diff?r1=1.20&r2=1.21
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Gps.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/app/oebb/Gps.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- Gps.java 24 May 2008 13:44:15 -0000 1.20
+++ Gps.java 27 May 2008 16:36:18 -0000 1.21
@@ -275,11 +275,13 @@
// change only if previous unknown or
// we're moving
if (state.getPos()<=0 || speed>MIN_SPEED) {
+ if (Main.logic.state!=Logic.LERN) {
state.setPos(melnr);
state.requestSend();
Dbg.wr("Melderaum: ");
Dbg.intVal(melnr);
Dbg.wr(" nun aktiv\n");
+ }
// enable Alarm checking again
// is disabled again!!!
// Status.checkMove = true;
@@ -503,8 +505,10 @@
// }
// }
+ if (Main.logic.state!=Logic.LERN) {
Main.state.gpsLat = last_lat;
Main.state.gpsLong = last_lon;
+ }
// delay fix one message
if (last_fix!=0) {
1.27 jop/java/target/src/app/oebb/Logic.java
http://www.opencores.org/cvsweb.shtml/jop/java/target/src/app/oebb/Logic.java.diff?r1=1.26&r2=1.27
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Logic.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/app/oebb/Logic.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- Logic.java 24 May 2008 13:44:15 -0000 1.26
+++ Logic.java 27 May 2008 16:36:19 -0000 1.27
@@ -984,7 +984,7 @@
private void anmeldenWait() {
while (loop()) {
- Display.write("Anmelden", "", "(bitte warten)");
+ Display.write("Anmelden", "(bitte warten)", "(Fdl verständigen)");
// wait for Anmelden OK or we already got a FERL
if (Events.anmeldenOk || Main.state.start!=0 || hilfsbtr) {
Logic.state = Logic.ANM_OK;
@@ -1437,20 +1437,23 @@
Display.write("Lerne", "Strecke","");
checkMelnr = false;
+ val = Main.state.strnr;
+
Main.state.strnr = getNumber(8, 3);
if (Main.state.strnr == -1) return;
+
+ if (val!=Main.state.strnr || !Status.connOk) {
Flash.loadStr(Main.state.strnr);
+ Flash.loadStrNames(Main.state.strnr, 0, 0);
+ startConn();
+ }
int melnr = Flash.getFirst(Main.state.strnr);
if (melnr==-1) {
Display.write("Strecke", "nicht gefunden", "");
waitEnterAndInit();
return;
}
-
- Flash.loadStrNames(Main.state.strnr, 0, 0);
-
- startConn();
// Conn changes to FLD_CONN
Logic.state = Logic.LERN;
Main.state.setLern();
1.32 jop/java/target/src/app/oebb/Main.java
http://www.opencores.org/cvsweb.shtml/jop/java/target/src/app/oebb/Main.java.diff?r1=1.31&r2=1.32
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Main.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/app/oebb/Main.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- Main.java 24 May 2008 13:44:15 -0000 1.31
+++ Main.java 27 May 2008 16:36:19 -0000 1.32
@@ -62,7 +62,7 @@
// SW version
public static final int VER_MAJ = 2;
- public static final int VER_MIN = 8;
+ public static final int VER_MIN = 12;
private static final int STRECKE_PRIO = 1;
private static final int STRECKE_PERIOD = 100000;
1.11 jop/java/target/src/app/oebb/State.java
http://www.opencores.org/cvsweb.shtml/jop/java/target/src/app/oebb/State.java.diff?r1=1.10&r2=1.11
(In the diff below, changes in quantity of whitespace are not shown.)
Index: State.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/app/oebb/State.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- State.java 24 May 2008 13:44:15 -0000 1.10
+++ State.java 27 May 2008 16:36:19 -0000 1.11
@@ -80,10 +80,12 @@
public static final int FLAG_VERL = 6;
public static final int FLAG_ZIEL = 7;
public static final int ALARM_MLR = 8;
+ public static final int FLAG_LERN = 9;
private final static int AFLAG_ANK = 1<<(FLAG_ANK-1);
private final static int AFLAG_VERL = 1<<(FLAG_VERL-1);
private final static int AFLAG_ZIEL = 1<<(FLAG_ZIEL-1);
+ private final static int AFLAG_LERN = 1<<(FLAG_LERN-1);
private final static int ALARM_MSK = (1<<(ALARM_UEBERF-1)) |
(1<<(ALARM_RICHTUNG-1)) | (1<<(ALARM_FAEHRT-1)) | (1<<(ALARM_ES221-1)) | (1<<(ALARM_MLR-1));
@@ -93,6 +95,7 @@
final static int CFLAG_FWR = 0x00000002; // Fahrtwiderruf
final static int CFLAG_NOT = 0x00000004; // Nothalt
final static int CFLAG_ANMOK = 0x00000008; // Anmelden OK
+ final static int CFLAG_ZLB_INT= 0x00000010; // used only internally by ZLB
final static int CFLAG_IGNORE = 0x00000020; // ignore message
/**
@@ -389,6 +392,10 @@
if ((alarmAck & AFLAG_ZIEL)!=0) {
alarmFlags &= ~AFLAG_ZIEL;
}
+ if ((alarmAck & AFLAG_LERN)!=0) {
+ alarmFlags &= ~AFLAG_LERN;
+ Status.lernOk = true;
+ }
// Alarm has been reset by FDL and seen by ZLB
// we can reset it in the flags
if (alarmQuit) {
@@ -644,6 +651,14 @@
}
public void lern(int melnr, int latAvg, int lonAvg) {
+
+ synchronized (this) {
+ pos = melnr;
+ gpsLat = latAvg;
+ gpsLong = lonAvg;
+ alarmFlags |= AFLAG_LERN;
+ }
+
// TODO Auto-generated method stub
}
|
 |
Browse
