Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

temp tag to text #65

Open
wants to merge 43 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
f200cc5
KnxConnection is now disposable. Adds a little bit of syntactic sugar
Apr 23, 2015
1a014a1
Avoid pointless roundtrip to string and back
CumpsD Aug 21, 2015
811709f
Added date
CumpsD Aug 21, 2015
dbc2773
Add paket
CumpsD Aug 23, 2015
65d488e
Added EIS 1 Switching
CumpsD Aug 23, 2015
5baad8a
Add EIS 3 Time
CumpsD Aug 23, 2015
2e07a2b
Add Date
CumpsD Aug 23, 2015
39a7477
Add eis9 float
CumpsD Aug 23, 2015
596b892
Convert negative values too
CumpsD Aug 23, 2015
bdbcd66
Add Scaling
CumpsD Aug 23, 2015
57fe5e4
Add 2byte unsigned
CumpsD Aug 23, 2015
93d3121
More test cases
CumpsD Aug 23, 2015
83701f5
Added influxdb package
CumpsD Sep 9, 2015
579e7f4
Experiment with InfluxDb
CumpsD Sep 9, 2015
951f217
Disable Expect100Continue
CumpsD Sep 10, 2015
6752da2
Use HttpClient. Splut up code
CumpsD Sep 11, 2015
5431662
Add category 13
CumpsD Sep 11, 2015
af3b664
Add category13 logging
CumpsD Sep 11, 2015
fd58ff2
Try catch logDevice
CumpsD Sep 13, 2015
6b98bda
update project to c# 7 syntax, apply upstream fixes
Apr 14, 2017
b4e82a7
cleanup
Apr 14, 2017
c31f27b
Updated paket.bootstrapper.exe to address TLS 1.0 and 1.1 deprecation
forki Feb 28, 2018
6ffc731
Merge pull request #1 from forki/bootstrapper
CumpsD Apr 29, 2018
07238dd
Added KnxGroupAdress classes to represent GAs in different styles (Th…
SystemKeeper Oct 5, 2018
d92ae6c
Added tests for new KnxGroupAddress classes
SystemKeeper Oct 5, 2018
4b08f0b
Fix ordering of enum
SystemKeeper Oct 5, 2018
37d5274
Introduced new classes for KNX addessing and telegram processing.
SystemKeeper Oct 7, 2018
1ff40db
Change TestRouting- and TestTunneling-Projects to use new GA classes
SystemKeeper Oct 12, 2018
40aa2ec
Fix line ending
SystemKeeper Oct 12, 2018
4f1f11a
Fix ActionFeedback-Test
SystemKeeper Oct 12, 2018
9c46350
chore: update dependencies
CumpsD Dec 27, 2018
114461c
Bring up to date with upstream
CumpsD Dec 27, 2018
d35ed89
Improvement
GioviQ Apr 28, 2016
5ca91c3
Undo upstream changes, done them manually
CumpsD Dec 27, 2018
272ffd1
Merge branch 'master' into tmp
CumpsD Dec 27, 2018
f21580b
Merge remote-tracking branch 'upstream/master'
CumpsD Dec 27, 2018
1209873
Added a note about ActionMessageCode to README
SystemKeeper Oct 2, 2018
83437c1
Fix line-endings
SystemKeeper Oct 4, 2018
c7dab36
Merge branch 'feature/DisposableConnection' of https://github.com/cce…
CumpsD Dec 27, 2018
ff28a61
Merge branch 'ccellar-feature/DisposableConnection'
CumpsD Dec 27, 2018
613afa6
Merge branch 'extended-ga' of https://github.com/SystemKeeper/knx.net…
CumpsD Dec 27, 2018
18183f8
Merge branch 'SystemKeeper-extended-ga'
CumpsD Dec 27, 2018
4db6393
style: unused using
CumpsD Dec 27, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 32 additions & 75 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,79 +1,36 @@
# site ignore directories
site/build
site/output
site/src/ref
node_modules

#OS junk files
[Tt]humbs.db
*.DS_Store

#Visual Studio files
*.[Oo]bj
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.[Cc]ache
*.ilk
*.log
*.lib
*.sbr
*.sdf
*.opensdf
*.unsuccessfulbuild
ipch/
.vs/
.fake/
.idea/

[Pp]ackages/
[Pp]aket-files/
[Dd]ebug/
[Rr]elease/
[Bb]build/
[Bb]in/
[Oo]bj/
[Bb]in
[Dd]ebug*/
[Rr]elease*/
Ankh.NoLoad

#MonoDevelop
*.pidb
*.userprefs

#Tooling
_ReSharper*/
*.resharper
[Tt]est[Rr]esult*
*.sass-cache

#Project files
[Bb]uild/

#Subversion files
.svn
[Xx]64/
[Dd]ist/

# Office Temp Files
~$*

# vim Temp Files
*~

#NuGet
packages/
*.nupkg

#ncrunch
*ncrunch*
*crunch*.local.xml

# visual studio database projects
*.dbmdl

#Test files
*.testsettings
*.suo
*.user
*.sln.docstates
*.ntvs*
*.njsproj
*.trx

node_modules/
bower_components/
debug.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
*.ncrunchproject
*ncrunchsolution
_Ncrunch_*
TestResults.xml

# Mac OS
.DS_Store

.vs
ehthumbs.db
Icon?
Thumbs.db
383 changes: 383 additions & 0 deletions .paket/Paket.Restore.targets

Large diffs are not rendered by default.

Binary file added .paket/paket.exe
Binary file not shown.
72 changes: 72 additions & 0 deletions .paket/paket.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<!-- Enable the restore command to run before builds -->
<RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages>
<PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
<PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
<PaketLockFilePath>$(PaketRootPath)paket.lock</PaketLockFilePath>
<PaketRestoreCacheFile>$(PaketRootPath)paket-files\paket.restore.cached</PaketRestoreCacheFile>
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
</PropertyGroup>

<PropertyGroup>
<!-- Paket command -->
<PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath>
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
</PropertyGroup>

<Choose> <!-- MyProject.fsproj.paket.references has the highest precedence -->
<When Condition="Exists('$(MSBuildProjectFullPath).paket.references')">
<PropertyGroup>
<PaketReferences>$(MSBuildProjectFullPath).paket.references</PaketReferences>
</PropertyGroup>
</When> <!-- MyProject.paket.references -->
<When Condition="Exists('$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references')">
<PropertyGroup>
<PaketReferences>$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references</PaketReferences>
</PropertyGroup>
</When> <!-- paket.references -->
<When Condition="Exists('$(MSBuildProjectDirectory)\paket.references')">
<PropertyGroup>
<PaketReferences>$(MSBuildProjectDirectory)\paket.references</PaketReferences>
</PropertyGroup>
</When> <!-- Set to empty if a reference file isn't found matching one of the 3 format options -->
<Otherwise>
<PropertyGroup>
<PaketReferences></PaketReferences>
</PropertyGroup>
</Otherwise>
</Choose>

<PropertyGroup>
<!-- Commands -->
<RestoreCommand>$(PaketCommand) restore --references-file "$(PaketReferences)"</RestoreCommand>
<!-- We need to ensure packages are restored prior to assembly resolve -->
<BuildDependsOn Condition="$(RestorePackages) == 'true'">RestorePackages; $(BuildDependsOn);</BuildDependsOn>
</PropertyGroup>
<Target Name="RestorePackages">
<PropertyGroup>
<PaketRestoreRequired>true</PaketRestoreRequired>
</PropertyGroup>

<PropertyGroup Condition="Exists('$(PaketRestoreCacheFile)') ">
<PaketRestoreCachedHash>$([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)'))</PaketRestoreCachedHash>
<PaketRestoreLockFileHash>$([System.IO.File]::ReadAllText('$(PaketLockFilePath)'))</PaketRestoreLockFileHash>
<PaketRestoreRequired>true</PaketRestoreRequired>
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '$(PaketRestoreCachedHash)' ">false</PaketRestoreRequired>
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
</PropertyGroup>

<Exec Command="$(RestoreCommand)"
IgnoreStandardErrorWarningFormat="true"
WorkingDirectory="$(PaketRootPath)"
ContinueOnError="false"
Condition=" '$(PaketRestoreRequired)' == 'true' AND Exists('$(PaketReferences)') AND '$(PaketReferences)' != '' "
/>
</Target>
</Project>
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
language: csharp
dist: precise
mono: alpha
solution: KNX.net.sln
sudo: required
Expand All @@ -11,4 +10,4 @@ install:
- nuget install NUnit.Console -ExcludeVersion -OutputDirectory testrunner
script:
- xbuild /p:Configuration=Release KNX.net.sln
- mono ./testrunner/NUnit.ConsoleRunner/tools/nunit3-console.exe ./tests/KNXLibTests/bin/Release/KNXLibTests.dll --labels=On --nocolor --trace=Verbose --workers=1 --result:"./nunit-result.xml;format=nunit2"
- mono ./testrunner/NUnit.ConsoleRunner/tools/nunit3-console.exe ./tests/KNXLibTests/bin/Release/KNXLibTests.dll --labels=On --nocolor --verbose --workers=1 --full --result:"./nunit-result.xml;format=nunit2"
70 changes: 68 additions & 2 deletions KNX.net.sln
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.22823.1
# Visual Studio 15
VisualStudioVersion = 15.0.28307.168
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{89DCC014-2BE4-4ED1-8090-6A9387DA9D30}"
ProjectSection(SolutionItems) = preProject
paket.dependencies = paket.dependencies
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KNXLib", "src\KNXLib\KNXLib.csproj", "{CD1911AD-1967-40CB-A1C3-EC2FA562872B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KNXTestRouting", "tests\KNXTestRouting\KNXTestRouting.csproj", "{042C5633-24D9-47FB-AFA6-92A5108BA7C8}"
Expand All @@ -17,32 +22,85 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B89118A5
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "notes", "notes", "{2DA39BD6-01AA-49A3-A16A-5A7618D55FE5}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
notes\BUILD_WEBSITE.txt = notes\BUILD_WEBSITE.txt
notes\DEPLOY_NUGET_PACKAGE.txt = notes\DEPLOY_NUGET_PACKAGE.txt
LICENSE = LICENSE
paket.dependencies = paket.dependencies
README.md = README.md
EndProjectSection
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunctionalLiving.Parser", "src\FunctionalLiving.Parser\FunctionalLiving.Parser.fsproj", "{30C78232-571C-45B7-B390-1F0BF7B9BF84}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunctionalLiving.Parser.Tests", "tests\FunctionalLiving.Parser.Tests\FunctionalLiving.Parser.Tests.fsproj", "{B958828D-4583-4484-9F02-FEBC7D3EE062}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "InfluxDB.FSharp", "src\InfluxDB.FSharp\InfluxDB.FSharp.fsproj", "{A7A43714-99FD-4CC1-A078-3C922ABE33C0}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "InfluxDB.FSharp.UnitTests", "tests\InfluxDB.FSharp.UnitTests\InfluxDB.FSharp.UnitTests.fsproj", "{DF6C06F0-8B0F-415C-80F8-D73B8874081A}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FunctionalLiving.Logger", "src\FunctionalLiving.Logger\FunctionalLiving.Logger.fsproj", "{E8E329E6-D67D-4844-B02A-2209F037A5B3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Verify|Any CPU = Verify|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{CD1911AD-1967-40CB-A1C3-EC2FA562872B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CD1911AD-1967-40CB-A1C3-EC2FA562872B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CD1911AD-1967-40CB-A1C3-EC2FA562872B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CD1911AD-1967-40CB-A1C3-EC2FA562872B}.Release|Any CPU.Build.0 = Release|Any CPU
{CD1911AD-1967-40CB-A1C3-EC2FA562872B}.Verify|Any CPU.ActiveCfg = Release|Any CPU
{CD1911AD-1967-40CB-A1C3-EC2FA562872B}.Verify|Any CPU.Build.0 = Release|Any CPU
{042C5633-24D9-47FB-AFA6-92A5108BA7C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{042C5633-24D9-47FB-AFA6-92A5108BA7C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{042C5633-24D9-47FB-AFA6-92A5108BA7C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{042C5633-24D9-47FB-AFA6-92A5108BA7C8}.Release|Any CPU.Build.0 = Release|Any CPU
{042C5633-24D9-47FB-AFA6-92A5108BA7C8}.Verify|Any CPU.ActiveCfg = Release|Any CPU
{042C5633-24D9-47FB-AFA6-92A5108BA7C8}.Verify|Any CPU.Build.0 = Release|Any CPU
{AE4B122B-6ADD-4727-991D-712672AF012D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AE4B122B-6ADD-4727-991D-712672AF012D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AE4B122B-6ADD-4727-991D-712672AF012D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AE4B122B-6ADD-4727-991D-712672AF012D}.Release|Any CPU.Build.0 = Release|Any CPU
{AE4B122B-6ADD-4727-991D-712672AF012D}.Verify|Any CPU.ActiveCfg = Release|Any CPU
{AE4B122B-6ADD-4727-991D-712672AF012D}.Verify|Any CPU.Build.0 = Release|Any CPU
{90D08CB2-37FE-450A-82C0-063E0B4802EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{90D08CB2-37FE-450A-82C0-063E0B4802EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{90D08CB2-37FE-450A-82C0-063E0B4802EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{90D08CB2-37FE-450A-82C0-063E0B4802EC}.Release|Any CPU.Build.0 = Release|Any CPU
{90D08CB2-37FE-450A-82C0-063E0B4802EC}.Verify|Any CPU.ActiveCfg = Release|Any CPU
{90D08CB2-37FE-450A-82C0-063E0B4802EC}.Verify|Any CPU.Build.0 = Release|Any CPU
{30C78232-571C-45B7-B390-1F0BF7B9BF84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{30C78232-571C-45B7-B390-1F0BF7B9BF84}.Debug|Any CPU.Build.0 = Debug|Any CPU
{30C78232-571C-45B7-B390-1F0BF7B9BF84}.Release|Any CPU.ActiveCfg = Release|Any CPU
{30C78232-571C-45B7-B390-1F0BF7B9BF84}.Release|Any CPU.Build.0 = Release|Any CPU
{30C78232-571C-45B7-B390-1F0BF7B9BF84}.Verify|Any CPU.ActiveCfg = Release|Any CPU
{30C78232-571C-45B7-B390-1F0BF7B9BF84}.Verify|Any CPU.Build.0 = Release|Any CPU
{B958828D-4583-4484-9F02-FEBC7D3EE062}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B958828D-4583-4484-9F02-FEBC7D3EE062}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B958828D-4583-4484-9F02-FEBC7D3EE062}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B958828D-4583-4484-9F02-FEBC7D3EE062}.Release|Any CPU.Build.0 = Release|Any CPU
{B958828D-4583-4484-9F02-FEBC7D3EE062}.Verify|Any CPU.ActiveCfg = Release|Any CPU
{B958828D-4583-4484-9F02-FEBC7D3EE062}.Verify|Any CPU.Build.0 = Release|Any CPU
{A7A43714-99FD-4CC1-A078-3C922ABE33C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A7A43714-99FD-4CC1-A078-3C922ABE33C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7A43714-99FD-4CC1-A078-3C922ABE33C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7A43714-99FD-4CC1-A078-3C922ABE33C0}.Release|Any CPU.Build.0 = Release|Any CPU
{A7A43714-99FD-4CC1-A078-3C922ABE33C0}.Verify|Any CPU.ActiveCfg = Release|Any CPU
{A7A43714-99FD-4CC1-A078-3C922ABE33C0}.Verify|Any CPU.Build.0 = Release|Any CPU
{DF6C06F0-8B0F-415C-80F8-D73B8874081A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DF6C06F0-8B0F-415C-80F8-D73B8874081A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DF6C06F0-8B0F-415C-80F8-D73B8874081A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DF6C06F0-8B0F-415C-80F8-D73B8874081A}.Release|Any CPU.Build.0 = Release|Any CPU
{DF6C06F0-8B0F-415C-80F8-D73B8874081A}.Verify|Any CPU.ActiveCfg = Release|Any CPU
{DF6C06F0-8B0F-415C-80F8-D73B8874081A}.Verify|Any CPU.Build.0 = Release|Any CPU
{E8E329E6-D67D-4844-B02A-2209F037A5B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E8E329E6-D67D-4844-B02A-2209F037A5B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E8E329E6-D67D-4844-B02A-2209F037A5B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E8E329E6-D67D-4844-B02A-2209F037A5B3}.Release|Any CPU.Build.0 = Release|Any CPU
{E8E329E6-D67D-4844-B02A-2209F037A5B3}.Verify|Any CPU.ActiveCfg = Release|Any CPU
{E8E329E6-D67D-4844-B02A-2209F037A5B3}.Verify|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -52,5 +110,13 @@ Global
{042C5633-24D9-47FB-AFA6-92A5108BA7C8} = {B89118A5-8F45-45BA-863D-7865C523791F}
{AE4B122B-6ADD-4727-991D-712672AF012D} = {B89118A5-8F45-45BA-863D-7865C523791F}
{90D08CB2-37FE-450A-82C0-063E0B4802EC} = {B89118A5-8F45-45BA-863D-7865C523791F}
{30C78232-571C-45B7-B390-1F0BF7B9BF84} = {3F2D2127-9AC6-4E02-BA07-B860F4A06164}
{B958828D-4583-4484-9F02-FEBC7D3EE062} = {B89118A5-8F45-45BA-863D-7865C523791F}
{A7A43714-99FD-4CC1-A078-3C922ABE33C0} = {3F2D2127-9AC6-4E02-BA07-B860F4A06164}
{DF6C06F0-8B0F-415C-80F8-D73B8874081A} = {B89118A5-8F45-45BA-863D-7865C523791F}
{E8E329E6-D67D-4844-B02A-2209F037A5B3} = {3F2D2127-9AC6-4E02-BA07-B860F4A06164}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9664DC20-170E-4A8B-A392-6948F604DBA3}
EndGlobalSection
EndGlobal
Loading