Updated Website

.github/workflows/build-and-test.yml

@@ -20,7 +20,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y gcc g++ cmake golang uuid-dev
+        sudo apt-get install -y gcc g++ cmake golang uuid-dev libssl-dev
 
     - name: Run pre-build script
       run: |

ACT/LibMC.xml

@@ -705,6 +705,12 @@
 		<error name="INVALIDROWRANGE" code="680" description="Invalid row range." />
 		<error name="CONFIGURATIONLISTNAMEMISSING" code="681" description="Configuration list name missing" />
 		<error name="CONFIGURATIONLISTBUTTONNAMEMISSING" code="682" description="Configuration list button name missing" />
+		<error name="NONLINEAROVERRIDEPARAMETERNOTINCREASING" code="683" description="Nonlinear override parameter not increasing" />
+		<error name="NONLINEAROVERRIDEPARAMETEROUTOFRANGE" code="684" description="Nonlinear override parameter out of range" />
+		<error name="NONLINEAROVERRIDEFACTOROUTOFRANGE" code="685" description="Nonlinear override factor out of range" />
+
+
+
 
 	</errors>
 
@@ -838,6 +844,11 @@
 			<param name="XMLString" type="string" pass="in" description="XML Configuration String." />
 		</method>
 
+		<method name="SetParameterOverride" description="overrides a parameter with a certain value. Fails if parameter group or parameter does not exist. Fails if Value is not fitting the parameter type.">
+			<param name="ParameterPath" type="string" pass="in" description="Path of the parameter. Example: main.configgroup.currentjob" />
+			<param name="ParameterValue" type="string" pass="in" description="New Value of the parameter" />
+		</method>
+
 		<method name="StartAllThreads" description="starts the threads for all the state machines.">
 		</method>
 

ACT/LibMCEnv.xml

@@ -290,11 +290,10 @@
 		<error name="INVALIDREACTIONTIMEOUT" code="10250" description="Invalid reaction timeout." />	
 		<error name="COULDNOTSETREACTIONTIMEOUT" code="10251" description="Could not set reaction timeout." />	
 		<error name="MACHINECONFIGURATIONSCHEMATYPEALREADYREGISTERED" code="10252" description="Schema type already registered, but with a different name." />	
+		<error name="NOCONFIGURATIONVERSIONFOUND" code="10253" description="No configuration version found." />	
+		<error name="NOCONFIGURATIONVERSIONACTIVE" code="10254" description="No configuration version active." />	
 
 
-
-
-
 	</errors>
 
 	<enum name="AlertLevel">
@@ -793,9 +792,25 @@
 			<param name="DPIValueX" type="double" pass="in" description="DPI Value in X. MUST be positive." />
 			<param name="DPIValueY" type="double" pass="in" description="DPI Value in Y. MUST be positive." />
 			<param name="PixelFormat" type="enum" class="ImagePixelFormat" pass="in" description="Pixel format to use. Might lose color and alpha information." />
+			<param name="ImageDataInstance" type="class" class="ImageData" pass="return" description="Image instance containing the JPEG image." />
+		</method>
+
+		<method name="LoadPNGImageFromResource" description="creates an image object from a machine PNG resource data.">
+			<param name="ResourceName" type="string" pass="in" description="PNG Data Resource Name. Fails if image cannot be loaded." />
+			<param name="DPIValueX" type="double" pass="in" description="DPI Value in X. MUST be positive." />
+			<param name="DPIValueY" type="double" pass="in" description="DPI Value in Y. MUST be positive." />
+			<param name="PixelFormat" type="enum" class="ImagePixelFormat" pass="in" description="Pixel format to use. Might lose color and alpha information." />
 			<param name="ImageDataInstance" type="class" class="ImageData" pass="return" description="Image instance containing the PNG image." />
 		</method>
 
+		<method name="LoadJPEGImageFromResource" description="creates an image object from a machine JPEG resource data.">
+			<param name="ResourceName" type="string" pass="in" description="JPEG Data Resource Name. Fails if image cannot be loaded." />
+			<param name="DPIValueX" type="double" pass="in" description="DPI Value in X. MUST be positive." />
+			<param name="DPIValueY" type="double" pass="in" description="DPI Value in Y. MUST be positive." />
+			<param name="PixelFormat" type="enum" class="ImagePixelFormat" pass="in" description="Pixel format to use. Might lose color and alpha information." />
+			<param name="ImageDataInstance" type="class" class="ImageData" pass="return" description="Image instance containing the JPEG image." />
+		</method>
+
 		<method name="CreateImageFromRawRGB24Data" description="creates an image object from raw RGB24 Data. (3 bytes per pixel)">
 			<param name="RGB24Data" type="basicarray" class="uint8" pass="in" description="RGB 24 data. MUST contain PixelSizeX * PixelSizeY * 3 bytes." />
 			<param name="PixelSizeX" type="uint32" pass="in" description="Pixel size in X. MUST be positive." />
@@ -4819,10 +4834,6 @@
 			<param name="XSDUUID" type="string" pass="return" description="UUID of the configuration XSD." />
 		</method>
 
-		<!--method name="GetTypeUUID" description="Returns the UUID of the associated configuration type.">
-			<param name="TypeUUID" type="string" pass="return" description="UUID of the configuration type." />
-		</method-->
-
 		<method name="GetNumericVersion" description="Returns the numeric version of the configuration version.">
 			<param name="ConfigurationNumericVersion" type="uint32" pass="return" description="Returns the configuration numeric version." />
 		</method>
@@ -4831,22 +4842,14 @@
 			<param name="ParentUUID" type="string" pass="return" description="UUID of the configuration version that is the parent of this version. Returns 00000000-0000-0000-0000-000000000000 if this is the default version." />
 		</method>
 
-		<!--method name="GetSchemaType" description="Returns the schema type string of the configuration.">
-			<param name="SchemaType" type="string" pass="return" description="Schema type of the configuration type." />
-		</method>
-
-		<method name="GetXSDVersion" description="Returns the version number of the associated XSD.">
-			<param name="XSDVersion" type="uint32" pass="return" description="Returns the XSD version." />
-		</method>
-
-		<method name="GetXSDString" description="Returns the XSD used for validation as a string.">
-			<param name="XSDString" type="string" pass="return" description="XSD String." />
-		</method-->
-
 		<method name="GetConfigurationXMLString" description="Returns the configuration XML content as string.">
 			<param name="XMLString" type="string" pass="return" description="XML String." />
 		</method>
 
+		<method name="GetConfigurationXML" description="Returns the configuration XML instance.">
+			<param name="XMLInstance" type="class" class="XMLDocument" pass="return" description="XML Document." />
+		</method>
+
 		<method name="GetUserUUID" description="Returns the User UUID.">
 			<param name="UserUUID" type="string" pass="return" description="UUID of the User." />
 		</method>
@@ -4858,15 +4861,13 @@
 		<method name="CreateNewVersion" description="Creates a new configuration version from this one with the same XSD.">
 			<param name="XMLString" type="string" pass="in" description="New XML Configuration String. MUST conform to current XSD." />
 			<param name="UserUUID" type="string" pass="in" description="User UUID for logging the user who initiated the change." />
-			<!--param name="TimeStampUTC" type="string" pass="in" description="Current time in UTC." /-->
 			<param name="CurrentInstance" type="class" class="MachineConfigurationVersion" pass="return" description="Returns the newly created MachineConfigurationVersion instance." />
 		</method>
 
 		<method name="MigrateToNewXSD" description="Creates a new configuration version from this one but with a different XSD.">
 			<param name="NewXSD" type="class" class="MachineConfigurationXSD" pass="in" description="New XSD to use. MUST be of the same type as the current. MUST have an increased version number." />
 			<param name="XMLString" type="string" pass="in" description="New XML Configuration String. MUST conform to new XSD." />
 			<param name="UserUUID" type="string" pass="in" description="User UUID for logging the user who initiated the change." />
-			<!--param name="TimeStampUTC" type="string" pass="in" description="Current time in UTC." /-->
 			<param name="CurrentInstance" type="class" class="MachineConfigurationVersion" pass="return" description="Returns the newly created MachineConfigurationVersion instance." />
 		</method>
 
@@ -4913,13 +4914,21 @@
 		<method name="GetLatestXSDNumericVersion" description="Returns the version number of the latest XSD for this type.">
 			<param name="XSDNumericVersion" type="uint32" pass="return" description="Latest XSD version number, or 0 if none exist." />
 		</method>
-
+		
 		<method name="RegisterNewXSD" description="Registers a new XSD Version. Fails if version already exists or is not incrementing.">
 			<param name="XSDString" type="string" pass="in" description="XSD String of the version. MUST be a valid schema of this type." />
 			<param name="XSDVersion" type="uint32" pass="in" description="New Version to add. MUST be larger than GetLatestXSDVersion." />
 			<param name="XSDInstance" type="class" class="MachineConfigurationXSD" pass="return" description="Returns the new XSD of the configuration type." />
 		</method>
-
+
+		<method name="RegisterXSDFromResource" description="Registers a XSD from a resource file including its default configuration.">
+			<param name="XSDResourceName" type="string" pass="in" description="XSD Resource Name. Resource MUST exist." />
+			<param name="DefaultXMLResourceName" type="string" pass="in" description="Default XML Resource Name. Resource MUST exist." />
+			<param name="XSDVersion" type="uint32" pass="in" description="New Version to add. MUST be larger than GetLatestXSDVersion if FailIfExisting is true." />
+			<param name="FailIfExisting" type="bool" pass="in" description="If true, the call will fail if XSDVersion is not larger than GetLatestXSDVersion. If false, the call will return the new XSDInstance, if XSDVersion is larger than GetLatestXSDVersion, null otherwise. " />
+			<param name="XSDInstance" type="optionalclass" class="MachineConfigurationXSD" pass="return" description="Returns the new XSD of the configuration type, if it has been newly registered." />
+		</method>
+
 		<method name="FindXSDByNumericVersion" description="Finds a specific XSD of this type by its Numeric Version Number.">
 			<param name="XSDNumericVersion" type="uint32" pass="in" description="Requested version number." />
 			<param name="XSDInstance" type="class" class="MachineConfigurationXSD" pass="return" description="XSD instance if exists." />
@@ -4962,6 +4971,14 @@
 			<param name="Version" type="optionalclass" class="MachineConfigurationVersion" pass="return" description="Latest configuration version or null." />
 		</method>
 
+		<method name="GetActiveConfigurationXML" description="Returns the currently active configuration XML for this type.">
+			<param name="XMLInstance" type="class" class="XMLDocument" pass="return" description="XML Document." />
+		</method>
+
+		<method name="GetLatestConfigurationXML" description="Returns the most recently created configuration XML for this type.">
+			<param name="XMLInstance" type="class" class="XMLDocument" pass="return" description="XML Document." />
+		</method>
+
 		<method name="SetActiveConfigurationVersion" description="Sets the active configuration version for this type.">
 			<param name="VersionUUID" type="string" pass="in" description="UUID of the version to set as active." />
 		</method>

Artifacts/build_client_clean.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+
+basepath=$(cd "$(dirname "$0")" && pwd)
+echo "$basepath"
+cd "$basepath"
+
+mkdir -p ../build_client/Client/public
+mkdir -p ../build_client/Client/src/common
+mkdir -p ../build_client/Client/src/modules
+mkdir -p ../build_client/Client/src/dialogs
+mkdir -p ../build_client/Client/dist
+
+cp ../Client/public/* ../build_client/Client/public/ 2>/dev/null || true
+cp ../Client/src/*.* ../build_client/Client/src/ 2>/dev/null || true
+cp ../Client/src/common/* ../build_client/Client/src/common/ 2>/dev/null || true
+cp ../Client/src/modules/* ../build_client/Client/src/modules/ 2>/dev/null || true
+cp ../Client/src/dialogs/* ../build_client/Client/src/dialogs/ 2>/dev/null || true
+cp ../Client/*.js ../build_client/Client/ 2>/dev/null || true
+cp ../Client/*.json ../build_client/Client/ 2>/dev/null || true
+
+cd ..
+git log -n 1 --format="%H" -- "Client" > "build_client/Client/dist/_githash_client.txt"
+git log -n 1 --format="%H" -- "Client" > "Artifacts/clientdist/_githash_client.txt"
+CLIENTDIRHASH=$(cat "build_client/Client/dist/_githash_client.txt")
+
+cat > build_client/Client/src/AMCGitHash.js <<EOF
+export function getClientGitHash ()
+{
+  return "$CLIENTDIRHASH";
+}
+EOF
+
+cd build_client/Client
+
+npm install
+npm run build
+
+cd ../..
+
+cd build_client/Client
+
+go run ../../BuildScripts/createClientDist.go dist ../../Artifacts/clientdist/clientpackage.zip
+
+go run ../../BuildScripts/createClientSource.go . ../../Artifacts/clientdist/clientsourcepackage.zip
+
+echo
+echo "Created packages in Artifacts/clientdist/:"
+ls -l ../../Artifacts/clientdist
+echo
+
+exit 0

Artifacts/clientdist/_githash_client.txt

@@ -1 +1 @@
-864af701b933b1d4bae3e21bac376e640f076aa3
+a0562764978d4b28cf85b331870744b2af4f54bf

Artifacts/lib3mf/_githash_linux64_lib3mf.txt

@@ -0,0 +1 @@
+5c58ceb256c9951fdaa029426fe777e1890293bc

Artifacts/lib3mf/_githash_rpi_lib3mf.txt

@@ -1 +1 @@
-c852ea7065689634e0b23eb3aec11668c9203892
+5c58ceb256c9951fdaa029426fe777e1890293bc