added the function to recognize DCS world

opiopan · Aug 3, 2024 · 291cf30 · 291cf30
1 parent 9403aae
commit 291cf30
Show file tree

Hide file tree

Showing 10 changed files with 369 additions and 17 deletions.
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
@@ -215,6 +215,7 @@ copy $(SolutionDir)..\modules\vJoySDK\SDK\lib\amd64\vJoyInterface.dll $(TargetDi
     <ClInclude Include="builtinDevices\simhidparser.h" />
     <ClInclude Include="builtinDevices\winserial.h" />
     <ClInclude Include="capturedwindow.h" />
+    <ClInclude Include="dcs.h" />
     <ClInclude Include="device.h" />
     <ClInclude Include="devicemodifier.h" />
     <ClInclude Include="engine.h" />
@@ -247,6 +248,7 @@ copy $(SolutionDir)..\modules\vJoySDK\SDK\lib\amd64\vJoyInterface.dll $(TargetDi
     <ClCompile Include="builtinDevices\simhidparser.c" />
     <ClCompile Include="builtinDevices\winserial.cpp" />
     <ClCompile Include="capturedwindow.cpp" />
+    <ClCompile Include="dcs.cpp" />
     <ClCompile Include="device.cpp" />
     <ClCompile Include="devicemodifier.cpp" />
     <ClCompile Include="dllmain.cpp" />
@@ -281,11 +283,6 @@ copy $(SolutionDir)..\modules\vJoySDK\SDK\lib\amd64\vJoyInterface.dll $(TargetDi
       <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)dcs-exporter</DestinationFolders>
       <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)dcs-exporter</DestinationFolders>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="dcs-exporter\config.lua">
-      <FileType>Document</FileType>
-      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)dcs-exporter</DestinationFolders>
-      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)dcs-exporter</DestinationFolders>
-    </CopyFileToFolders>
     <CopyFileToFolders Include="dcs-exporter\fsmapper\common.lua">
       <FileType>Document</FileType>
       <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)dcs-exporter\fsmapper</DestinationFolders>
@@ -296,6 +293,11 @@ copy $(SolutionDir)..\modules\vJoySDK\SDK\lib\amd64\vJoyInterface.dll $(TargetDi
       <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)dcs-exporter\fsmapper</DestinationFolders>
       <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)dcs-exporter\fsmapper</DestinationFolders>
     </CopyFileToFolders>
+    <CopyFileToFolders Include="dcs-exporter\fsmapper_config.lua">
+      <FileType>Document</FileType>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)dcs-exporter</DestinationFolders>
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)dcs-exporter</DestinationFolders>
+    </CopyFileToFolders>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters
@@ -108,6 +108,9 @@
     <ClInclude Include="plugin.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="dcs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">
@@ -197,6 +200,9 @@
     <ClCompile Include="plugin.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="dcs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
@@ -210,14 +216,14 @@
     <CopyFileToFolders Include="dcs-exporter\fsmapper.lua">
       <Filter>DCS Exporter</Filter>
     </CopyFileToFolders>
-    <CopyFileToFolders Include="dcs-exporter\config.lua">
-      <Filter>DCS Exporter</Filter>
-    </CopyFileToFolders>
     <CopyFileToFolders Include="dcs-exporter\fsmapper\common.lua">
       <Filter>DCS Exporter</Filter>
     </CopyFileToFolders>
     <CopyFileToFolders Include="dcs-exporter\fsmapper\protocol.lua">
       <Filter>DCS Exporter</Filter>
     </CopyFileToFolders>
+    <CopyFileToFolders Include="dcs-exporter\fsmapper_config.lua">
+      <Filter>DCS Exporter</Filter>
+    </CopyFileToFolders>
   </ItemGroup>
 </Project>
diff --git a/src/core/dcs-exporter/fsmapper.lua b/src/core/dcs-exporter/fsmapper.lua
@@ -12,7 +12,7 @@ if is_fsmapper_exporter_initialized ~= true then
 
     log.write('FSMAPPER.LUA',log.INFO,'Starting ['..fsmapper.scriptpath..']')
 
-    dofile(fsmapper.scriptdir .. 'config.lua')
+    dofile(fsmapper.scriptdir .. 'fsmapper_config.lua')
     fsmapper.protocol = require('fsmapper/protocol')
 
     --===========================================================================================

diff --git a/src/core/dcs-exporter/fsmapper/protocol.lua b/src/core/dcs-exporter/fsmapper/protocol.lua
@@ -21,7 +21,7 @@ protocol.connection = {
     end,
 
     send = function (self, data)
-        tbuf = tbuf .. data
+        self.tbuf = self.tbuf .. data
     end,
 
     receive_and_dispatch = function (self)
@@ -49,9 +49,9 @@ protocol.connection = {
     end,
 
     flush = function (self)
-        local sent, err = sock:send(self.tbuf)
+        local sent, err = self.sock:send(self.tbuf)
         if sent and sent > 0 then
-            self.tbuf = self.tbuf(sent + 1)
+            self.tbuf = self.tbuf:sub(sent + 1)
         elseif err == 'closed' then
             self.is_enabled = false
             return false
@@ -121,9 +121,9 @@ protocol.server = {
 
         local new_endpoint = self.listener:accept()
         if new_endpoint then
-            endpoint:settimeout(0)
+            new_endpoint:settimeout(0)
             local new_client = protocol.fsmapper_client.new(new_endpoint)
-            client:change_aircraft(self.aircraft_name)
+            new_client:change_aircraft(self.aircraft_name)
             self.clients[#self.clients + 1] = new_client
             log.write('FSMAPPER.LUA', log.INFO, 'A connection with fsmapper has been established')
         end

diff --git a/src/core/dcs-exporter/config.lua → src/core/dcs-exporter/fsmapper_config.lua b/src/core/dcs-exporter/config.lua → src/core/dcs-exporter/fsmapper_config.lua