Skip to content

Commit

Permalink
Merge branch 'master' into legacy
Browse files Browse the repository at this point in the history
  • Loading branch information
uwburn committed Jan 14, 2018
2 parents 191ed9c + fa9786e commit 65250a8
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Cardia/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Cardia")]
[assembly: AssemblyCopyright("Copyright © 2013-2015")]
[assembly: AssemblyCopyright("Copyright © 2013-2018")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -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("1.0.*")]
[assembly: AssemblyVersion("1.1.*")]
//[assembly: AssemblyFileVersion("0.7.*")]
21 changes: 19 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ _**NOTE:** This software and the simulated ECG are intended for entertainment pu
Cardia currently support the following devices:
* Zephyr HxM
* Contec CMS50
* Bluetooth Smart HRP compliant devices

- - - -

### Installation
Just download the zip from the releases pages, uncompress it and run Cardia.exe.
Cardia requires .NET Framework v4.0, so Windows XP and later should be supported. At the moment it has been tested only on Windows 7, Windows 8 and Windows 8.1. Of course, if you're using a Bluetooth device your PC should have built in Bluetooth capability or a USB Bluetooth adapter.
The Cardia main version supports only Windows 10 version 1709 onwards. Windows 8.1 should be also compatible, but i cannot test it out at the moment. Windows 10 versions before 1709 are known to have problem with Bluetooth Smart, Cardia will run, but communication with Bluetooth Smart devices will not.
The legacy version cuts out Bluetooth Smart Heart Rate Profile support, so Windows XP and later should be supported. At the moment it has been tested only on Windows 7, Windows 8, Windows 8.1 and Windows 10.

- - - -

Expand Down Expand Up @@ -81,7 +83,17 @@ Cardia currently supports up to 4 players.
- - - -

### Bluetooth Smart support
Bluetooth Smart (also Bluetooth LE and Bluetooth 4.0) support is under developement. Bluetooth smart add support for many specific uses case devices via dedicated profiles. Instead of using the generic Serial Port Profile (as with Zephyr HxM), there's a HRM profile to be used. A branch with the implementation is available, but currently i don't own a device to test out, so some support here is welcome. As a side note, Bluetooth Smart requires support from the OS, this means only Windows 8.1 and later will be supported.
Bluetooth Smart (also Bluetooth LE and Bluetooth 4.0) has been added into version 1.1 (making the old 1.0 legacy). Bluetooth smart add support for many specific uses case devices via dedicated profiles. Instead of using the generic Serial Port Profile (as with Zephyr HxM), there's a HRM profile to be used. Cardia has been successfully tested out on Polar H7 and H10 devices.
Some users reports issues about Bluetooth Smart compatibility, please ensure the following:
* You must be runnning Windows 10 1709 or later (currently is the last one)
* Your device must be paired before running Cardia

If your device works ok, please post it out [here](https://github.com/uwburn/cardia/issues/3) , this would be helpful!

- - - -

### How to get support
Since version 1.1 Cardia write logs to help out diagnose problems. Please open an issue here (other places will be ignored, sorry!) and paste the log content. Log files are located into logs directory next to Cardia.exe.

- - - -

Expand All @@ -102,6 +114,11 @@ If you would like to support me and help me buy the devices to include support f
- - - -

### Changelog
* v1.1 (2018-01-14)
* Splitted main and legacy version
* Ensured network compatibility between main and legacy version
* Bluetooth Smart support on main version

* v1.0 (2015-12-20)
* Code posted on GitHub
* Removed expiry date
Expand Down

0 comments on commit 65250a8

Please sign in to comment.