ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Updated plugin versions to indicate alpha status and changed back JSON page function parameters.

Browse source
This commit is contained in:
Ziver Koc 2020-09-05 13:39:43 +02:00
parent 4a31b474c5
commit 51fa28bddf
7 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/hal-mqtt/src/se/hal/plugin/mqtt/plugin.json
View file

@ -1,5 +1,5 @@
{ {
"version": 1.0, "version": 0.1,
"name": "Hal-MQTT", "name": "Hal-MQTT",
"interfaces": [ "interfaces": [
{"se.hal.intf.HalAutoScannableController": "se.hal.plugin.mqtt.HalMqttController"} {"se.hal.intf.HalAutoScannableController": "se.hal.plugin.mqtt.HalMqttController"}

2
plugins/hal-raspberry/src/se/hal/plugin/raspberry/plugin.json
View file

@ -1,5 +1,5 @@
{ {
"version": 1.1, "version": 1.0,
"name": "Hal-RaspberryPi Sensors", "name": "Hal-RaspberryPi Sensors",
"interfaces": [ "interfaces": [
{"se.hal.intf.HalSensorConfig": "se.hal.plugin.raspberry.RPiPowerConsumptionSensor"}, {"se.hal.intf.HalSensorConfig": "se.hal.plugin.raspberry.RPiPowerConsumptionSensor"},

2
plugins/hal-zigbee/src/se/hal/plugin/zigbee/plugin.json
View file

@ -1,5 +1,5 @@
{ {
"version": 1.0, "version": 0.1,
"name": "Hal-Zigbee", "name": "Hal-Zigbee",
"interfaces": [ "interfaces": [
{"se.hal.intf.HalAutoScannableController": "se.hal.plugin.zigbee.HalDeconzZigbeeController"} {"se.hal.intf.HalAutoScannableController": "se.hal.plugin.zigbee.HalDeconzZigbeeController"}

2
plugins/hal-zwave/src/se/hal/plugin/zwave/plugin.json
View file

@ -1,5 +1,5 @@
{ {
"version": 1.0, "version": 0.1,
"name": "Hal-ZWwave", "name": "Hal-ZWwave",
"interfaces": [ "interfaces": [
] ]

4
src/se/hal/intf/HalJsonPage.java
View file

@ -37,7 +37,7 @@ public abstract class HalJsonPage extends HalWebPage {
JSONWriter writer = new JSONWriter(out); JSONWriter writer = new JSONWriter(out);
try{ try{
writer.write( writer.write(
jsonRespond(out, headers, session, cookie, request)); jsonRespond(session, cookie, request));
} catch (Exception e){ } catch (Exception e){
logger.log(Level.SEVERE, null, e); logger.log(Level.SEVERE, null, e);
DataNode root = new DataNode(DataNode.DataType.Map); DataNode root = new DataNode(DataNode.DataType.Map);
@ -58,8 +58,6 @@ public abstract class HalJsonPage extends HalWebPage {
protected abstract DataNode jsonRespond( protected abstract DataNode jsonRespond(
HttpPrintStream out,
HttpHeader headers,
Map<String, Object> session, Map<String, Object> session,
Map<String, String> cookie, Map<String, String> cookie,
Map<String, String> request) throws Exception; Map<String, String> request) throws Exception;

10
src/se/hal/page/MapJsonPage.java
View file

@ -27,11 +27,11 @@ public class MapJsonPage extends HalJsonPage {
@Override @Override
public DataNode jsonRespond(HttpPrintStream out, public DataNode jsonRespond(
HttpHeader headers, Map<String, Object> session,
Map<String, Object> session, Map<String, String> cookie,
Map<String, String> cookie, Map<String, String> request) throws Exception {
Map<String, String> request) throws Exception {
DBConnection db = HalContext.getDB(); DBConnection db = HalContext.getDB();
DataNode root = new DataNode(DataNode.DataType.Map); DataNode root = new DataNode(DataNode.DataType.Map);

2
src/se/hal/page/SensorJsonPage.java
View file

@ -39,8 +39,6 @@ public class SensorJsonPage extends HalJsonPage {
@Override @Override
public DataNode jsonRespond( public DataNode jsonRespond(
HttpPrintStream out,
HttpHeader headers,
Map<String, Object> session, Map<String, Object> session,
Map<String, String> cookie, Map<String, String> cookie,
Map<String, String> request) throws Exception{ Map<String, String> request) throws Exception{