Skip to content
Snippets Groups Projects
Commit e63be98f authored by Patrik Paško's avatar Patrik Paško
Browse files

Merge branch 'master' into 'develop'

# Conflicts:
#   .gitlab-ci.yml
parents 31246187 5e63f143
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ stages: ...@@ -8,7 +8,7 @@ stages:
build: build:
stage: build stage: build
tags: tags:
- net5 - net5
script: script:
- dotnet build - dotnet build
......
...@@ -90,14 +90,16 @@ SensorDataContract data1 = new SensorDataContract ...@@ -90,14 +90,16 @@ SensorDataContract data1 = new SensorDataContract
Quantity = "Temperature", Quantity = "Temperature",
Value = "16", Value = "16",
Unit = "°C", Unit = "°C",
DataType = "Single" DataType = "Single",
Index = 0
}; };
SensorDataContract data2 = new SensorDataContract SensorDataContract data2 = new SensorDataContract
{ {
Quantity = "Humidity", Quantity = "Humidity",
Value = "31", Value = "31",
Unit = "%", Unit = "%",
DataType = "Single" DataType = "Single",
Index = 1
}; };
SensorDataContract[] sensorDataContracts = new SensorDataContract[] { data1, data2 }; SensorDataContract[] sensorDataContracts = new SensorDataContract[] { data1, data2 };
...@@ -141,14 +143,16 @@ SensorDataContract data1 = new SensorDataContract ...@@ -141,14 +143,16 @@ SensorDataContract data1 = new SensorDataContract
Quantity = "Temperature", Quantity = "Temperature",
Value = "16", Value = "16",
Unit = "°C", Unit = "°C",
DataType = "Single" DataType = "Single",
Index = 0
}; };
SensorDataContract data2 = new SensorDataContract SensorDataContract data2 = new SensorDataContract
{ {
Quantity = "Humidity", Quantity = "Humidity",
Value = "31", Value = "31",
Unit = "%", Unit = "%",
DataType = "Single" DataType = "Single",
Index = 1
}; };
SensorDataContract data3 = new SensorDataContract SensorDataContract data3 = new SensorDataContract
{ {
...@@ -156,7 +160,8 @@ SensorDataContract data3 = new SensorDataContract ...@@ -156,7 +160,8 @@ SensorDataContract data3 = new SensorDataContract
Timestamp = 1614599484673, Timestamp = 1614599484673,
Value = "800", Value = "800",
DataType = "Int32", DataType = "Int32",
Unit = "unit" Unit = "unit",
Index = 2
}; };
SensorDataContract[] sensorDataContracts = new SensorDataContract[] { data1, data2, data3 }; SensorDataContract[] sensorDataContracts = new SensorDataContract[] { data1, data2, data3 };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment