Switch unique identifier generation support from prefix to postfix.

Signed-off-by: Florian Hoelzl <hoelzl@fortiss.org>

org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/RumblepadExecutableBase.java

@@ -34,28 +34,28 @@ abstract class RumblepadExecutableBase<T extends EObject> extends PiHALLibraryEx
 
 	/** {@inheritDoc} */
 	@Override
-	public final String getSingletonVariableDeclarationCode(String singletonPrefix) {
-		return "static gamepad_configuration_t" + singletonPrefix + "_rumblepad_config";
+	public final String getSingletonVariableDeclarationCode(String singletonPostfix) {
+		return "static gamepad_configuration_t rumblepad_config_" + singletonPostfix + ";\n";
 	}
 
 	/** {@inheritDoc} */
 	@Override
-	public final String getSingletonInitializationCode(String singletonPrefix) {
-		String prefixedVar = singletonPrefix + "_rumblepad_config";
+	public final String getSingletonInitializationCode(String singletonPostfix) {
+		String postfixedVar = "rumblepad_config_" + singletonPostfix;
 		StringBuilder sb = new StringBuilder();
 		sb.append("// initialize the rumblepad configuration\n");
-		sb.append(prefixedVar + " = malloc(sizeof(rumblepad_configuration_t));\n");
-		sb.append(prefixedVar + "->device_id = \"/dev/input/js0\";\n");
-		sb.append(prefixedVar + "->waiting_sleep_in_micros = 50;\n");
-		sb.append(prefixedVar + "->axis_callback = NULL;\n");
-		sb.append(prefixedVar + "->button_callback = NULL;");
-		sb.append("rumblepad_initialize(rumblepad_config);\n\n");
+		sb.append(postfixedVar + " = malloc(sizeof(rumblepad_configuration_t));\n");
+		sb.append(postfixedVar + "->device_id = \"/dev/input/js0\";\n");
+		sb.append(postfixedVar + "->waiting_sleep_in_micros = 50;\n");
+		sb.append(postfixedVar + "->axis_callback = NULL;\n");
+		sb.append(postfixedVar + "->button_callback = NULL;");
+		sb.append("rumblepad_initialize(" + postfixedVar + ");\n\n");
 		return sb.toString();
 	}
 
 	/** {@inheritDoc} */
 	@Override
-	public String getSingletonTerminationCode(String singletonPrefix) {
+	public String getSingletonTerminationCode(String singletonPostfix) {
 		return "rumblepad_terminate();\n";
 	}
 

org.fortiss.af3.platform.raspberry/src/org/fortiss/af3/platform/raspberry/generator/executable/rumblepad/StickExecutableBase.java

@@ -33,14 +33,14 @@ abstract class StickExecutableBase<T extends EObject> extends RumblepadExecutabl
 
 	/** {@inheritDoc} */
 	@Override
-	public final String getReadCode(String prefix, String singletonPrefix, InputPort logicalSignal,
-			String targetVariable) {
+	public final String getReadCode(String postfix, String singletonPostfix,
+			InputPort logicalSignal, String targetVariable) {
 		return targetVariable + " = rumblepad_get_axis_position(" + getAxisIdentifier() + ");\n";
 	}
 
 	/** {@inheritDoc} */
 	@Override
-	public final String getNoValReadCode(String prefix, String singletonPrefix,
+	public final String getNoValReadCode(String postfix, String singletonPostfix,
 			InputPort logicalSignal) {
 		return null;
 	}