diff --git a/webserver/testbedstatus.php b/webserver/testbedstatus.php index e916dd01bb7e10653e4e898502ef7daeb1c05305..62bc00cc5a89170d6da134e97a7cae35d53ecce2 100755 --- a/webserver/testbedstatus.php +++ b/webserver/testbedstatus.php @@ -151,9 +151,7 @@ $javascript = '<link rel="stylesheet" href="css/ui-lightness/jquery-ui-1.8.20.cu while ($row = mysqli_fetch_array($rs)) { $i++; echo ($i%2 == 1) ? "<tr class='even'>" : "<tr class='odd'>"; - if ($row['observer_id'] < 10 ) - echo "<td>00"; - elseif ($row['observer_id'] < 100 ) + if ($row['observer_id'] < 10) echo "<td>0"; else echo "<td>"; diff --git a/webserver/xml/flocklab.xsd b/webserver/xml/flocklab.xsd index 8d228d92eb1dccd98e88f7281c28c89554ac60b9..82a9d87e34e8326f99083bf76ebaea7cc0e852d4 100644 --- a/webserver/xml/flocklab.xsd +++ b/webserver/xml/flocklab.xsd @@ -206,7 +206,10 @@ <xs:complexType name="gpioTracingConfType"> <xs:sequence> <xs:element name="obsIds" type="obsIdListRestType"/> - <xs:element name="pinConf" type="gpioTracingPinConfType" minOccurs="1" maxOccurs="unbounded"/> + <xs:choice> + <xs:element name="pinConf" type="gpioTracingPinConfType" minOccurs="1" maxOccurs="unbounded"/> + <xs:element name="pins" type="pinTracingListType"/> + </xs:choice> </xs:sequence> </xs:complexType> <xs:complexType name="gpioTracingPinConfType"> @@ -362,6 +365,10 @@ </xs:restriction> </xs:simpleType> +<xs:simpleType name="pinTracingListType"> + <xs:list itemType="pinTracingType"/> +</xs:simpleType> + <!-- Type definition for actuation enabled GPIOs --> <xs:simpleType name="pinActType"> <xs:restriction base="xs:string">