Fix times once again...

diff --git a/vw-nm.c b/vw-nm.c
index c8439026fbef7ba03ec1aab073f012bfd7e309e7..5c15071e3b7b47727bf988ce64d4bbed0b874d9b 100644 (file)
--- a/vw-nm.c
+++ b/vw-nm.c
@@ -49,15 +49,6 @@ static void nm_update_my_next_id(struct NM_Main *nm) {
                        break;
                }
        } while (id != nm->my_id);
-
-       if (nm->nodes[nm->my_id].next == nm->my_id) {
-               /* Uh oh, we're the only one left. */
-
-               /* TODO */
-               nm->nodes[nm->my_id].state = NM_MAIN_LOGIN;
-
-               /* TODO: Timeout 140ms (RCD 310) */
-       }
 }
 
 

diff --git a/vw-nm.h b/vw-nm.h
index fcb6b4ba455ab8f5047ee4d982c95ad5cf3286a9..23d0def4595cf482d9363020245c09543c50f02d 100644 (file)
--- a/vw-nm.h
+++ b/vw-nm.h
@@ -51,18 +51,15 @@ struct NM_Main {
 
 /* OSEK/VDX NM: T_Typ
  *
- * This timeout is ~49 ms in:
+ * This timeout is ~50 ms in:
  *  - 0x19 (RCD 310, Bosch)
- *    (sometimes it takes a little longer)
  *
  * and ~45ms in:
  *  - 0x0b Instrument cluster?
  *  - 0x15 MDI
  *  - 0x1A Phone
- *
- * We may reduce it since we're not on a real-time OS.
  */
-#define NM_USECS_NORMAL_TURN 45000
+#define NM_USECS_NORMAL_TURN 50000
 
 
 /* OSEK/VDX NM: T_Max