Merge pull request #3 from BitsAndDroids/dev

moved wasm registration to the frontend

WASM_Module_BitsAndDroids/MSFS/Debug/WASM_Mod.A5468B35.tlog/Cl.items.tlog

@@ -0,0 +1 @@
+E:\BitsAndDroids\WASM\Bits-and-Droids-WASM-module\WASM_Module_BitsAndDroids\WASM_Module_BitsAndDroids.cpp;E:\BitsAndDroids\WASM\Bits-and-Droids-WASM-module\WASM_Module_BitsAndDroids\MSFS\Debug\WASM_Module_BitsAndDroids.obj

WASM_Module_BitsAndDroids/MSFS/Debug/WASM_Mod.A5468B35.tlog/WASM_Module_BitsAndDroids.lastbuildstate

@@ -1,2 +1,2 @@
-PlatformToolSet=MSFS:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.19041.0:
-Debug|MSFS|C:\Users\Dave Riedel\source\repos\WASM_Module_BitsAndDroids\|
+PlatformToolSet=MSFS:VCToolArchitecture=Native32Bit:VCToolsVersion=14.39.33519:TargetPlatformVersion=10.0.22621.0:
+Debug|MSFS|E:\BitsAndDroids\WASM\Bits-and-Droids-WASM-module\|

WASM_Module_BitsAndDroids/MSFS/Debug/WASM_Module_BitsAndDroids.wasm.recipe

@@ -2,7 +2,7 @@
 <Project>
   <ProjectOutputs>
     <ProjectOutput>
-      <FullPath>C:\Users\Dave Riedel\source\repos\WASM_Module_BitsAndDroids\MSFS\Debug\WASM_Module_BitsAndDroids.wasm</FullPath>
+      <FullPath>E:\BitsAndDroids\WASM\Bits-and-Droids-WASM-module\MSFS\Debug\WASM_Module_BitsAndDroids.wasm</FullPath>
     </ProjectOutput>
   </ProjectOutputs>
   <ContentFiles />

WASM_Module_BitsAndDroids/MSFS/Release/WASM_Mod.A5468B35.tlog/Cl.items.tlog

@@ -0,0 +1 @@
+E:\BitsAndDroids\WASM\Bits-and-Droids-WASM-module\WASM_Module_BitsAndDroids\WASM_Module_BitsAndDroids.cpp;E:\BitsAndDroids\WASM\Bits-and-Droids-WASM-module\WASM_Module_BitsAndDroids\MSFS\Release\WASM_Module_BitsAndDroids.obj

WASM_Module_BitsAndDroids/MSFS/Release/WASM_Mod.A5468B35.tlog/WASM_Module_BitsAndDroids.lastbuildstate

@@ -1,2 +1,2 @@
-PlatformToolSet=MSFS:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:VCServicingVersionATL=14.29.30136:VCServicingVersionCrtHeaders=14.29.30136:VCServicingVersionCompilers=14.29.30136:TargetPlatformVersion=10.0.19041.0:
-Release|MSFS|C:\Users\Dave Riedel\source\repos\WASM_Module_BitsAndDroids\|
+PlatformToolSet=MSFS:VCToolArchitecture=Native32Bit:VCToolsVersion=14.39.33519:TargetPlatformVersion=10.0.22621.0:
+Release|MSFS|E:\BitsAndDroids\WASM\Bits-and-Droids-WASM-module\|

WASM_Module_BitsAndDroids/MSFS/Release/WASM_Module_BitsAndDroids.wasm.recipe

@@ -2,7 +2,7 @@
 <Project>
   <ProjectOutputs>
     <ProjectOutput>
-      <FullPath>C:\Users\Dave Riedel\source\repos\WASM_Module_BitsAndDroids\MSFS\Release\WASM_Module_BitsAndDroids.wasm</FullPath>
+      <FullPath>E:\BitsAndDroids\WASM\Bits-and-Droids-WASM-module\MSFS\Release\WASM_Module_BitsAndDroids.wasm</FullPath>
     </ProjectOutput>
   </ProjectOutputs>
   <ContentFiles />

WASM_Module_BitsAndDroids/WASM_Module_BitsAndDroids.cpp

@@ -115,52 +115,8 @@ void register_event(std::string event_message)
 		std::cout << "Adding event to inputs " << event.id << " " << event.action.c_str() << std::endl;
 		wasmEvents.insert({ event.id, event });
 	}
-
-
 }
-void readEventFile()
-{
-	std::cout << "reading event file" << std::endl;
-	FILE* fp = fopen(relativeJSONEventFilePath, "rb");
-	char readBuffer[65536];
-	FileReadStream is(fp, readBuffer, sizeof(readBuffer));
-
-	Document d;
-	if (d.ParseStream(is).HasParseError())
-	{
-		fprintf(stderr, "Error parsing input event json");
-	}
-	fclose(fp);
 
-	const Value& event_array = d["events"];
-	if (!event_array.IsArray())
-	{
-		fprintf(stderr, "Invalid JSON format - 'events' is not an array");
-	}
-	int event_counter = 0;
-	for (const Value& event : event_array.GetArray())
-	{
-		WASMEvent event_found = {
-			event["id"].GetInt(),
-			event["action"].GetString(),
-			event["action_text"].GetString(),
-			event["action_type"].GetString(),
-			event["output_format"].GetString(),
-			event["update_every"].GetFloat(),
-			event["min"].GetFloat(),
-			event["max"].GetFloat(),
-			0.0,
-			sizeof(float) * event_counter
-		};
-		event_counter++;
-		if(event_found.action_type != "input")
-		{
-			return;
-		}
-		wasmEvents.insert({event_found.id, event_found});
-		std::cout << "Added event: " << event_found.id << " " << event_found.action << " as output" << std::endl;
-	}
-}
 void clear_sim_vars()
 {
 	for (auto& event : registeredWASMEvents)
@@ -267,7 +223,6 @@ void CALLBACK myDispatchHandler(SIMCONNECT_RECV* pData, DWORD cbData,
 				if (event_found.id == 9999)
 				{
 					wasmEvents.clear();
-					readEventFile();
 					break;
 				}
 				if (prefix == 9998)
@@ -380,8 +335,6 @@ extern "C" MSFS_CALLBACK void module_init(void)
 		                                     SIMCONNECT_CLIENTDATAOFFSET_AUTO, 256,
 		                                     0);
 
-		readEventFile();
-
 		// COMMANDS
 		SimConnect_MapClientDataNameToID(hSimConnect, "command_client", commandCLientDataID);
 		SimConnect_CreateClientData(hSimConnect, commandCLientDataID, 4096, SIMCONNECT_CLIENT_DATA_REQUEST_FLAG_DEFAULT);