Permalink
Browse files

Merge branch 'asb_20121105_sui'

Conflicts:
	ConsoleServerRunner/ConsoleServerRunner/bin/Release/EventSlice.dll
	ConsoleServerRunner/ConsoleServerRunner/bin/Release/Receiver.dll
	ConsoleServerRunner/ConsoleServerRunner/bin/Release/modules/ConsoleLogger.dll
	ConsoleServerRunner/ConsoleServerRunner/bin/Release/modules/Decoder.dll
	Modules/ConsoleLogger/bin/Release/ConsoleLogger.dll
	Modules/ConsoleLogger/obj/Release/ConsoleLogger.dll
	Modules/Decoder/bin/Release/Decoder.dll
	Modules/Decoder/obj/Release/Decoder.dll
	SerialPortComponents/EventSlice/bin/Release/EventSlice.dll
	SerialPortComponents/EventSlice/obj/Release/EventSlice.dll
	SerialPortComponents/Receiver/bin/Release/EventSlice.dll
	SerialPortComponents/Receiver/bin/Release/Receiver.dll
	SerialPortComponents/Receiver/obj/Release/Receiver.dll
	SerialPortComponents/SerialPortSlice/obj/Release/SerialPortSlice.dll
  • Loading branch information...
2 parents 45cfab2 + b6d3904 commit f89f545b437a90867fc270d2b077337302e8c53e @ashawnbandy committed Nov 6, 2012
Showing 379 changed files with 970 additions and 6,377 deletions.
View
@@ -1,3 +1,5 @@
+*.dll
+*.exe
*.~*
[Oo]bj
[Bb]in
Binary file not shown.
@@ -3,4 +3,8 @@
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
-</configuration>
+ <runtime>
+ <loadFromRemoteSources enabled="true"/>
+ </runtime>
+
+</configuration>
@@ -3,4 +3,8 @@
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
-</configuration>
+ <runtime>
+ <loadFromRemoteSources enabled="true"/>
+ </runtime>
+
+</configuration>
@@ -3,4 +3,8 @@
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
-</configuration>
+ <runtime>
+ <loadFromRemoteSources enabled="true"/>
+ </runtime>
+
+</configuration>
@@ -24,7 +24,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\..\ConsoleServerRunner\ConsoleServerRunner\bin\Release\modules\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -12,3 +12,5 @@ C:\Users\Derek\cecs491\Modules\ConsoleLogger\obj\Release\ConsoleLogger.pdb
C:\Users\Derek\cecs491\Modules\ConsoleLogger\bin\Release\EventSlice.dll
C:\Users\Derek\cecs491\Modules\ConsoleLogger\bin\Release\EventSlice.pdb
C:\Users\Derek\cecs491\Modules\ConsoleLogger\obj\Release\ConsoleLogger.csprojResolveAssemblyReference.cache
+\\VBOXSVR\src\cecs491\ConsoleServerRunner\ConsoleServerRunner\bin\Release\modules\ConsoleLogger.dll
+\\VBOXSVR\src\cecs491\ConsoleServerRunner\ConsoleServerRunner\bin\Release\modules\ConsoleLogger.pdb
@@ -44,6 +44,7 @@ private void receiverInsert(ReceiverSlice.RealTimeEvents.NewReceiver newReceiver
private void detectionInsert(Decoder.RealTimeEvents.Decoded detection)
{
+ //string fullserialmodel = detection["model"] + ":" + detection["serialnumber"]
string statement;
if(detection["decodedmessage"]["sensor_value"] == null)
statement = "INSERT INTO vue (date, time, frequency_codespace, transmitter_id, receivers_id) VALUES ('" +
@@ -26,7 +26,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\..\ConsoleServerRunner\ConsoleServerRunner\bin\Release\modules\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -0,0 +1,27 @@
+using EventSlice.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Databases.RealTimeEvents
+{
+ public class DatabaseResponse: RealTimeEvent
+ {
+ public string sql { get; private set; }
+ public int response { get; private set; }
+
+ public DatabaseResponse(string message, int response, RealTimeEvent originatingEvent)
+ :base("Database module: " + message, originatingEvent)
+ {
+ this.sql = message;
+ this.response = response;
+ }
+
+ public override string ToString()
+ {
+ return sql + '\n' + response + " rows affected.";
+ }
+ }
+}
@@ -24,7 +24,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>F:\cecs491\ConsoleServerRunner\ConsoleServerRunner\bin\Release\modules\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -14,3 +14,5 @@ C:\Users\Derek\cecs491\Modules\Decoder\obj\Release\Decoder.csprojResolveAssembly
C:\Users\Derek\cecs491\Modules\Decoder\obj\Release\Decoder.dll
C:\Users\Derek\cecs491\Modules\Decoder\obj\Release\Decoder.pdb
C:\Users\Derek\cecs491\Modules\Decoder\bin\Release\EventSlice.dll
+F:\cecs491\ConsoleServerRunner\ConsoleServerRunner\bin\Release\modules\Decoder.dll
+F:\cecs491\ConsoleServerRunner\ConsoleServerRunner\bin\Release\modules\Decoder.pdb
Binary file not shown.
View
@@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleLogger", "ConsoleLog
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Database", "Database\Database.csproj", "{30231B33-86BB-476A-A725-E35187541402}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sui", "sui\sui.csproj", "{40A8B6BE-6FB1-4C17-8C10-D3BFA18ACF67}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -25,6 +27,10 @@ Global
{30231B33-86BB-476A-A725-E35187541402}.Debug|Any CPU.Build.0 = Debug|Any CPU
{30231B33-86BB-476A-A725-E35187541402}.Release|Any CPU.ActiveCfg = Release|Any CPU
{30231B33-86BB-476A-A725-E35187541402}.Release|Any CPU.Build.0 = Release|Any CPU
+ {40A8B6BE-6FB1-4C17-8C10-D3BFA18ACF67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {40A8B6BE-6FB1-4C17-8C10-D3BFA18ACF67}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {40A8B6BE-6FB1-4C17-8C10-D3BFA18ACF67}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {40A8B6BE-6FB1-4C17-8C10-D3BFA18ACF67}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
View
Binary file not shown.
View
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+ <startup>
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+ </startup>
+</configuration>
View
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace serveruserinterface
+{
+ static class Program
+ {
+ /// <summary>
+ /// The main entry point for the application.
+ /// </summary>
+ [STAThread]
+ static void Main()
+ {
+ Application.EnableVisualStyles();
+ Application.SetCompatibleTextRenderingDefault(false);
+ Application.Run(new main());
+ }
+ }
+}
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("sui")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("sui")]
+[assembly: AssemblyCopyright("Copyright © 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("d50d3737-8ece-4f74-b2ef-91867574740d")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// 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.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
Oops, something went wrong.

0 comments on commit f89f545

Please sign in to comment.