aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2014-12-14 12:36:21 +0800
committerAndy Green <andy.green@linaro.org>2014-12-14 12:36:21 +0800
commit010fbd61be6058b925e585e4db3a34e34fced5ec (patch)
treef95817fd1c05ddf72aee072aadc3c79acec99205
parentdd1191f1e52a5d929b710faa9dc978794d8e707a (diff)
downloadarm-probe-010fbd61be6058b925e585e4db3a34e34fced5ec.tar.gz
update websockets api
Signed-off-by: Andy Green <andy.green@linaro.org>
-rw-r--r--aepd/websocket-protocol.c2
-rw-r--r--config24
2 files changed, 3 insertions, 23 deletions
diff --git a/aepd/websocket-protocol.c b/aepd/websocket-protocol.c
index 4a29390..666827d 100644
--- a/aepd/websocket-protocol.c
+++ b/aepd/websocket-protocol.c
@@ -63,7 +63,7 @@ static int callback_http(struct libwebsocket_context *context,
sprintf(buf, LOCAL_RESOURCE_PATH"%s", whitelist[n].urlpath);
if (libwebsockets_serve_http_file(context, wsi, buf,
- whitelist[n].mimetype, NULL))
+ whitelist[n].mimetype, NULL, 0))
fprintf(stderr, "Failed to send HTTP file\n");
break;
diff --git a/config b/config
index ace19ed..dffbe7e 100644
--- a/config
+++ b/config
@@ -1,29 +1,9 @@
# arm-probe configuration file
#
# setup name
-PandaBoardES-B1-ANDY
+msm8916-qrd
# <device path>
/dev/serial/by-id/usb-NXP_SEMICOND_ARM_Energy_Probe_S_NO12300012-if00
- DC_IN 0.100000 -14.500000 -0.179000 13.363000 -0.000000 0.163300 0 DCIN/12V none #ff0000 SoC
- V3.3 0.100000 -45.000000 -0.019000 3.441000 -0.000000 0.111300 0 V3.3 DC_IN #c0c000 SoC
- V0.9/P3 0.100000 -27.500000 -0.037000 13.225000 -0.002400 0.163500 0 V0.9/P3 DC_IN #a00000 SoC
-
-#/dev/serial/by-id/usb-NXP_SEMICOND_ARM_Energy_Probe_S_NO12300011-if00
-# V5.0 0.100000 -8.000000 -0.031000 0.064000 -0.000000 0.001942 0 SoCVIO\\_1V8 VBAT #a0c0e0 SoC
-# V1.5 0.100000 -38.000000 -0.038000 0.062244 -0.000000 0.001926 0 SoCVDD\\_V2V1/AUDIO VBAT #0000c0 SoC
-# V3.3 0.100000 -38.000000 -0.028000 0.045373 -0.000400 0.002594 0 SoCV1V29/LPDDR2 VBAT #00ff00 SoC
-
-#/dev/ttyACM2
-# DC_IN 0.100000 -19.500000 -0.001628 0.003839 -0.000118 0.000288 0 DC\\_IN none #000000 -
-# USBHUB 0.470000 -39.000000 -0.017226 0.003700 -0.000432 0.000263 0 USBHUB VBAT #e000e0 -
-# VDD_3V3 0.470000 -51.000000 -0.018237 0.006000 -0.000625 0.000433 0 VDD\\_3V3 VBAT #0000ff -
-
-#/dev/ttyACM3
-# ch10 0.470000 -29.000000 -0.016016 0.004660 -0.000393 0.000545 0 ch10
-# ch11 0.470000 -57.000000 -0.016359 0.006300 -0.000300 0.000367 0 ch11
-# ch12 0.470000 -21.000000 -0.017112 0.004148 -0.000284 0.000333 0 ch12
-
-/virtual
- VBAT 1 0 0 0 0 0 0 VBAT DC_IN #555555 virtual
+ V5.0 0.330000 -14.500000 -0.179000 13.363000 -0.000000 0.163300 0 V5.0 DC_IN #ff0000 SoC