Skip to content

Commit

Permalink
Bumping version to 1.0.11
Browse files Browse the repository at this point in the history
  • Loading branch information
forki committed Dec 23, 2018
1 parent f809e1d commit 1bec7a4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Release Notes

## 1.0.10 - 2018-12-22
## 1.0.11 - 2018-12-22
* Christmas edition

## 0.16.25 - 2018-12-18
Expand Down
4 changes: 2 additions & 2 deletions src/Client/ReleaseNotes.fs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module internal ReleaseNotes

let Version = "1.0.10"
let Version = "1.0.11"

let IsPrerelease = false

let Notes = """
# Release Notes
## 1.0.10 - 2018-12-22
## 1.0.11 - 2018-12-22
* Christmas edition
## 0.16.25 - 2018-12-18
Expand Down
11 changes: 10 additions & 1 deletion src/PiServer/PiServer.fs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ open System.Reflection
open GeneralIO
open Elmish
open Elmish.Audio
open System.Net.NetworkInformation

let firmwareTarget = System.IO.Path.GetFullPath "/home/pi/firmware"

Expand Down Expand Up @@ -101,11 +102,19 @@ let rfidLoop (dispatch,nodeServices:INodeServices) = task {
waiting <- false
}

let getMACAddress() =
let firstMacAddress =
NetworkInterface.GetAllNetworkInterfaces()
|> Seq.filter (fun nic -> nic.OperationalStatus = OperationalStatus.Up && nic.NetworkInterfaceType <> NetworkInterfaceType.Loopback)
|> Seq.map (fun nic -> nic.GetPhysicalAddress().ToString())
|> Seq.tryHead
firstMacAddress
|> Option.defaultValue "9bb2b109-bf08-4342-9e09-f4ce3fb01c0f" // TODO: load from some config

let init nodeServices : Model * Cmd<Msg> =
{ PlayList = None
FirmwareUpdateInterval = TimeSpan.FromHours 1.
UserID = "9bb2b109-bf08-4342-9e09-f4ce3fb01c0f" // TODO: load from some config
UserID = getMACAddress()
TagServer = "https://audio-hub.azurewebsites.net" // TODO: load from some config
Volume = 0.5 // TODO: load from webserver
RFID = None
Expand Down

0 comments on commit 1bec7a4

Please sign in to comment.