From 6730f75f5c7e6bb810507d39f86a655cf6b4fd62 Mon Sep 17 00:00:00 2001 From: DMagic Date: Wed, 10 Aug 2016 19:53:14 -0400 Subject: [PATCH 1/4] Version --- SCANassets/SCANsat.version | 2 +- SCANmechjeb/Properties/AssemblyInfo.cs | 6 +++--- SCANsat/Properties/AssemblyInfo.cs | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SCANassets/SCANsat.version b/SCANassets/SCANsat.version index 52f376381..a1618e3d2 100644 --- a/SCANassets/SCANsat.version +++ b/SCANassets/SCANsat.version @@ -11,7 +11,7 @@ "MAJOR":1, "MINOR":1, "PATCH":6, - "BUILD":4 + "BUILD":5 }, "KSP_VERSION":{ "MAJOR":1, diff --git a/SCANmechjeb/Properties/AssemblyInfo.cs b/SCANmechjeb/Properties/AssemblyInfo.cs index 48c203b49..cd50d170f 100644 --- a/SCANmechjeb/Properties/AssemblyInfo.cs +++ b/SCANmechjeb/Properties/AssemblyInfo.cs @@ -32,9 +32,9 @@ // 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.6.0.4")] -[assembly: AssemblyFileVersion("1.6.0.4")] -[assembly: AssemblyInformationalVersion ("v16.4")] +[assembly: AssemblyVersion("1.6.0.5")] +[assembly: AssemblyFileVersion("1.6.0.5")] +[assembly: AssemblyInformationalVersion ("v16.5")] [assembly: KSPAssembly ("SCANmechjeb", 0, 4)] [assembly: KSPAssemblyDependency ("SCANsat", 1, 6)] diff --git a/SCANsat/Properties/AssemblyInfo.cs b/SCANsat/Properties/AssemblyInfo.cs index 66210f797..9ed8173f4 100644 --- a/SCANsat/Properties/AssemblyInfo.cs +++ b/SCANsat/Properties/AssemblyInfo.cs @@ -14,9 +14,9 @@ // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion ("1.6.0.4")] -[assembly: AssemblyFileVersion ("1.6.0.4")] -[assembly: AssemblyInformationalVersion ("v16.4")] +[assembly: AssemblyVersion ("1.6.0.5")] +[assembly: AssemblyFileVersion ("1.6.0.5")] +[assembly: AssemblyInformationalVersion ("v16.5")] [assembly: KSPAssembly ("SCANsat", 1, 6)] From 8b60e075db7327360a5598495c2fc54afdab8534 Mon Sep 17 00:00:00 2001 From: DMagic Date: Wed, 10 Aug 2016 19:53:22 -0400 Subject: [PATCH 2/4] Changes --- SCANsat/CHANGELOG.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SCANsat/CHANGELOG.txt b/SCANsat/CHANGELOG.txt index 3d7348a1f..ff63f558d 100644 --- a/SCANsat/CHANGELOG.txt +++ b/SCANsat/CHANGELOG.txt @@ -1,3 +1,8 @@ +Version 16.5 - 2016-8-10 +------------------------ + +- Fix bug in electricity usage that was preventing scanning + Version 16.4 - 2016-8-9 ------------------------ From b360ed0f09c4b330e2f6b29ce45555208988b7a9 Mon Sep 17 00:00:00 2001 From: DMagic Date: Wed, 10 Aug 2016 19:54:30 -0400 Subject: [PATCH 3/4] Fix resource usage rounding errors; fix #231; remoce GetInfo string extra lines --- SCANsat/SCAN_PartModules/SCANsat.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/SCANsat/SCAN_PartModules/SCANsat.cs b/SCANsat/SCAN_PartModules/SCANsat.cs index a99a5fca5..8fc6db75a 100644 --- a/SCANsat/SCAN_PartModules/SCANsat.cs +++ b/SCANsat/SCAN_PartModules/SCANsat.cs @@ -170,11 +170,13 @@ protected virtual void FixedUpdate() ModuleResource resource = resourceInputs[i]; resource.currentRequest = resource.rate * TimeWarp.fixedDeltaTime; resource.currentAmount = part.RequestResource(resource.id, resource.currentRequest); - if (resource.currentAmount < resource.currentRequest) + if (resource.currentAmount < resource.currentRequest * 0.9) { unregisterScanner(); powerIsProblem = true; powerTimer = 0; + SCANUtil.SCANlog("Power is problem [{0}]", (SCANtype)sensorType); + SCANUtil.SCANlog("Current Request: {0:N3} - Current Amount: {1:N3}", resource.currentRequest, resource.currentAmount); break; } else @@ -244,9 +246,9 @@ public override string GetInfo() if (max_alt != 0) str += "Altitude ( max): " + (max_alt / 1000).ToString("F0") + " km\n"; if (fov != 0) - str += "FOV: " + fov.ToString("F0") + " °\n"; + str += "FOV: " + fov.ToString("F0") + " °"; if (resourceInputs.Count > 0) - str += PartModuleUtil.PrintResourceRequirements("Requires:", resourceInputs.ToArray()); + str += PartModuleUtil.PrintResourceRequirements("Requires:", resourceInputs.ToArray()) + "\n"; return str; } From 46d64b6cf993982eab9e9d461c46805a4288b91f Mon Sep 17 00:00:00 2001 From: DMagic Date: Wed, 10 Aug 2016 19:56:10 -0400 Subject: [PATCH 4/4] Remove log entries --- SCANsat/SCAN_PartModules/SCANsat.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/SCANsat/SCAN_PartModules/SCANsat.cs b/SCANsat/SCAN_PartModules/SCANsat.cs index 8fc6db75a..02f210b9d 100644 --- a/SCANsat/SCAN_PartModules/SCANsat.cs +++ b/SCANsat/SCAN_PartModules/SCANsat.cs @@ -175,8 +175,6 @@ protected virtual void FixedUpdate() unregisterScanner(); powerIsProblem = true; powerTimer = 0; - SCANUtil.SCANlog("Power is problem [{0}]", (SCANtype)sensorType); - SCANUtil.SCANlog("Current Request: {0:N3} - Current Amount: {1:N3}", resource.currentRequest, resource.currentAmount); break; } else