Merge Fixes for physical test

include/highlevel/bidib_highlevel_util.h

@@ -97,12 +97,20 @@ uint8_t *bidib_read_error_message(void);
  */
 void bidib_flush(void);
 
+/**
+ * Check if bidib is currently running.
+ * 
+ * @return true if bidib is running
+ * @return false otherwise
+ */
+bool bidib_is_running();
+
 /**
  * Customised syslog function to prepend libbidib to log messages.
  * This is needed to differentiate log messages that originate from this bidib
  * library or from a user application.
  */
- void syslog_libbidib(int priority, const char *format, ...);
+void syslog_libbidib(int priority, const char *format, ...);
 
 
 #endif

src/highlevel/bidib_highlevel_util.c

@@ -257,6 +257,10 @@ void bidib_stop(void) {
 	}
 }
 
+bool bidib_is_running() {
+    return bidib_running;
+}
+
 void syslog_libbidib(int priority, const char *format, ...) {
 	char string[1024];
 	va_list arg;

src/state/bidib_state_setter.c

@@ -138,14 +138,22 @@ void bidib_state_accessory_state(t_bidib_node_address node_address, uint8_t numb
 			free(accessory_state->data.state_id);
 		}
 		accessory_state->data.state_id = NULL;
-		t_bidib_aspect *aspect_mapping;
+		t_bidib_aspect *aspect_mapping = NULL;
 		for (size_t i = 0; i < accessory_mapping->aspects->len; i++) {
 			aspect_mapping = &g_array_index(accessory_mapping->aspects, t_bidib_aspect, i);
 			if (aspect_mapping->value == aspect) {
 				accessory_state->data.state_id = strdup(aspect_mapping->id->str);
 				break;
 			}
 		}
+		if (aspect_mapping == NULL) {
+			syslog_libbidib(LOG_ERR,
+			                "bidib_state_accessory_state: aspect mapping for accessory %s is NULL",
+			                accessory_mapping->id->str);
+			pthread_rwlock_unlock(&bidib_boards_rwlock);
+			pthread_mutex_unlock(&trackstate_accessories_mutex);
+			return;
+		}
 		if (accessory_state->data.state_id == NULL) {
 			syslog_libbidib(LOG_WARNING,
 			                "Aspect 0x%02x of accessory %s is not mapped in config files",

test/physical/Readme.md

@@ -67,7 +67,7 @@ For each point and signal, the `bidib_switch_point()` and `bidib_set_signal()`
 functions are used to set their aspect.
 
 The `t_testsuite_point_result` struct records the feedback state returned by a point, and is
-updated by the `testsuite_logTestResult()` function. The following is an example of the 
+updated by the `testsuite_recordTestResult()` function. The following is an example of the 
 feedback that is logged for a point:
 
 ```
@@ -80,7 +80,6 @@ point10
   -> unknownState: 0
 ```
 
-
 ## Dependencies
 
 **SWTbahn Platform**

test/physical/swtbahn-full/main.c

@@ -70,8 +70,16 @@ int main(int argc, char **argv) {
 
 	printf("testsuite: Test case %d\n", atoi(argv[1]));
 	t_testsuite_test_result *result = testsuite_initTestSuite();
-
 	const int repetitions = atoi(argv[2]);
+
+	// For cases 1-3, the track output state is set to OFF,
+	// as they do not involve any trains that should be driving around.
+	// If a previous test was aborted/failed/crashed, the system might not have
+	// been shut down properly, so trains might still have a set speed. 
+	// In a new test execution, trains would then start to drive around.
+	// With the track output set to off, that's not a problem, and thus
+	// test cases 1-3 can be run even when a prior execution did not shut
+	// down properly.
 	switch (atoi(argv[1])) {
 		case 1:
 			bidib_set_track_output_state_all(BIDIB_CS_OFF);
@@ -168,7 +176,7 @@ void printWelcome() {
 		"*   SWTbahn-testsuite  *",
 		"*                      *",
 		"************************",
-		"*    UniBa-SWT-2023    *",
+		"*    UniBa-SWT-2024    *",
 		"************************",
 		""
 	};