From 9e4eecd02ca7937d3138952326ad8499087cd468 Mon Sep 17 00:00:00 2001 From: rusEfi Date: Sun, 17 Jul 2016 00:02:27 -0400 Subject: [PATCH] auto-sync --- firmware/controllers/lcd_controller.cpp | 2 +- win32_functional_tests/simulator/framework.cpp | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/firmware/controllers/lcd_controller.cpp b/firmware/controllers/lcd_controller.cpp index e96778dd68..4a3d6d9b8b 100644 --- a/firmware/controllers/lcd_controller.cpp +++ b/firmware/controllers/lcd_controller.cpp @@ -216,7 +216,7 @@ static void showLine(lcd_line_e line, int screenY) { } else { sdState = 'D'; } - int seconds = getTimeNowSeconds(); + efitimesec_t seconds = getTimeNowSeconds(); if (seconds < 10000) { lcdPrintf(" %d%c", seconds, sdState); } diff --git a/win32_functional_tests/simulator/framework.cpp b/win32_functional_tests/simulator/framework.cpp index a3b3848110..988490bdfd 100644 --- a/win32_functional_tests/simulator/framework.cpp +++ b/win32_functional_tests/simulator/framework.cpp @@ -22,10 +22,14 @@ efitimems_t currentTimeMillis(void) { } // todo; reduce code duplication with prod code? -int getTimeNowSeconds(void) { +efitimesec_t getTimeNowSeconds(void) { return chTimeNow() / CH_FREQUENCY; } +bool isWarningNow(efitimesec_t now) { + return false; +} + int getRusEfiVersion(void) { return 239; }