diff options
| author | Andy Green <andy.green@linaro.org> | 2013-12-14 09:28:41 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2013-12-14 09:28:41 +0800 |
| commit | 0f27bd4f8b77c1032f704d054e6e136ef050a65f (patch) | |
| tree | bca3eb1c15f380a2c2587f048fcd73e6a436919d | |
| parent | 289d743f6bb6c80af4128e941e0a3b75c0842f7c (diff) | |
update for lws api change
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | aepd/share/aepscope.html | 2 | ||||
| -rw-r--r-- | aepd/websocket-protocol.c | 2 | ||||
| -rw-r--r-- | config | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/aepd/share/aepscope.html b/aepd/share/aepscope.html index 0c9edf9..3167efb 100644 --- a/aepd/share/aepscope.html +++ b/aepd/share/aepscope.html @@ -96,7 +96,7 @@ td.heading { font-size:9pt; font: Arial; font-weight:bold; vertical-align:middle </tr> <tr> <td colspan="2"> - <input type="range" id="scale" step="0.1" min="0.1" max="10" onchange="update_options();"> + <input type="range" id="scale" step="0.1" min="0.1" max="20" onchange="update_options();"> </td> </tr> </table> diff --git a/aepd/websocket-protocol.c b/aepd/websocket-protocol.c index 62425df..4a29390 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)) + whitelist[n].mimetype, NULL)) fprintf(stderr, "Failed to send HTTP file\n"); break; @@ -4,15 +4,15 @@ PandaBoardES-B1-ANDY # <device path> -/dev/serial/by-id/usb-NXP_SEMICOND_ARM_Energy_Probe_S_NO00000000-if00 - VDD_VCORE1 0.220000 -14.500000 -0.074000 0.137000 -0.029400 0.034100 0 SoCVCORE1/MPU VBAT #ff0000 SoC - VDD_VCORE2 0.470000 -45.000000 -0.174000 0.253000 -0.001600 0.008400 0 SoCVCORE2/IVA\\_AUDIO VBAT #c00000 SoC - VDD_VCORE3 0.470000 -27.500000 -0.164000 0.254000 -0.000000 0.003377 0 SoCVCORE3/CORE VBAT #a00000 SoC +/dev/serial/by-id/usb-NXP_SEMICOND_ARM_Energy_Probe_S_NO12300012-if00 + DC_IN 0.100000 -14.500000 -0.061161 0.132000 -0.000000 0.017534 0 DCIN/12V none #ff0000 SoC + V3.3 0.100000 -45.000000 -0.153000 0.226000 -0.000000 0.002000 0 V3.3 DC_IN #c0c000 SoC + V0.9/P3 0.100000 -27.500000 -0.129000 0.212000 -0.000000 0.003000 0 V0.9/P3 DC_IN #a00000 SoC -#/dev/serial/by-id/usb-NXP_SEMICOND_ARM_Energy_Probe_S_NO00010002-if00 -# VDD_1V8 0.470000 -8.000000 -0.004642 0.006818 -0.000242 0.000600 0 SoCVIO\\_1V8 VBAT #a0c0e0 SoC -# VDD_V2V1 0.470000 -38.000000 -0.016012 0.005433 -0.000305 0.000400 0 SoCVDD\\_V2V1/AUDIO VBAT #0000c0 SoC -# VDD_V1V29 0.470000 -38.000000 -0.016701 0.005867 -0.000262 0.000367 0 SoCV1V29/LPDDR2 VBAT #e0e000 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 - |