test/dgiot
1
0
Fork 0
mirror of https://gitee.com/dgiiot/dgiot.git synced 2024-12-04 21:27:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: index seq

Browse Source
This commit is contained in:
U-JOHNLIU\jonhl 2022-02-21 21:51:34 +08:00
parent 94ba672fbf
commit 37502f5c62
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dgiot_meter/src/dgiot_meter_tcp.erl
View File

@ -231,7 +231,7 @@ handle_info({deliver, _Topic, Msg}, #tcp{state = #state{id = _ChannelId, protoco
io:format("~s ~p ProData ~p Protocol ~p~n", [?FILE, ?LINE, Payload, Protocol]),
case Protocol of
?DLT376 ->
Payload2 = dlt376_decoder:frame_write_param(#{<<"concentrator">> => DevAddr, <<"payload">> => Payload}),
Payload2 = dlt376_decoder:frame_write_param(#{<<"concentrator">> => DevAddr, <<"payload">> => jsx:decode(Payload)}),
?LOG(info, "Payload2:~p ~n~n", [dgiot_utils:binary_to_hex(Payload2)]),
dgiot_tcp_server:send(TCPState, Payload2);
?DLT645 ->

16
apps/dgiot_meter/src/proctol/dlt376_decoder.erl
View File

@ -72,7 +72,7 @@
},
<<"type">> => #{
order => 3,
type => string,
type => enum,
required => true,
default => #{<<"value">> => <<"byte">>, <<"label">> => <<"byte">>},
enum => [
@ -500,11 +500,11 @@ pn_to_da(Pn) ->
%%<<"sessiontoken">> => <<>>}}
frame_write_param(#{<<"concentrator">> := ConAddr, <<"payload">> := Frame}) ->
SortFrame = lists:sort(maps:keys(Frame)),
io:format("~s ~p SortFrame ~p.~n", [?FILE, ?LINE, SortFrame]),
Length = length(maps:keys(Frame)),
io:format("~s ~p SortFrame ~p.~n", [?FILE, ?LINE, Length]),
{BitList, Afn, Da, Fn} =
lists:map(fun(X, {Acc, A, D, F}) ->
case maps:find(X, Frame) of
lists:map(fun(Index, {Acc, A, D, F}) ->
case maps:find(Index, Frame) of
{ok, #{<<"dataForm">> := #{<<"afn">> := AFN, <<"di">> := FN, <<"length">> := Len, <<"type">> := Type} = DataForm} = Data} ->
DA = dgiot_utils:binary_to_hex(pn_to_da(to_integer(maps:get(<<"da">>, DataForm, 0)))),
case Type of
@ -525,7 +525,7 @@ frame_write_param(#{<<"concentrator">> := ConAddr, <<"payload">> := Frame}) ->
_ ->
{Acc, A, D, F}
end
end, {[], 0, <<>>, <<>>}, SortFrame),
end, {[], 0, <<>>, <<>>}, lists:seq(1, Length)),
io:format("~s ~p BitList ~p.~n", [?FILE, ?LINE, BitList]),
UserZone = <<<<V:BitLen>> || {V, BitLen} <- BitList>>,
io:format("~s ~p UserZone ~p.~n", [?FILE, ?LINE, UserZone]),
@ -579,13 +579,13 @@ add_to_userzone(UserZone, _Afn, _Fn) ->
concentrator_to_addr(ConAddr) when byte_size(ConAddr) == 6 ->
<<A11:2/bytes, A22:2/bytes, _/bytes>> = ConAddr,
<<_:2/bytes, A11:2/bytes, A22:2/bytes>> = ConAddr,
A1 = dlt645_proctol:reverse(A11),
A2 = dlt645_proctol:reverse(A22),
A3 = <<16#02>>,
<<A1:2/bytes, A2:2/bytes, A3:1/bytes>>;
concentrator_to_addr(ConAddr) when byte_size(ConAddr) == 12 ->
<<A11:2/bytes, A22:2/bytes, _/bytes>> = dgiot_utils:hex_to_binary(ConAddr),
<<_:2/bytes, A11:2/bytes, A22:2/bytes>> = dgiot_utils:hex_to_binary(ConAddr),
A1 = dlt645_proctol:reverse(A11),
A2 = dlt645_proctol:reverse(A22),
A3 = <<16#02>>,

2
apps/dgiot_meter/src/proctol/dlt645_decoder.erl
View File

@ -61,7 +61,7 @@
order => 2,
type => enum,
required => true,
default => #{<<"value">> => <<"byte">>, <<"label">> => <<"byte">>},
default => <<"byte"/utf8>>,
enum => [
#{<<"value">> => <<"byte">>, <<"label">> => <<"byte">>},
#{<<"value">> => <<"little">>, <<"label">> => <<"little">>},