Fix: WiFi IP address was not saved

c0pperdragon · Jun 17, 2015 · 86db521 · 86db521
1 parent 81b0e5f
commit 86db521
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 43 deletions.
diff --git a/Documentation/Resources/Manual.txt b/Documentation/Resources/Manual.txt
@@ -237,7 +237,7 @@ use the "WiFi" button in the dialog box that asks for which connection to use. T
 was shown on the brick. You only have to enter the address once. For future uses, it will already appear in
 the selection list.
 <P>
-Note, that the brick does no automatically connect to the WiFi router when starting up. You always have to 
+Note, that the brick does not automatically connect to the WiFi router when starting up. You always have to 
 activate the connection after each power-up.
 
 <H1 class="chapter">Motor object since v1.0</H1>

diff --git a/EV3BasicInstaller/EV3BasicInstaller.vdproj b/EV3BasicInstaller/EV3BasicInstaller.vdproj
@@ -46,13 +46,13 @@
         "Entry"
         {
         "MsmKey" = "8:_53D194D021287DC4A1CE4CA14B8AB761"
-        "OwnerKey" = "8:_DB7CB564A6834BB59654A37073F3E2F6"
+        "OwnerKey" = "8:_4FD91A8516934B519CEFABDCAB429EEB"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_53D194D021287DC4A1CE4CA14B8AB761"
-        "OwnerKey" = "8:_4FD91A8516934B519CEFABDCAB429EEB"
+        "OwnerKey" = "8:_DB7CB564A6834BB59654A37073F3E2F6"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -106,49 +106,49 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_DB7CB564A6834BB59654A37073F3E2F6"
+        "OwnerKey" = "8:_53D194D021287DC4A1CE4CA14B8AB761"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_CBDEC7B60E90E4F596B1D9E3A38786F4"
+        "OwnerKey" = "8:_F5CDD074D58C3554E666A5E4C4C3A927"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_3FB6F29BDB75B4EA09B1C22FDB977915"
+        "OwnerKey" = "8:_21B8D95FCB7B43E883F73B9387BB339E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_4FD91A8516934B519CEFABDCAB429EEB"
+        "OwnerKey" = "8:_2303BCFBEC09CC552C1787A745096EA5"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_2303BCFBEC09CC552C1787A745096EA5"
+        "OwnerKey" = "8:_4FD91A8516934B519CEFABDCAB429EEB"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_21B8D95FCB7B43E883F73B9387BB339E"
+        "OwnerKey" = "8:_3FB6F29BDB75B4EA09B1C22FDB977915"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_F5CDD074D58C3554E666A5E4C4C3A927"
+        "OwnerKey" = "8:_CBDEC7B60E90E4F596B1D9E3A38786F4"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_53D194D021287DC4A1CE4CA14B8AB761"
+        "OwnerKey" = "8:_DB7CB564A6834BB59654A37073F3E2F6"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -253,11 +253,6 @@
             "AssemblyAsmDisplayName" = "8:SmallBasicLibrary, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_2303BCFBEC09CC552C1787A745096EA5"
-                    {
-                    "Name" = "8:SmallBasicLibrary.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:SmallBasicLibrary.dll"
             "TargetName" = "8:"
@@ -284,11 +279,6 @@
             "AssemblyAsmDisplayName" = "8:EV3BasicCompiler, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_3FB6F29BDB75B4EA09B1C22FDB977915"
-                    {
-                    "Name" = "8:EV3BasicCompiler.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:EV3BasicCompiler.dll"
             "TargetName" = "8:"
@@ -315,11 +305,6 @@
             "AssemblyAsmDisplayName" = "8:EV3Communication, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_53D194D021287DC4A1CE4CA14B8AB761"
-                    {
-                    "Name" = "8:EV3Communication.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:EV3Communication.dll"
             "TargetName" = "8:"
@@ -366,11 +351,6 @@
             "AssemblyAsmDisplayName" = "8:LMSAssembler, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_CBDEC7B60E90E4F596B1D9E3A38786F4"
-                    {
-                    "Name" = "8:LMSAssembler.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:LMSAssembler.dll"
             "TargetName" = "8:"
@@ -397,11 +377,6 @@
             "AssemblyAsmDisplayName" = "8:SmallBasicLibrary, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
-                    "_F5CDD074D58C3554E666A5E4C4C3A927"
-                    {
-                    "Name" = "8:SmallBasicLibrary.dll"
-                    "Attributes" = "3:512"
-                    }
                 }
             "SourcePath" = "8:SmallBasicLibrary.dll"
             "TargetName" = "8:"
@@ -509,7 +484,7 @@
         "Product"
         {
         "Name" = "8:Microsoft Visual Studio"
-        "ProductName" = "8:EV3Basic 1.0.3"
+        "ProductName" = "8:EV3Basic 1.0.4"
         "ProductCode" = "8:{3A95553D-B104-4714-B572-87E3D602A499}"
         "PackageCode" = "8:{A1B01DCE-5347-4705-AE46-880FF7BBC583}"
         "UpgradeCode" = "8:{3EAEFA4E-8024-4136-8981-0634E86DC49C}"
@@ -518,11 +493,11 @@
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.0.3"
+        "ProductVersion" = "8:1.0.4"
         "Manufacturer" = "8:Reinhard Grafl"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
-        "Title" = "8:EV3Basic 1.0.3"
+        "Title" = "8:EV3Basic 1.0.4"
         "Subject" = "8:"
         "ARPCONTACT" = "8:Reinhard Grafl"
         "Keywords" = "8:"

diff --git a/EV3Communication/ConnectionFinder.cs b/EV3Communication/ConnectionFinder.cs
@@ -187,7 +187,7 @@ private static IPAddress[] LoadPossibleIPAddresses()
                     {
                         addresses.Add(IPAddress.Parse(line));
                     }
-                    catch (Exception e) { }
+                    catch (Exception) { }
                 }
                 file.Close();
             } catch (Exception) {}
@@ -199,7 +199,12 @@ private static void AddPossibleIPAddress(IPAddress a)
         {
             try
             {
-                string fileName = Path.Combine(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "EV3Basic"), "ipaddresses.txt");
+                string dir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "EV3Basic");
+                if (!Directory.Exists(dir))
+                {
+                    Directory.CreateDirectory(dir);
+                }
+                string fileName = Path.Combine(dir, "ipaddresses.txt");
                 System.IO.StreamWriter file = new System.IO.StreamWriter(fileName, true);
                 file.WriteLine(a.ToString());
                 file.Close();

diff --git a/EV3Communication/IPAddressDialog.xaml.cs b/EV3Communication/IPAddressDialog.xaml.cs
@@ -62,7 +62,7 @@ private void RetryButton_clicked(object sender, System.Windows.RoutedEventArgs e
                 ipaddress = IPAddress.Parse(address.Text);
                 Close();
             }
-            catch (Exception ex) { }
+            catch (Exception) { }
         }
 
         private void address_keydown(object sender, KeyEventArgs e)
@@ -74,7 +74,7 @@ private void address_keydown(object sender, KeyEventArgs e)
                     ipaddress = IPAddress.Parse(address.Text);
                     Close();
                 }
-                catch (Exception ex) { }
+                catch (Exception) { }
             }
         }