Permalink
Browse files

modified: ReceiverMultiplex/ReceiverMultiplex.v11.suo

	modified:   ReceiverMultiplex/ReceiverMultiplex/HardwareExceptions.cs
	modified:   ReceiverMultiplex/ReceiverMultiplex/RealTimeEvents/RealTimeEvent.cs
	modified:   ReceiverMultiplex/ReceiverMultiplex/RealTimeEvents/RealTimeEventDispatcher.cs
	modified:   ReceiverMultiplex/ReceiverMultiplex/RealTimeEvents/ReceiverDataEvents.cs
	modified:   ReceiverMultiplex/ReceiverMultiplex/RealTimeEvents/SerialPortEvent.cs
	modified:   ReceiverMultiplex/ReceiverMultiplex/Receivers.cs
	modified:   ReceiverMultiplex/ReceiverMultiplex/Service.cs
	new file:   ReceiverMultiplex/ReceiverMultiplex/bin/Debug/FridayThe13th.dll
	new file:   ReceiverMultiplex/ReceiverMultiplex/bin/Debug/FridayThe13th.pdb
	new file:   ReceiverMultiplex/ReceiverMultiplex/bin/Debug/ReceiverMultiplex.exe
	new file:   ReceiverMultiplex/ReceiverMultiplex/bin/Debug/ReceiverMultiplex.pdb
	modified:   ReceiverMultiplex/ReceiverMultiplex/obj/Debug/ReceiverMultiplex.csproj.FileListAbsolute.txt
	new file:   ReceiverMultiplex/ReceiverMultiplex/obj/Debug/ReceiverMultiplex.exe
	new file:   ReceiverMultiplex/ReceiverMultiplex/obj/Debug/ReceiverMultiplex.pdb

Final commit for this branch.  Service.cs and Receivers.cs complete to this point in development with no errors.
  • Loading branch information...
1 parent 8baa5a0 commit e1e639f0c3143da36bbfd2520bc781b30837640e @ashawnbandy committed Oct 9, 2012
View
BIN ReceiverMultiplex/ReceiverMultiplex.v11.suo
Binary file not shown.
View
4 ReceiverMultiplex/ReceiverMultiplex/HardwareExceptions.cs
@@ -22,8 +22,8 @@ public HardwareExceptions(string text, Boolean fatal)
public class MalformedData : Exception
{
- string raw { get; private set; }
- string error { get; private set; }
+ public string raw { get; private set; }
+ public string error { get; private set; }
public MalformedData(string raw, string error)
{
View
2 ReceiverMultiplex/ReceiverMultiplex/RealTimeEvents/RealTimeEvent.cs
@@ -9,7 +9,7 @@ namespace ReceiverMultiplex
enum RealTimeEventType {NEW_RECEIVER, DEL_RECEIVER, TAG_RECEIVER, STATUS_RECEIVER, UNPARSED_RECEIVER, UNPARSED_INTRO };
class RealTimeEvent
{
- RealTimeEventType eventType
+ public RealTimeEventType eventType
{
get;
private set;
View
5 ReceiverMultiplex/ReceiverMultiplex/RealTimeEvents/RealTimeEventDispatcher.cs
@@ -8,6 +8,9 @@ namespace ReceiverMultiplex
{
class RealTimeEventDispatcher
{
- public void enque(RealTimeEvent realTimeEvent);
+ public void enque(RealTimeEvent realTimeEvent)
+ {
+ }
+
}
}
View
18 ReceiverMultiplex/ReceiverMultiplex/RealTimeEvents/ReceiverDataEvents.cs
@@ -9,7 +9,7 @@ namespace ReceiverMultiplex.RealTimeEvents
class UnparsedDataEvent : RealTimeEvent
{
- private string payload { get; private set; }
+ public string payload { get; private set; }
Receiver r;
public UnparsedDataEvent(string payload, Receiver r) : base (RealTimeEventType.UNPARSED_RECEIVER)
@@ -22,24 +22,24 @@ public UnparsedDataEvent(string payload, Receiver r) : base (RealTimeEventType.U
}
class UnparsedIntroEvent : RealTimeEvent
{
- string payload { get; private set; }
+ public string payload { get; private set; }
public UnparsedIntroEvent(string payload, string comPort)
: base(RealTimeEventType.UNPARSED_INTRO)
{
this.payload = payload;
}
}
- class TagEvent : RealTimeEvent
- {
- }
+ //class TagEvent : RealTimeEvent
+ //{
+ //}
- class ReceiverStatusEvent : RealTimeEvent
- {
- }
+ //class ReceiverStatusEvent : RealTimeEvent
+ //{
+ //}
class MalformedDataException : System.ApplicationException
{
- UnparsedDataEvent u { get; private set; }
+ public UnparsedDataEvent u { get; private set; }
public MalformedDataException(UnparsedDataEvent u)
{
this.u = u;
View
1 ReceiverMultiplex/ReceiverMultiplex/RealTimeEvents/SerialPortEvent.cs
@@ -12,7 +12,6 @@ class SerialPortEvent : RealTimeEvent
public SerialPortEvent(RealTimeEventType eventType, Receiver r) : base (eventType)
{
- r.serialPort = null;
}
}
}
View
12 ReceiverMultiplex/ReceiverMultiplex/Receivers.cs
@@ -18,12 +18,12 @@ class Receiver
private const int COM_READ_TIMEOUT_DEFAULT = 500; //milliseconds
private const int COM_READ_TIMEOUT_SPRIAL = 100; //additional ms to allow for response on next go-'round
private const string VR2C_COMMAND_FOLDER = "vr2c_commands";
- private RealTimeEventDispatcher dispatcher { private get; private set; }
- private SerialPort serialPort { private get; private set; }
- private dynamic receiverConfig { get; private set; }
- private int firmwareVersion {get; private set;}
- private string commandPreamble { get; private set; }
- private TextReader textReader { get; private set; }
+ private RealTimeEventDispatcher dispatcher { get; set; }
+ private SerialPort serialPort { get; set; }
+ private dynamic receiverConfig { get; set; }
+ private int firmwareVersion {get; set;}
+ private string commandPreamble { get; set; }
+ private TextReader textReader { get; set; }
public Receiver(SerialPort serialPort, String portName, RealTimeEventDispatcher dispatcher)
{
View
3 ReceiverMultiplex/ReceiverMultiplex/Service.cs
@@ -18,8 +18,7 @@ public partial class Service : ServiceBase
{
private Dictionary<String, Receiver> receivers = new Dictionary<String, Receiver>();
- private Parser parser;
- private RealTimeEventDispatcher d;
+ private RealTimeEventDispatcher d = new RealTimeEventDispatcher();
public Service()
{
View
BIN ReceiverMultiplex/ReceiverMultiplex/bin/Debug/FridayThe13th.dll
Binary file not shown.
View
BIN ReceiverMultiplex/ReceiverMultiplex/bin/Debug/FridayThe13th.pdb
Binary file not shown.
View
BIN ReceiverMultiplex/ReceiverMultiplex/bin/Debug/ReceiverMultiplex.exe
Binary file not shown.
View
BIN ReceiverMultiplex/ReceiverMultiplex/bin/Debug/ReceiverMultiplex.pdb
Binary file not shown.
View
6 ReceiverMultiplex/ReceiverMultiplex/obj/Debug/ReceiverMultiplex.csproj.FileListAbsolute.txt
@@ -1,3 +1,9 @@
\\VBOXSVR\src\cecs491\ReceiverMultiplex\ReceiverMultiplex\bin\Debug\ReceiverMultiplex.exe.config
F:\cecs491\ReceiverMultiplex\ReceiverMultiplex\bin\Debug\ReceiverMultiplex.exe.config
F:\cecs491\ReceiverMultiplex\ReceiverMultiplex\obj\Debug\ReceiverMultiplex.csprojResolveAssemblyReference.cache
+F:\cecs491\ReceiverMultiplex\ReceiverMultiplex\bin\Debug\ReceiverMultiplex.exe
+F:\cecs491\ReceiverMultiplex\ReceiverMultiplex\bin\Debug\ReceiverMultiplex.pdb
+F:\cecs491\ReceiverMultiplex\ReceiverMultiplex\bin\Debug\FridayThe13th.dll
+F:\cecs491\ReceiverMultiplex\ReceiverMultiplex\bin\Debug\FridayThe13th.pdb
+F:\cecs491\ReceiverMultiplex\ReceiverMultiplex\obj\Debug\ReceiverMultiplex.exe
+F:\cecs491\ReceiverMultiplex\ReceiverMultiplex\obj\Debug\ReceiverMultiplex.pdb
View
BIN ReceiverMultiplex/ReceiverMultiplex/obj/Debug/ReceiverMultiplex.exe
Binary file not shown.
View
BIN ReceiverMultiplex/ReceiverMultiplex/obj/Debug/ReceiverMultiplex.pdb
Binary file not shown.

0 comments on commit e1e639f

Please sign in to comment.