Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
A
ademco_hb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
ademco_hb
Commits
53a597eb
Commit
53a597eb
authored
Aug 14, 2022
by
captainwong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build
parent
c1744ae3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
ademco.c
ademco.c
+3
-2
build.sh
examples/build.sh
+1
-1
No files found.
ademco.c
View file @
53a597eb
...
@@ -489,7 +489,7 @@ int ademcoDataSegmentToCongwinFe100(uint8_t* fe100, const AdemcoDataSegment* dat
...
@@ -489,7 +489,7 @@ int ademcoDataSegmentToCongwinFe100(uint8_t* fe100, const AdemcoDataSegment* dat
*
p
++
=
'B'
;
*
p
++
=
'B'
;
*
p
++
=
'0'
;
*
p
++
=
'0'
;
}
else
{
}
else
{
sprintf
(
p
,
"%03d"
,
dataSegment
->
ademcoEvent
%
1000
);
// ȡ��3λ
sprintf
(
p
,
"%03d"
,
dataSegment
->
ademcoEvent
%
1000
);
p
+=
3
;
p
+=
3
;
}
}
...
@@ -786,7 +786,8 @@ int ademcoMakeNakPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct, Adem
...
@@ -786,7 +786,8 @@ int ademcoMakeNakPacket2(AdemcoPacket* pkt, uint16_t seq, const char* acct, Adem
return
pkt
->
raw_len
=
ademcoMakeNakPacket
(
pkt
->
raw
,
sizeof
(
pkt
->
raw
),
seq
,
acct
,
ademcoId
);
return
pkt
->
raw_len
=
ademcoMakeNakPacket
(
pkt
->
raw
,
sizeof
(
pkt
->
raw
),
seq
,
acct
,
ademcoId
);
}
}
int
ademcoMakeHbPacket2
(
AdemcoPacket
*
pkt
,
uint16_t
seq
,
const
char
*
acct
,
AdemcoId
ademcoId
,
AdemcoEvent
ademcoEvent
,
AdemcoGG
gg
,
AdemcoZone
zone
,
AdemcoXDataSegment
*
xdata
)
int
ademcoMakeHbPacket2
(
AdemcoPacket
*
pkt
,
uint16_t
seq
,
const
char
*
acct
,
AdemcoId
ademcoId
,
AdemcoEvent
ademcoEvent
,
AdemcoGG
gg
,
AdemcoZone
zone
,
AdemcoXDataSegment
*
xdata
)
{
{
pkt
->
seq
=
seq
;
pkt
->
seq
=
seq
;
copyAcct2AdemcoPacket
(
pkt
,
acct
);
copyAcct2AdemcoPacket
(
pkt
,
acct
);
...
...
examples/build.sh
View file @
53a597eb
...
@@ -12,4 +12,4 @@ if [ x$1 != x ] ;then
...
@@ -12,4 +12,4 @@ if [ x$1 != x ] ;then
fi
fi
fi
fi
g++
$opt
../server_demo/server_demo.cpp
-I
../../include
-lpthread
-o
server_demo
g++
$opt
../server_demo/server_demo.cpp ../../ademco.c
-I
../../
-lpthread
-o
server_demo
\ No newline at end of file
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment