Commit e588467f authored by Valentin Reis's avatar Valentin Reis
Browse files

fix schema files

parent 493d4be9
Pipeline #11749 passed with stages
in 2 minutes and 48 seconds
......@@ -13,9 +13,6 @@
"rpcPort": 3456,
"pubPort": 2345
},
"activeSensorFrequency": {
"hertz": 1
},
"perf": "perf",
"argo_perf_wrapper": "nrm-perfwrapper",
"downstreamCfg": {
......@@ -44,6 +41,6 @@
"hwmonEnabled": true
},
"passiveSensorFrequency": {
"fromHz": 1
"hertz": 1
}
}
}
\ No newline at end of file
{
"required": [
"activeSensorFrequency",
"argo_nodeos_config",
"argo_perf_wrapper",
"controlCfg",
......@@ -12,6 +11,7 @@
"hwmonCfg",
"logfile",
"nodeos",
"passiveSensorFrequency",
"perf",
"pmpi_lib",
"singularity",
......@@ -176,6 +176,7 @@
"hint",
"learnCfg",
"minimumControlInterval",
"minimumWaitInterval",
"referenceMeasurementRoundInterval",
"speedThreshold",
"staticPower"
......@@ -185,6 +186,17 @@
"referenceMeasurementRoundInterval": {
"type": "number"
},
"minimumWaitInterval": {
"required": [
"microseconds"
],
"type": "object",
"properties": {
"microseconds": {
"type": "number"
}
}
},
"hint": {
"oneOf": [
{
......@@ -386,17 +398,6 @@
"libnrmPath": {
"type": "string"
},
"activeSensorFrequency": {
"required": [
"hertz"
],
"type": "object",
"properties": {
"hertz": {
"type": "number"
}
}
},
"perf": {
"type": "string"
},
......@@ -523,6 +524,17 @@
"type": "boolean"
}
}
},
"passiveSensorFrequency": {
"required": [
"hertz"
],
"type": "object",
"properties": {
"hertz": {
"type": "number"
}
}
}
}
}
\ No newline at end of file
......@@ -1047,7 +1047,6 @@
"properties": {
"config": {
"required": [
"activeSensorFrequency",
"argo_nodeos_config",
"argo_perf_wrapper",
"controlCfg",
......@@ -1059,19 +1058,12 @@
"hwmonCfg",
"logfile",
"nodeos",
"passiveSensorFrequency",
"perf",
"pmpi_lib",
"singularity",
"upstreamCfg",
<<<<<<< HEAD:resources/schemas/upstream-rep.json
"verbose"
=======
"hwmonCfg",
"controlCfg",
"passiveSensorFrequency",
"extraStaticPassiveSensors",
"extraStaticActuators"
>>>>>>> sensor-fix:hsnrm/resources/upstreamRep.json
],
"type": "object",
"properties": {
......@@ -1228,15 +1220,10 @@
"properties": {
"controlCfg": {
"required": [
<<<<<<< HEAD:resources/schemas/upstream-rep.json
"hint",
=======
"minimumControlInterval",
"minimumWaitInterval",
"staticPower",
>>>>>>> sensor-fix:hsnrm/resources/upstreamRep.json
"learnCfg",
"minimumControlInterval",
"minimumWaitInterval",
"referenceMeasurementRoundInterval",
"speedThreshold",
"staticPower"
......@@ -1247,7 +1234,15 @@
"type": "number"
},
"minimumWaitInterval": {
"type": "number"
"required": [
"microseconds"
],
"type": "object",
"properties": {
"microseconds": {
"type": "number"
}
}
},
"hint": {
"oneOf": [
......@@ -1416,19 +1411,11 @@
},
{
"required": [
<<<<<<< HEAD:resources/schemas/upstream-rep.json
"controlOff"
],
"type": "object",
"properties": {
"controlOff": {
=======
"noControl"
],
"type": "object",
"properties": {
"noControl": {
>>>>>>> sensor-fix:hsnrm/resources/upstreamRep.json
"type": "object",
"properties": {}
}
......@@ -1458,20 +1445,6 @@
"libnrmPath": {
"type": "string"
},
<<<<<<< HEAD:resources/schemas/upstream-rep.json
"activeSensorFrequency": {
"required": [
"hertz"
],
"type": "object",
"properties": {
"hertz": {
"type": "number"
}
}
},
=======
>>>>>>> sensor-fix:hsnrm/resources/upstreamRep.json
"perf": {
"type": "string"
},
......@@ -1600,7 +1573,15 @@
}
},
"passiveSensorFrequency": {
"type": "number"
"required": [
"hertz"
],
"type": "object",
"properties": {
"hertz": {
"type": "number"
}
}
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment