Skip to content

Commit

Permalink
Fixed sensors and resources not working
Browse files Browse the repository at this point in the history
  • Loading branch information
Brandon Frie committed Apr 7, 2020
1 parent 9246c69 commit 59fe22f
Show file tree
Hide file tree
Showing 9 changed files with 7,866 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Telemachus/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.5.0")]
[assembly: AssemblyFileVersion("1.5.0")]
[assembly: AssemblyVersion("1.7.0")]
[assembly: AssemblyFileVersion("1.7.0")]
9 changes: 6 additions & 3 deletions Telemachus/Telemachus.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@
<Reference Include="UnityEngine.UnityWebRequestWWWModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\ksp-telemachus-dev\KSP_Data\Managed\UnityEngine.UnityWebRequestWWWModule.dll</HintPath>
</Reference>
<Reference Include="websocket-sharp">
<HintPath>..\websocket-sharp.dll</HintPath>
</Reference>
<Reference Include="UnityEngine">
<HintPath>..\references\UnityEngine.dll</HintPath>
</Reference>
Expand All @@ -75,6 +72,9 @@
<Reference Include="Assembly-CSharp-firstpass">
<HintPath>..\references\Assembly-CSharp-firstpass.dll</HintPath>
</Reference>
<Reference Include="websocket-sharp, Version=1.0.2.59611, Culture=neutral, PublicKeyToken=5660b08a1845a91e, processorArchitecture=MSIL">
<HintPath>..\packages\WebSocketSharp.1.0.3-rc11\lib\websocket-sharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\Resources.Designer.cs">
Expand Down Expand Up @@ -118,6 +118,9 @@
<Content Include="AfterBuild.bat" />
<Content Include="AfterBuild.sh" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
4 changes: 4 additions & 0 deletions Telemachus/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="WebSocketSharp" version="1.0.3-rc11" targetFramework="net472" />
</packages>
8 changes: 4 additions & 4 deletions Telemachus/src/DataLinkHandlers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2039,7 +2039,7 @@ public Vessel vessel
set {
if (theVessel == value) return;
theVessel = value;
if (VesselPropertyChanged != null) VesselPropertyChanged(this, EventArgs.Empty);
VesselPropertyChanged?.Invoke(this, EventArgs.Empty);
}
}

Expand All @@ -2057,7 +2057,7 @@ public Vessel vessel

public List<T> get(DataSources dataSources)
{
string ID = dataSources.args[0];
string ID = dataSources.args[0].ToLowerInvariant();
List<T> avail = null, ret = null;

lock (cacheLock)
Expand Down Expand Up @@ -2249,9 +2249,9 @@ protected override void refresh(Vessel vessel)
{
if (!partModules.ContainsKey(module.sensorType.ToString()))
{
partModules[module.sensorType.ToString()] = new List<ModuleEnviroSensor>();
partModules[module.sensorType.ToString().ToLowerInvariant()] = new List<ModuleEnviroSensor>();
}
partModules[module.sensorType.ToString()].Add(module);
partModules[module.sensorType.ToString().ToLowerInvariant()].Add(module);
}
}
}
Expand Down
Binary file added packages/WebSocketSharp.1.0.3-rc11/.signature.p7s
Binary file not shown.
Binary file not shown.
Binary file not shown.
7,850 changes: 7,850 additions & 0 deletions packages/WebSocketSharp.1.0.3-rc11/lib/websocket-sharp.xml

Large diffs are not rendered by default.

Binary file removed websocket-sharp.dll
Binary file not shown.

0 comments on commit 59fe22f

Please sign in to comment.