From 1558ce5c054aea1a87e93b5c1f10f6778eaa2773 Mon Sep 17 00:00:00 2001 From: Eugene Yip Date: Mon, 15 Jan 2024 16:17:10 +0100 Subject: [PATCH] Updated test suite for SWTbahn Standard. Removed unnecessary ignored files --- .gitignore | 9 --------- test/physical/swtbahn-standard/main.c | 2 +- test/physical/swtbahn-standard/testsuite.c | 14 +++++++------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 31c14a4..9f440dd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,15 +5,6 @@ doc/ *.o *.a .idea/ -CMakeCache.txt -CMakeFiles -CMakeScripts -Testing -Makefile -cmake_install.cmake -install_manifest.txt -compile_commands.json -CTestTestfile.cmake .DS_Store **/.vscode **/.cache \ No newline at end of file diff --git a/test/physical/swtbahn-standard/main.c b/test/physical/swtbahn-standard/main.c index 46ba3d4..f83e6c5 100755 --- a/test/physical/swtbahn-standard/main.c +++ b/test/physical/swtbahn-standard/main.c @@ -57,7 +57,7 @@ int main(int argc, char **argv) { return 0; } - if (bidib_start_serial("/dev/ttyUSB0", "../swtbahn-cli/configurations/swtbahn-standard", 200)) { + if (bidib_start_serial("/dev/ttyUSB0", "../../swtbahn-cli/configurations/swtbahn-standard", 200)) { printf("testsuite: libbidib failed to start\n"); return 0; } diff --git a/test/physical/swtbahn-standard/testsuite.c b/test/physical/swtbahn-standard/testsuite.c index e19a76f..c644da2 100644 --- a/test/physical/swtbahn-standard/testsuite.c +++ b/test/physical/swtbahn-standard/testsuite.c @@ -112,7 +112,7 @@ void testsuite_case_swtbahnStandardTrackCoverage(const char *train) { testsuite_switch_point("point2", "normal"); testsuite_switch_point("point3", "normal"); - testsuite_driveTo("seg12", 80, train); + testsuite_driveTo("seg12", 30, train); testsuite_switch_point("point6", "reverse"); testsuite_switch_point("point8", "reverse"); @@ -125,27 +125,27 @@ void testsuite_case_swtbahnStandardTrackCoverage(const char *train) { testsuite_switch_point("point9", "reverse"); testsuite_switch_point("point11", "reverse"); - testsuite_driveToStop("seg37", 80, train); + testsuite_driveToStop("seg37", 30, train); testsuite_switch_point("point12", "reverse"); - testsuite_driveToStop("seg40", -80, train); + testsuite_driveToStop("seg40", -30, train); testsuite_switch_point("point12", "normal"); testsuite_switch_point("point11", "normal"); testsuite_switch_point("point10", "normal"); - testsuite_driveTo("seg28", 50, train); + testsuite_driveTo("seg28", 30, train); testsuite_switch_point("point7", "normal"); testsuite_switch_point("point4", "normal"); testsuite_switch_point("point9", "normal"); - testsuite_driveTo("seg21", 80, train); + testsuite_driveTo("seg21", 30, train); testsuite_switch_point("point5", "normal"); - testsuite_driveTo("seg28", 80, train); + testsuite_driveTo("seg28", 30, train); testsuite_switch_point("point7", "reverse"); testsuite_switch_point("point8", "normal"); @@ -154,7 +154,7 @@ void testsuite_case_swtbahnStandardTrackCoverage(const char *train) { testsuite_switch_point("point6", "normal"); testsuite_switch_point("point1", "reverse"); - testsuite_driveToStop("seg4", 80, train); + testsuite_driveToStop("seg4", 30, train); testsuite_switch_point("point1", "normal");