Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	docs/upgrade.md
  • Loading branch information
Marco Bacis committed Jun 29, 2023
2 parents 8b1a539 + 8965165 commit 1033e9c
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 50 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ For the documentation, go [here](https://weart.it/docs/sdkcsharp/)

## Changelog

### Version 1.1 (latest)
### Version 1.1.1 (latest)
* Fix connection issue to middleware while offline

### Version 1.1
* Add calibration procedure start/stop and listener
* Add new default tracking message and values for closure
* Add basic effect class for haptic feedback
Expand Down
4 changes: 3 additions & 1 deletion WeArtCommon.cs
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,10 @@ public static float NormalizedGraspForceValue(float value)
/// </summary>
public static class WeArtConstants
{
public const string ipLocalHost = "127.0.0.1";

public const string WEART_SDK_TYPE = "SdkLLCSH";
public const string WEART_SDK_VERSION = "1.0.0";
public const string WEART_SDK_VERSION = "1.1.1";

public const float defaultTemperature = 0.5f;
public const float minTemperature = 0f;
Expand Down
2 changes: 1 addition & 1 deletion WeArtController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public WeArtClient Client
{
_weArtClient = new WeArtClient
{
IpAddress = WeArtNetwork.LocalIPAddress,
IpAddress = WeArtConstants.ipLocalHost,
Port = _clientPort,
};
_weArtClient.OnConnectionStatusChanged += OnConnectionChanged;
Expand Down
47 changes: 0 additions & 47 deletions WeArtNetwork.cs

This file was deleted.

5 changes: 5 additions & 0 deletions docs/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ On other systems (e.g. cmake) the procedure might be different.
## Code Migration

The new SDK version is mostly compatible with the older versions.

The only breaking change introduced relates to the WeArtTexture class, in which the ```VelocityX``` and ```VelocityY``` params has been removed because are not used anymore. The ```VelocityZ``` parameter has been renamed to ```Velocity```, and represents the speed at which the texture vibration is played by the thimble.

## Dependencies
Expand All @@ -19,9 +20,13 @@ The new SDK version has the following dependencies:
The dependencies can be found and installed by using the nuget package manager.

## Changelog

### Version 1.2 (latest)
* Add raw sensors data tracking object

### Version 1.1.1
* Fix connection issue to middleware while offline

### Version 1.1
* Add calibration procedure start/stop and listener
* Add new default tracking message and values for closure
Expand Down

0 comments on commit 1033e9c

Please sign in to comment.