From d700430333b5713f0e63893f918a8c6a754be52f Mon Sep 17 00:00:00 2001 From: szporowolik Date: Mon, 23 Dec 2019 14:04:21 +0100 Subject: [PATCH 1/3] v0.9.4 configuration --- 01_DCS/Hooks/Perun.lua | 2 +- 02_Windows_App/Perun_v1/Perun_v1.csproj | 2 +- 02_Windows_App/Perun_v1/Properties/AssemblyInfo.cs | 6 +++--- 03_MySQL/m1081_perun.sql | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/01_DCS/Hooks/Perun.lua b/01_DCS/Hooks/Perun.lua index 41e1224..e522cdb 100644 --- a/01_DCS/Hooks/Perun.lua +++ b/01_DCS/Hooks/Perun.lua @@ -22,7 +22,7 @@ Perun.MOTD_L2 = "Wymagamy obecnosci DCS SRS oraz TeamSpeak - szczegoly na forum" -- ###################### END OF SETTINGS - DO NOT MODIFY OUTSIDE THIS SECTION ###################### -- Variable init -Perun.Version = "v0.9.3" +Perun.Version = "v0.9.4" Perun.StatusData = {} Perun.SlotsData = {} Perun.MissionData = {} diff --git a/02_Windows_App/Perun_v1/Perun_v1.csproj b/02_Windows_App/Perun_v1/Perun_v1.csproj index 781def6..0979de2 100644 --- a/02_Windows_App/Perun_v1/Perun_v1.csproj +++ b/02_Windows_App/Perun_v1/Perun_v1.csproj @@ -32,7 +32,7 @@ Perun Perun.htm 0 - 0.9.3.%2a + 0.9.4.%2a false true true diff --git a/02_Windows_App/Perun_v1/Properties/AssemblyInfo.cs b/02_Windows_App/Perun_v1/Properties/AssemblyInfo.cs index f481289..a8d3607 100644 --- a/02_Windows_App/Perun_v1/Properties/AssemblyInfo.cs +++ b/02_Windows_App/Perun_v1/Properties/AssemblyInfo.cs @@ -11,7 +11,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Szymon Porwolik")] [assembly: AssemblyProduct("Perun for DCS World")] -[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyCopyright("Copyright © 2019-2020")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -33,7 +33,7 @@ using System.Runtime.InteropServices; // Możesz określić wszystkie wartości lub użyć domyślnych numerów kompilacji i poprawki // przy użyciu symbolu „*”, tak jak pokazano poniżej: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.9.3.0")] -[assembly: AssemblyFileVersion("0.9.3.0")] +[assembly: AssemblyVersion("0.9.4.0")] +[assembly: AssemblyFileVersion("0.9.4.0")] [assembly: NeutralResourcesLanguage("en")] diff --git a/03_MySQL/m1081_perun.sql b/03_MySQL/m1081_perun.sql index e4265f4..03ff206 100644 --- a/03_MySQL/m1081_perun.sql +++ b/03_MySQL/m1081_perun.sql @@ -17,7 +17,7 @@ CREATE TABLE IF NOT EXISTS `pe_Config` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `pe_Config` (`pe_Config_id`, `pe_Config_payload`) VALUES -(1, 'v0.9.3'); +(1, 'v0.9.4'); DROP TABLE IF EXISTS `pe_DataMissionHashes`; CREATE TABLE IF NOT EXISTS `pe_DataMissionHashes` ( From 1540615814ced1be3aeffe4e28bc029efb64b81d Mon Sep 17 00:00:00 2001 From: szporowolik Date: Mon, 23 Dec 2019 14:21:14 +0100 Subject: [PATCH 2/3] Fix for double quotes after adding parameters. --- 02_Windows_App/Perun_v1/01_Classes/DatabaseController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/02_Windows_App/Perun_v1/01_Classes/DatabaseController.cs b/02_Windows_App/Perun_v1/01_Classes/DatabaseController.cs index dc15e24..05da437 100644 --- a/02_Windows_App/Perun_v1/01_Classes/DatabaseController.cs +++ b/02_Windows_App/Perun_v1/01_Classes/DatabaseController.cs @@ -90,7 +90,7 @@ public class DatabaseController SQLQueryTxt = "INSERT INTO `pe_DataRaw` (`pe_dataraw_type`,`pe_dataraw_instance`) SELECT '" + TCPFrameType + "','" + TCPFrameInstance + "' FROM DUAL WHERE NOT EXISTS (SELECT * FROM `pe_DataRaw` WHERE `pe_dataraw_type` = '" + TCPFrameType + "' AND `pe_dataraw_instance` = " + TCPFrameInstance + ");"; - SQLQueryTxt += "UPDATE `pe_DataRaw` SET `pe_dataraw_payload` = JSON_QUOTE(@PAR_TCPFramePayload), `pe_dataraw_updated`=" + TCPFrameTimestamp + " WHERE `pe_dataraw_type`=" + TCPFrameType + " AND `pe_dataraw_instance` = " + TCPFrameInstance + ";"; + SQLQueryTxt += "UPDATE `pe_DataRaw` SET `pe_dataraw_payload` = @PAR_TCPFramePayload, `pe_dataraw_updated`=" + TCPFrameTimestamp + " WHERE `pe_dataraw_type`=" + TCPFrameType + " AND `pe_dataraw_instance` = " + TCPFrameInstance + ";"; } // Connect to mysql and execute sql From 7b75eba79bc2739dac0718f08b12d736fb8557ac Mon Sep 17 00:00:00 2001 From: szporowolik Date: Sat, 2 May 2020 23:14:21 +0200 Subject: [PATCH 3/3] Fixed SRS export for SimpleRadioStandalone-1.8.0.2.zip --- 02_Windows_App/Perun_v1/02_Forms/form_Main.cs | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/02_Windows_App/Perun_v1/02_Forms/form_Main.cs b/02_Windows_App/Perun_v1/02_Forms/form_Main.cs index d7504ca..e3c3c16 100644 --- a/02_Windows_App/Perun_v1/02_Forms/form_Main.cs +++ b/02_Windows_App/Perun_v1/02_Forms/form_Main.cs @@ -515,25 +515,12 @@ namespace Perun_v1 int temp = raw_lotatc.Clients[i].RadioInfo.radios.Count - 1; for (int j = temp; j >= 0; j--) { - raw_lotatc.Clients[i].RadioInfo.radios[j].enc.Parent.Remove(); - raw_lotatc.Clients[i].RadioInfo.radios[j].encKey.Parent.Remove(); - raw_lotatc.Clients[i].RadioInfo.radios[j].encMode.Parent.Remove(); - raw_lotatc.Clients[i].RadioInfo.radios[j].freqMax.Parent.Remove(); - raw_lotatc.Clients[i].RadioInfo.radios[j].freqMin.Parent.Remove(); - raw_lotatc.Clients[i].RadioInfo.radios[j].modulation.Parent.Remove(); - raw_lotatc.Clients[i].RadioInfo.radios[j].freqMode.Parent.Remove(); - raw_lotatc.Clients[i].RadioInfo.radios[j].volMode.Parent.Remove(); - raw_lotatc.Clients[i].RadioInfo.radios[j].expansion.Parent.Remove(); - raw_lotatc.Clients[i].RadioInfo.radios[j].channel.Parent.Remove(); - raw_lotatc.Clients[i].RadioInfo.radios[j].simul.Parent.Remove(); if (raw_lotatc.Clients[i].RadioInfo.radios[j].name == "No Radio") { raw_lotatc.Clients[i].RadioInfo.radios[j].Remove(); } } - raw_lotatc.Clients[i].ClientChannelId.Parent.Remove(); - raw_lotatc.Clients[i].RadioInfo.simultaneousTransmission.Parent.Remove(); } }