Merge pull request #2 from danoost/master

Correct default serial device settings
wandwramp · Mar 8, 2019 · 48dc9a8 · 48dc9a8
2 parents cdc376a + 3afca7d
commit 48dc9a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/RexSimulator/Hardware/Rex/SerialIO.cs b/RexSimulator/Hardware/Rex/SerialIO.cs
@@ -12,7 +12,7 @@ public class SerialIO : MemoryDevice
         /// <summary>
         /// Set this to the board's primary clock rate. It is used to determine how many clock cycles are required to transmit/receive serial data.
         /// </summary>
-        private readonly uint SYSTEM_CLOCK_RATE = 4000000;
+        private readonly uint SYSTEM_CLOCK_RATE = 6250000;
         #endregion
 
         #region Member Variables
@@ -182,7 +182,7 @@ public override void Reset()
             {
                 mMemory[i] = 0;
             }
-            Control = 0xC5; //8 data bits, no parity, 1 stop bit, 9600 baud
+            Control = 0xC7; //8 data bits, no parity, 1 stop bit, 38400 baud
             Status = 0x02;
             Interrupt(false);
         }

diff --git a/RexSimulator/Properties/AssemblyInfo.cs b/RexSimulator/Properties/AssemblyInfo.cs
@@ -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("3.1.0")]
-[assembly: AssemblyFileVersion("3.1.0")]
+[assembly: AssemblyVersion("3.1.1")]
+[assembly: AssemblyFileVersion("3.1.1")]
diff --git a/RexSimulatorGui/Properties/AssemblyInfo.cs b/RexSimulatorGui/Properties/AssemblyInfo.cs
@@ -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("3.2.0")]
-[assembly: AssemblyFileVersion("3.2.0")]
+[assembly: AssemblyVersion("3.2.1")]
+[assembly: AssemblyFileVersion("3.2.1")]