Merge Develop into Master

.github/build-linux-x64/Dockerfile

@@ -0,0 +1,7 @@
+FROM ubuntu:20.10
+
+RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -yq uuid-dev build-essential cmake nodejs git npm golang
+
+COPY entrypoint.sh /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]

.github/build-linux-x64/action.yml

@@ -0,0 +1,12 @@
+name: 'Build Linux x64'
+description: 'Build binaries for Linux x64'
+inputs:
+  buildscript:  # id of input
+    description: 'Path to the build script to run'
+    required: true
+    default: './build_clean.sh'
+runs:
+  using: 'docker'
+  image: 'Dockerfile'
+  args:
+    - ${{ inputs.buildscript }}

.github/build-linux-x64/entrypoint.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+cd $GITHUB_WORKSPACE
+
+sh -c "$INPUT_BUILDSCRIPT"

.github/workflows/main.yml

@@ -0,0 +1,45 @@
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+    branches:
+      - master
+      - develop
+
+jobs:
+  build_linux_x64:
+    runs-on: ubuntu-latest
+    name: Build Linux x86-64 binaries
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Run buildscript in docker
+        uses: ./.github/build-linux-x64
+        id: build
+        with:
+          buildscript: './build_clean.sh'
+
+  build_win_x64:
+    runs-on: windows-latest
+    name: Build Windows x86-64 Binaries
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.15.x
+      - name: Install MSVC C++ compiler
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: x64
+          toolset: 14.2x.yyyyy
+      - name: Install Nodejs 14
+        uses: actions/setup-node@v2-beta
+        with:
+          node-version: '14'
+      - name: Run build_clean.bat
+        shell: cmd
+        run: call build_clean.bat NOPAUSE

ACT/LibMC.xml

@@ -336,6 +336,7 @@
 		<error name="INVALIDEVENTCONTEXT" code="327" description="Invalid event sender" />
 		<error name="INVALIDLAYERINDEX" code="328" description="Invalid layer index" />
 		<error name="TEMPBASEPATHEMPTY" code="329" description="Empty base path for temporary files" />
+		<error name="PROFILENOTFOUND" code="330" description="Profile not found." />		
 
 	</errors>
 
@@ -361,8 +362,7 @@
 
 	<class name="Base">
 	</class>
-
-
+
 	<class name="APIRequestHandler" parent="Base" description="API Request Handler">
 
 		<method name="ExpectsRawBody" description="checks if the raw body is needed to handle the request.">
@@ -451,7 +451,17 @@
 	</class>
 
 
-	<global baseclassname="Base" stringoutclassname="Base" releasemethod="ReleaseInstance" acquiremethod="AcquireInstance" versionmethod="GetVersion" errormethod="GetLastError" injectionmethod="InjectComponent">
+	<global 
+	   baseclassname="Base" 
+	   stringoutclassname="Base" 
+	   releasemethod="ReleaseInstance" 
+	   acquiremethod="AcquireInstance" 
+	   versionmethod="GetVersion" 
+	   errormethod="GetLastError" 
+	   injectionmethod="InjectComponent"
+	   simpletypewrapperclass="CreateString"
+
+	   >
 
 		<method name="GetVersion" description = "retrieves the binary version of this library.">
 			<param name="Major" type="uint32" pass="out" description="returns the major version of this library" />
@@ -478,6 +488,8 @@
 			<param name="DataModel" type="class" class="LibMCData:DataModel" pass="in" description="DataModel Object" />
 			<param name="Instance" type="class" class="MCContext" pass="return" description="New Context instance" />
 		</method>
+
+
 	</global>
 
 

ACT/LibMCData.xml

@@ -324,9 +324,8 @@
 		<error name="INVALIDEVENTCONTEXT" code="327" description="Invalid event sender" />
 		<error name="INVALIDLAYERINDEX" code="328" description="Invalid layer index" />
 		<error name="TEMPBASEPATHEMPTY" code="329" description="Empty base path for temporary files" />
-
-
-
+		<error name="BUILDJOBDATANOTFOUND" code="330" description="Build job data not found" />
+
 	</errors>
 
 
@@ -509,7 +508,15 @@
 
 	<class name="BuildJobData" parent="Base" description="Build Job Data instance">
 
-		<method name="GetName" description="returns the name of a build job.">
+		<method name="GetDataUUID" description="returns the uuid of a build job data.">
+			<param name="UUID" type="string" pass="return" description="UUID String" />	
+		</method>
+
+		<method name="GetJobUUID" description="returns the uuid of the parent build job.">
+			<param name="UUID" type="string" pass="return" description="UUID String" />	
+		</method>
+
+		<method name="GetName" description="returns the name of a build job uuid.">
 			<param name="Name" type="string" pass="return" description="Name String" />	
 		</method>
 
@@ -521,10 +528,22 @@
 			<param name="StreamInstance" type="class" class="StorageStream" pass="return" description="Stream Instance." />
 		</method>
 
+		<method name="GetStorageStreamSHA2" description="returns the checksum of the storage stream of the build.">
+			<param name="SHA2" type="string" pass="return" description="SHA256 of the storage stream." />
+		</method>
+
+		<method name="GetStorageStreamSize" description="returns the size of the storage stream of the build.">
+			<param name="Size" type="uint64" pass="return" description="size of the storage stream in bytes." />
+		</method>
+
 		<method name="GetDataType" description="returns the data type of the job data.">
 			<param name="DataType" type="enum" class="BuildJobDataType" pass="return" description="Data type of the job data" />	
 		</method>
 
+		<method name="GetDataTypeAsString" description="returns the data type of the job data as string.">
+			<param name="DataType" type="string" pass="return" description="Data type of the job data" />	
+		</method>
+
 		<method name="GetMIMEType" description="returns the mime type of a storage stream.">
 			<param name="MimeType" type="string" pass="return" description="Mime Type String" />	
 		</method>
@@ -607,6 +626,12 @@
 		<method name="ListJobData" description="Retrieves a list of build job data objects.">
 			<param name="IteratorInstance" type="class" class="BuildJobDataIterator" pass="return" description="Build Job Data Iterator Instance." />
 		</method>
+
+		<method name="RetrieveJobData" description="Retrieves a build job data instance by its uuid.">
+			<param name="DataUUID" type="string" pass="in" description="Job Data UUID." />	
+			<param name="BuildJobData" type="class" class="BuildJobData" pass="return" description="Build Job Data Instance." />
+		</method>
+
 
 	</class>
 
@@ -632,6 +657,11 @@
 			<param name="JobInstance" type="class" class="BuildJob" pass="return" description="Build Job Instance." />
 		</method>
 
+		<method name="FindJobOfData" description="Finds the parent build job of a given data uuid. Fails if data does not exist.">
+			<param name="DataUUID" type="string" pass="in" description="Job Data UUID." />	
+			<param name="BuildJobData" type="class" class="BuildJob" pass="return" description="Build Job Instance." />
+		</method>
+
 		<method name="ListJobsByStatus" description="Retrieves a list of build jobs, filtered by status.">
 			<param name="Status" type="enum" class="BuildJobStatus" pass="in" description="Job Status to list." />	
 			<param name="IteratorInstance" type="class" class="BuildJobIterator" pass="return" description="Build Job Iterator Instance." />
@@ -646,6 +676,7 @@
 			<param name="String" type="string" pass="in" description="String Identifier." />
 			<param name="Status" type="enum" class="BuildJobStatus" pass="return" description="Status Enum." />	
 		</method>
+
 
 	</class>
 

ACT/LibMCDriver.xml

@@ -59,6 +59,10 @@
 
 
 	<class name="Driver" parent="Base" description="An abstract Machine Control Driver">
+
+		<method name="Configure" description = "Configures a driver with its specific configuration data.">
+			<param name="ConfigurationString" type="string" pass="in" description="Configuration data of driver." />
+		</method>
 
 		<method name="GetName" description = "returns the name identifier of the driver">
 			<param name="Name" type="string" pass="return" description="Name of the driver." />

ACT/LibMCEnv.xml

@@ -61,8 +61,6 @@
 		<error name="INVALIDCHARACTERINFILENAME" code="20" description="invalid character in filename." />
 		<error name="WORKINGDIRECTORYHASBEENCLEANED" code="21" description="working directory has been cleaned." />
 		<error name="INVALIDITERATOR" code="22" description="invalid iterator." />
-
-
 
 	</errors>
 
@@ -82,6 +80,12 @@
 		<option name="StartDelay" value="5" />
 		<option name="EndDelay" value="6" />
 		<option name="PolyDelay" value="7" />
+		<option name="PolyDelayAngleDependent" value="8" />
+		<option name="LaserOnDelay" value="9" />
+		<option name="LaserOffDelay" value="10" />
+		<option name="JumpDelay" value="11" />
+		<option name="MarkDelay" value="12" />
+		<option name="LaserFocus" value="13" />
 	</enum>
 
 	<struct name="Position2D">
@@ -132,11 +136,13 @@
 		</method>
 
 		<method name="GetSegmentProfileValue" description="Retrieves an assigned profile custom value.">
+			<param name="Index" type="uint32" pass="in" description="Index. Must be between 0 and Count - 1." />
 			<param name="ValueName" type="string" pass="in" description="Value Name to query for." />
 			<param name="Value" type="string" pass="return" description="String Value." />
 		</method>
 
 		<method name="GetSegmentProfileTypedValue" description="Retrieves an assigned profile value of a standard type.">
+			<param name="Index" type="uint32" pass="in" description="Index. Must be between 0 and Count - 1." />
 			<param name="ValueType" type="enum" class="ToolpathProfileValueType" pass="in" description="Enum to query for. MUST NOT be custom." />
 			<param name="Value" type="double" pass="return" description="Double Value" />
 		</method>
@@ -274,7 +280,7 @@
 			<param name="FileDoesExist" type="bool" pass="return" description="returns if the file exists." />
 		</method>
 
-		<method name="DeleteFile" description = "Deletes the temporary file.">
+		<method name="DeleteFromDisk" description = "Deletes the temporary file.">
 			<param name="Success" type="bool" pass="return" description="returns if deletion was successful or file did not exist in the first place." />
 		</method>
 
@@ -347,6 +353,11 @@
 			<param name="DataBuffer" type="basicarray" class="uint8" pass="out" description="buffer data." />
 		</method>
 
+		<method name="CreateToolpathAccessor" description="Creates an accessor object for a toolpath. Toolpath MUST have been loaded into memory before.">
+			<param name="StreamUUID" type="string" pass="in" description="UUID of the stream." />
+			<param name="ToolpathInstance" type="class" class="ToolpathAccessor" pass="return" description="Toolpath instance." />
+		</method>
+
 
 		<method name="RegisterStringParameter" description="registers a string parameter. Must only be called during driver creation.">
 			<param name="ParameterName" type="string" pass="in" description="Parameter Name" />
@@ -404,6 +415,13 @@
 			<param name="Value" type="bool" pass="in" description="Value to set" />
 		</method>
 
+		<method name="Sleep" description="Puts the current instance to sleep for a definite amount of time. MUST be used instead of a blocking sleep call.">
+			<param name="Delay" type="uint32" pass="in" description="Milliseconds to sleeps" />
+		</method>
+
+		<method name="GetGlobalTimerInMilliseconds" description="Returns the global timer in milliseconds.">
+			<param name="TimerValue" type="uint64" pass="return" description="Timer value in Milliseconds" />
+		</method>
 
 	</class>
 
@@ -692,6 +710,11 @@
 		</method>
 
 
+		<method name="LoadResourceData" description="loads a plugin resource file into memory.">
+			<param name="ResourceName" type="string" pass="in" description="Name of the resource." />
+			<param name="ResourceData" type="basicarray" class="uint8" pass="out" description="Resource Data Buffer." />
+		</method>
+
 
 	</class>
 

CMakeLists.txt

@@ -112,6 +112,61 @@ set(LIBMC_SRC
   ${LIBMC_SRC_DEP_CROSSGUID}
 )
 
+add_custom_target(copy_framework ALL)
+
+file (GLOB framework_files_dev LIST_DIRECTORIES false "${CMAKE_CURRENT_SOURCE_DIR}/Framework/HeadersDev/CppDynamic/*.*")
+foreach(framework_file_dev ${framework_files_dev})
+
+	get_filename_component(framework_file_devname ${framework_file_dev} NAME)
+
+	add_custom_command(
+        TARGET copy_framework PRE_BUILD
+        COMMAND ${CMAKE_COMMAND} -E echo "copying ${framework_file_dev}...")
+
+	add_custom_command(
+        TARGET copy_framework PRE_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy
+                ${framework_file_dev}
+                ${CMAKE_CURRENT_BINARY_DIR}/Framework/HeadersDev/CppDynamic/${framework_file_devname})
+
+
+endforeach()
+
+
+file (GLOB framework_files_intfdev LIST_DIRECTORIES false "${CMAKE_CURRENT_SOURCE_DIR}/Framework/InterfacesDev/*.*")
+foreach(framework_file_intfdev ${framework_files_intfdev})
+
+	get_filename_component(framework_file_intfdevname ${framework_file_intfdev} NAME)
+
+	add_custom_command(
+        TARGET copy_framework PRE_BUILD
+        COMMAND ${CMAKE_COMMAND} -E echo "copying ${framework_file_intfdev}...")
+
+	add_custom_command(
+        TARGET copy_framework PRE_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy
+                ${framework_file_intfdev}
+                ${CMAKE_CURRENT_BINARY_DIR}/Framework/InterfacesDev/${framework_file_intfdevname})				
+
+endforeach()
+
+
+file (GLOB framework_files_plugincpp LIST_DIRECTORIES false "${CMAKE_CURRENT_SOURCE_DIR}/Framework/PluginCpp/*.*")
+foreach(framework_file_plugincpp ${framework_files_plugincpp})
+
+	get_filename_component(framework_file_plugincppname ${framework_file_plugincpp} NAME)
+
+	add_custom_command(
+        TARGET copy_framework PRE_BUILD
+        COMMAND ${CMAKE_COMMAND} -E echo "copying ${framework_file_plugincpp}...")
+
+	add_custom_command(
+        TARGET copy_framework PRE_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy
+                ${framework_file_plugincpp}
+                ${CMAKE_CURRENT_BINARY_DIR}/Framework/PluginCpp/${framework_file_plugincppname})				
+
+endforeach()
 
 add_library(libmc SHARED ${LIBMC_SRC})
 # Do not prefix the binary's name with "lib" on Unix systems:
@@ -187,12 +242,18 @@ set_target_properties(libmcdata PROPERTIES CXX_VISIBILITY_PRESET hidden)
 set_target_properties(libmcdata PROPERTIES VISIBILITY_INLINES_HIDDEN ON)
 
 if(WIN32)
-target_link_libraries(libmc Winmm.lib)
-target_link_libraries(libmc Shlwapi.lib)
 
-target_link_libraries(libmcdata Winmm.lib)
-target_link_libraries(libmcdata Shlwapi.lib)
-target_link_libraries(libmcdata ${CMAKE_CURRENT_SOURCE_DIR}/Libraries/SQLite/sqlite3.lib)
+if (MSVC)
+	target_link_libraries(libmc Winmm.lib)
+	target_link_libraries(libmc Shlwapi.lib)
+	target_link_libraries(libmcdata Winmm.lib)
+	target_link_libraries(libmcdata Shlwapi.lib)
+	target_link_libraries(libmcdata ${CMAKE_CURRENT_SOURCE_DIR}/Libraries/SQLite/sqlite3.lib)
+else()
+	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Libraries/SQLite)
+	target_link_libraries(libmcdata SQLite3)
+endif (MSVC)
+
 elseif(UNIX AND NOT APPLE)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/Libraries/SQLite)
 target_link_libraries(libmcdata SQLite3)