Minor bug fixes

Author: gotthardp

priv/admin/admin.js

@@ -318,7 +318,7 @@ myApp.config(['NgAdminConfigurationProvider', function (nga) {
             .template('<qgraph value="value"></qgraph>')
     ]).concat([
         nga.field('devstat.battery', 'number').label('Battery'),
-        nga.field('devstat.margin', 'number').label('Margin'),
+        nga.field('devstat.margin', 'number').label('SNR (dB)'),
         nga.field('devstat_time', 'datetime').label('Status Time'),
         nga.field('devstat_fcnt', 'number').label('Status FCnt'),
         nga.field('devaddr', 'template').label('Device Status')
@@ -364,7 +364,7 @@ myApp.config(['NgAdminConfigurationProvider', function (nga) {
         nga.field('devaddr', 'reference').label('DevAddr')
             .targetEntity(links)
             .targetField(nga.field('devaddr')),
-        nga.field('lsnr').label('SNR'),
+        nga.field('rxq.lsnr').label('SNR'),
         nga.field('fcnt', 'number').label('FCnt'),
         nga.field('port', 'number'),
         nga.field('data')
@@ -423,7 +423,7 @@ myApp.config(['NgAdminConfigurationProvider', function (nga) {
                 nga.field('devaddr', 'reference').label('DevAddr')
                     .targetEntity(links)
                     .targetField(nga.field('devaddr')),
-                nga.field('lsnr').label('SNR')
+                nga.field('rxq.lsnr').label('SNR')
             ])
             .sortField('datetime')
             .perPage(7)
@@ -679,7 +679,7 @@ return {
             $scope.rxdChartObject.options = {
                 "vAxes": {
                     0: {"title": 'Battery'},
-                    1: {"title": 'Margin (dB)'}
+                    1: {"title": 'SNR (dB)'}
                 },
                 "series": {
                     0: {"targetAxisIndex": 0},
@@ -698,7 +698,8 @@ return {
                     "gridlines": {"count": -1}
                 },
                 "vAxes": {
-                    0: {"minValue":0, "maxValue": 255}
+                    0: {"minValue":0, "maxValue": 255},
+                    1: {"minValue":-32, "maxValue": 31}
                 }
             };
             updateData();

src/lorawan_admin_devstat.erl

@@ -38,7 +38,7 @@ get_rxframe(Req, State) ->
     Array = [{cols, [
                 [{id, <<"fcnt">>}, {label, <<"FCnt">>}, {type, <<"number">>}],
                 [{id, <<"batt">>}, {label, <<"Battery">>}, {type, <<"number">>}],
-                [{id, <<"margin">>}, {label, <<"Margin (dB)">>}, {type, <<"number">>}]
+                [{id, <<"snr">>}, {label, <<"SNR (dB)">>}, {type, <<"number">>}]
                 ]},
             {rows, lists:filtermap(
                 fun (#rxframe{devstat=undefined}) ->
@@ -47,6 +47,7 @@ get_rxframe(Req, State) ->
                     {true,  [{c, [
                                 [{v, FCnt}],
                                 [{v, Batt}],
+                                % what the standard calls "margin" is simply the SNR
                                 [{v, Margin}]
                             ]}]}
                 end, ActRec)

src/lorawan_ws_frames.erl

@@ -64,14 +64,20 @@ websocket_handle(Data, State) ->
 store_frame(Msg, #state{format=raw} = State) ->
     store_frame0(undefined, #txdata{data=Msg}, State);
 store_frame(Msg, #state{format=json} = State) ->
-    Struct = jsx:decode(Msg, [{labels, atom}]),
-    store_frame0(extract_bin(devaddr, Struct, undefined),
-        #txdata{
-            confirmed = proplists:get_value(confirmed, Struct, false),
-            port = proplists:get_value(port, Struct),
-            data = extract_bin(data, Struct, <<>>),
-            pending = proplists:get_value(pending, Struct, false)
-        }, State).
+    case jsx:is_json(Msg) of
+        true ->
+            Struct = jsx:decode(Msg, [{labels, atom}]),
+            store_frame0(extract_bin(devaddr, Struct, undefined),
+                #txdata{
+                    confirmed = proplists:get_value(confirmed, Struct, false),
+                    port = proplists:get_value(port, Struct),
+                    data = extract_bin(data, Struct, <<>>),
+                    pending = proplists:get_value(pending, Struct, false)
+                }, State);
+        false ->
+            lager:warning("JSON syntax error"),
+            {stop, State}
+    end.
 
 store_frame0(undefined, TxData, #state{devaddr=DevAddr, gname=undefined} = State) ->
     lorawan_application_handler:store_frame(DevAddr, TxData),