Merge pull request #5 from harp-tech/feature/update_device_id

Update device ID on Firmware and App

App/README.md

@@ -4,13 +4,13 @@ This repository folder contains the Syringe Pump GUI (henceforth GUI) applicatio
 
 The Syringe Pump device is a Harp device and has all the inherent functionality of Harp devices.
 
-The GUI was developed using [.NET 5](https://dotnet.microsoft.com/), [Avalonia](https://avaloniaui.net/) with ReactiveUI and makes direct use of the [Bonsai.Harp](https://github.com/bonsai-rx/harp) library.
+The GUI was developed using [.NET 6](https://dotnet.microsoft.com/), [Avalonia](https://avaloniaui.net/) with ReactiveUI and makes direct use of the [Bonsai.Harp](https://github.com/bonsai-rx/harp) library.
 
 As with other Harp devices, the Syringe Pump can also be used in [Bonsai](bonsai-rx.org/) using the [Bonsai.Harp.CF](https://github.com/bonsai-rx/harp.cf) package. 
 
 ## Installation
 
-Go to the [Downloads](https://bitbucket.org/fchampalimaud/device.pump/downloads/) page to download the latest version for your Operating System.
+Go to the Releases page to download the latest version for your Operating System.
 
 Currently there are x64 builds for Windows and Linux. Mac builds will be available in the future.
 
@@ -26,10 +26,6 @@ There might be other alternatives to this, but at least on Ubuntu and Fedora que
 sudo usermod -a -G dialout <USERNAME>
 ```
 
-## Usage
-
-Usage information is available in the [Wiki](https://bitbucket.org/fchampalimaud/device.pump/wiki/Home).
-
 ## For developers
 
 ### Build Windows installer using NSIS manually
@@ -56,9 +52,28 @@ dotnet restore -r osx-x64 -p:TargetFramework=net6.0
 dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-x64 -property:Configuration=Release -p:UseAppHost=true -p:TargetFramework=net6.0
 ```
 
+### Build tar.gz package for Linux (either in Linux or WSL)
+
+To build the tar.gz package, run the following commands on the solution folder:
+
+First you need to make sure that the [`dotnet-packaging`](https://github.com/quamotion/dotnet-packaging) tool is installed
+
+Run the following commands to install the tool:
+
+```sh
+dotnet tool install --global dotnet-tarball
+```
+
+Then run the following commands to build the tar.gz package:
+
+```sh
+dotnet restore -r linux-x64 -p:TargetFramework=net6.0
+dotnet msbuild -p:RuntimeIdentifier=linux-x64 -property:Configuration=Release -p:UseAppHost=true -p:TargetFramework=net6.0 /t:CreateTarball
+```
+
 ## Roadmap
 
-See the [open issues](https://bitbucket.org/fchampalimaud/device.pump/issues) for a list of proposed features (and known issues).
+See the [open issues](https://github.com/harp-tech/device.syringepump/issues) for a list of proposed features (and known issues).
 
 ## Contributing
 
@@ -72,7 +87,7 @@ Contributions are what make the open source community such an amazing place to b
 
 ## Authors
 
-Scientific Hardware Platform and Scientific Software Platform of the Champalimaud Foundation.
+Hardware & Software Platform of the Champalimaud Foundation.
 
 ### Main contributors
 

App/SyringePump.Design/App.axaml

@@ -2,7 +2,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="using:SyringePump.Design"
              x:Class="SyringePump.App"
-             Name="SyringePump">
+             Name="Syringe Pump">
     <Application.DataTemplates>
         <local:ViewLocator/>
     </Application.DataTemplates>

App/SyringePump.Design/SyringePump.Design.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
     <AssemblyName>SyringePump.Design</AssemblyName>
-    <Version>1.0</Version>
+    <Version>1.0.1</Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <OutputPath>..\bin\Debug\</OutputPath>

App/SyringePump.Design/ViewModels/SyringePumpViewModel.cs

@@ -381,7 +381,8 @@ private IObservable<Unit> ConnectAndGetBaseInfo()
                 Log.Information("Connection established with the following return information: {Info}", configuration);
 
                 // present messagebox if we are not handling a Pump device
-                if (configuration.WhoAmI != 1280)
+                // NOTE: this is temporary and in the next version we will remove support for the older ID (1280)
+                if (configuration.WhoAmI != 1296 && configuration.WhoAmI != 1280)
                 {
                     // when the configuration.WhoAmI is zero, we are dealing with a non-HARP device, so change message accordingly
                     var message = $"Found a HARP device: {configuration.DeviceName} ({configuration.WhoAmI}).\n\nThis GUI is only for the SyringePump HARP device.\n\nPlease select another serial port.";

App/SyringePump/Directory.Build.props

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="Packaging.Targets">
+      <Version>0.1.220-*</Version>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+</Project>

App/SyringePump/SyringePump.csproj

@@ -1,15 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
+    <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
     <Nullable>enable</Nullable>
     <UseAppHost>true</UseAppHost>
       <!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
     <TrimMode>copyused</TrimMode>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <AssemblyName>SyringePump</AssemblyName>
     <BaseOutputPath>..\bin</BaseOutputPath>
-    <Version>1.0</Version>
+    <Version>1.0.1</Version>
   </PropertyGroup>
   <PropertyGroup>
     <CFBundleName>SyringePump</CFBundleName>

Firmware/Pump/app.c

@@ -30,12 +30,12 @@ void hwbp_app_initialize(void)
     uint8_t hwH = 1;
     uint8_t hwL = 1;
     uint8_t fwH = 0;
-    uint8_t fwL = 5;
+    uint8_t fwL = 6;
     uint8_t ass = 0;
 
    	/* Start core */
     core_func_start_core(
-        1280,
+        1296,
         hwH, hwL,
         fwH, fwL,
         ass,