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
80489de5
Commit
80489de5
authored
Nov 20, 2023
by
captainwong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ademco version 1.0.0
parent
685b679d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
1748 additions
and
1624 deletions
+1748
-1624
ademco.c
ademco.c
+1152
-1151
ademco.h
ademco.h
+276
-250
ademco_version.h
ademco_version.h
+19
-0
gen_event_md.cpp
examples/gen_event_md/gen_event_md.cpp
+25
-97
hb_com.c
hb_com.c
+131
-55
hb_com.h
hb_com.h
+121
-53
copy_from_hb.bat
tools/copy_from_hb.bat
+5
-4
mkrelease.sh
tools/mkrelease.sh
+14
-1
test.sh
tools/test.sh
+5
-13
No files found.
ademco.c
View file @
80489de5
This diff is collapsed.
Click to expand it.
ademco.h
View file @
80489de5
This diff is collapsed.
Click to expand it.
ademco_version.h
0 → 100644
View file @
80489de5
#ifndef __ADEMCO_VERSION_H__
#define __ADEMCO_VERSION_H__
/*
* Versions with the same major number are ABI stable. API is allowed to
* evolve between minor releases, but only in a backwards compatible way.
*/
#define ADEMCO_VERSION_MAJOR 1
#define ADEMCO_VERSION_MINOR 0
#define ADEMCO_VERSION_PATCH 0
#define ADEMCO_VERSION_IS_RELEASE 1
#define ADEMCO_VERSION_SUFFIX ""
#define ADEMCO_VERSION_HEX ((ADEMCO_VERSION_MAJOR << 16) | \
(
ADEMCO_VERSION_MINOR
<<
8
)
|
\
(
ADEMCO_VERSION_PATCH
))
#endif
/* __ADEMCO_VERSION_H__ */
examples/gen_event_md/gen_event_md.cpp
View file @
80489de5
...
@@ -25,109 +25,38 @@ const char* print_bool(bool b) {
...
@@ -25,109 +25,38 @@ const char* print_bool(bool b) {
}
}
AdemcoEvent
statusEvents
[]
=
{
AdemcoEvent
statusEvents
[]
=
{
#define XX(name, code, zh) EVENT_##name,
// 主机或分机状态报告
ADEMCO_STATUS_EVENTS_MAP
(
XX
)
EVENT_ARM
,
#undef XX
EVENT_DISARM
,
EVENT_HALFARM_1456
,
EVENT_HALFARM
,
EVENT_EMERGENCY
,
};
};
AdemcoEvent
alarmEvents
[]
=
{
AdemcoEvent
alarmEvents
[]
=
{
#define XX(name, code, zh) EVENT_##name,
// 防区报警
ADEMCO_ALARM_EVENTS_MAP
(
XX
)
EVENT_BURGLAR
,
#undef XX
EVENT_DOORRINGING
,
EVENT_FIRE
,
EVENT_DURESS
,
EVENT_GAS
,
EVENT_WATER
,
EVENT_TAMPER
,
EVENT_ZONE_TAMPER
,
EVENT_BYPASS
,
EVENT_BYPASS_RESUME
,
};
};
AdemcoEvent
excepEvents
[]
=
{
AdemcoEvent
excepEvents
[]
=
{
#define XX(name, code, zh) EVENT_##name,
// 防区异常
ADEMCO_EXEPTION_EVENTS_MAP
(
XX
)
EVENT_AC_BROKE
,
ADEMCO_RESUME_EVENTS_MAP
(
XX
)
EVENT_AC_RECOVER
,
#undef XX
EVENT_LOWBATTERY
,
EVENT_BATTERY_RECOVER
,
EVENT_BADBATTERY
,
EVENT_BADBATTERY_RECOVER
,
EVENT_SOLARDISTURB
,
EVENT_SOLARDISTURB_RECOVER
,
EVENT_DISCONNECT
,
EVENT_RECONNECT
,
EVENT_BATTERY_EXCEPTION
,
EVENT_BATTERY_EXCEPTION_RECOVER
,
EVENT_OTHER_EXCEPTION
,
EVENT_OTHER_EXCEPTION_RECOVER
,
EVENT_LOST
,
EVENT_LOST_RECOVER
,
// 标准事件,但不做处理
EVENT_3100
,
};
};
AdemcoEvent
privateEvents
[]
=
{
AdemcoEvent
privateEvents
[]
=
{
#define XX(name, code, zh) EVENT_##name,
ADEMCO_HB_EVENTS_MAP
(
XX
)
#undef XX
};
// ------------------私有事件-----------------------------------------
AdemcoEvent
allEvents
[]
=
{
EVENT_SERIAL485DIS
,
#define XX(name, code, zh) EVENT_##name,
EVENT_SERIAL485CONN
,
ADEMCO_STATUS_EVENTS_MAP
(
XX
)
ADEMCO_ALARM_EVENTS_MAP
(
XX
)
EVENT_CONN_HANGUP
,
ADEMCO_EXEPTION_EVENTS_MAP
(
XX
)
EVENT_CONN_RESUME
,
ADEMCO_RESUME_EVENTS_MAP
(
XX
)
ADEMCO_HB_EVENTS_MAP
(
XX
)
EVENT_DISARM_PWD_ERR
,
#undef XX
EVENT_SUB_MACHINE_SENSOR_EXCEPTION
,
EVENT_SUB_MACHINE_SENSOR_RESUME
,
EVENT_SUB_MACHINE_POWER_EXCEPTION
,
EVENT_SUB_MACHINE_POWER_RESUME
,
EVENT_COM_PASSTHROUGH
,
EVENT_ENTER_SET_MODE
,
EVENT_EXIT_SET_MODE
,
EVENT_QUERY_SUB_MACHINE
,
EVENT_WRITE_TO_MACHINE
,
EVENT_I_AM_NET_MODULE
,
EVENT_I_AM_GPRS
,
EVENT_I_AM_LCD_MACHINE
,
EVENT_I_AM_WIRE_MACHINE
,
EVENT_I_AM_WIFI_MACHINE
,
EVENT_I_AM_3_SECTION_MACHINE
,
EVENT_I_AM_IOT_MACHINE
,
EVENT_I_AM_TRUE_COLOR
,
EVENT_I_AM_GPRS_IOT
,
EVENT_I_AM_GPRS_PHONE
,
EVENT_I_AM_NB_MACHINE
,
EVENT_I_AM_WIFI2_MACHINE
,
EVENT_PHONE_USER_SOS
,
EVENT_PHONE_USER_CANCLE_ALARM
,
EVENT_ENTER_SETTING_MODE
,
EVENT_EXIT_SETTING_MODE
,
EVENT_RESTORE_FACTORY_SETTINGS_710
,
EVENT_RESTORE_FACTORY_SETTINGS
,
EVENT_SIM_IS_IOT_CARD
,
EVENT_SIM_IS_IOT_PLATFORM_CARD
,
EVENT_SIM_IS_NOT_IOT_CARD
,
EVENT_WHAT_IS_YOUR_TYPE
,
EVENT_SIGNAL_STRENGTH_CHANGED
,
EVENT_OFFLINE
,
EVENT_ONLINE
,
};
};
void
printEvents
(
const
AdemcoEvent
*
events
,
size_t
len
)
void
printEvents
(
const
AdemcoEvent
*
events
,
size_t
len
)
...
@@ -239,7 +168,7 @@ void print_machineTypes()
...
@@ -239,7 +168,7 @@ void print_machineTypes()
printf
(
"|事件码类型|主机类型|布防|撤防|半布防|设置|信号强度|防区|有线防区|SMS|内核|网络|型号|
\n
"
printf
(
"|事件码类型|主机类型|布防|撤防|半布防|设置|信号强度|防区|有线防区|SMS|内核|网络|型号|
\n
"
"|---------|-------|----|----|-----|----|-------|----|-------|---|----|---|----|
\n
"
);
"|---------|-------|----|----|-----|----|-------|----|-------|---|----|---|----|
\n
"
);
for
(
auto
e
:
Ademco
Events
)
{
for
(
auto
e
:
all
Events
)
{
if
(
ademcoIsMachineTypeEvent
(
e
))
{
if
(
ademcoIsMachineTypeEvent
(
e
))
{
auto
t
=
hbMachineTypeFromAdemcoEvent
(
e
);
auto
t
=
hbMachineTypeFromAdemcoEvent
(
e
);
if
(
!
hbMachineIsSelling
(
t
))
continue
;
if
(
!
hbMachineIsSelling
(
t
))
continue
;
...
@@ -275,7 +204,7 @@ void print_imgs()
...
@@ -275,7 +204,7 @@ void print_imgs()
"|---|--------|
\n
"
);
"|---|--------|
\n
"
);
std
::
map
<
std
::
string
,
std
::
string
>
imgs
;
std
::
map
<
std
::
string
,
std
::
string
>
imgs
;
for
(
auto
e
:
Ademco
Events
)
{
for
(
auto
e
:
all
Events
)
{
if
(
ademcoIsMachineTypeEvent
(
e
))
{
if
(
ademcoIsMachineTypeEvent
(
e
))
{
auto
t
=
hbMachineTypeFromAdemcoEvent
(
e
);
auto
t
=
hbMachineTypeFromAdemcoEvent
(
e
);
if
(
!
hbMachineIsSelling
(
t
))
continue
;
if
(
!
hbMachineIsSelling
(
t
))
continue
;
...
@@ -350,8 +279,7 @@ void print_available_zone_props()
...
@@ -350,8 +279,7 @@ void print_available_zone_props()
}
}
printf
(
"|
\n
"
);
printf
(
"|
\n
"
);
for
(
auto
e
:
allEvents
)
{
for
(
auto
e
:
AdemcoEvents
)
{
if
(
ademcoIsMachineTypeEvent
(
e
))
{
if
(
ademcoIsMachineTypeEvent
(
e
))
{
auto
t
=
hbMachineTypeFromAdemcoEvent
(
e
);
auto
t
=
hbMachineTypeFromAdemcoEvent
(
e
);
if
(
!
hbMachineIsSelling
(
t
))
continue
;
if
(
!
hbMachineIsSelling
(
t
))
continue
;
...
...
hb_com.c
View file @
80489de5
This diff is collapsed.
Click to expand it.
hb_com.h
View file @
80489de5
This diff is collapsed.
Click to expand it.
tools/copy_from_hb.bat
View file @
80489de5
xcopy /i /s /y G:\dev_libs\ademco\hb\ademco.h ..\
xcopy /i /s /y G:\dev_libs\ademco\hb\ademco.h ..\
xcopy /i /s /y G:\dev_libs\ademco\hb\ademco.c ..\
xcopy /i /s /y G:\dev_libs\ademco\hb\ademco.c ..\
xcopy /i /s /y G:\dev_libs\ademco\hb\hb_com.h ..\
xcopy /i /s /y G:\dev_libs\ademco\hb\hb_com.h ..\
xcopy /i /s /y G:\dev_libs\ademco\hb\hb_com.c ..\
xcopy /i /s /y G:\dev_libs\ademco\hb\hb_com.c ..\
\ No newline at end of file
xcopy /i /s /y G:\dev_libs\ademco\hb\ademco_version.h ..\
tools/mkrelease.sh
View file @
80489de5
...
@@ -18,6 +18,14 @@ export MACOS_TARGET=jack@JackMacBook-Pro.local
...
@@ -18,6 +18,14 @@ export MACOS_TARGET=jack@JackMacBook-Pro.local
export
MACOS_PROJECT_PATH
=
/Users/jack/projects/ademco_hb
export
MACOS_PROJECT_PATH
=
/Users/jack/projects/ademco_hb
export
MACOS_JAVA_HOME
=
/Library/Java/JavaVirtualMachines/jdk1.8.0_291.jdk/Contents/Home
export
MACOS_JAVA_HOME
=
/Library/Java/JavaVirtualMachines/jdk1.8.0_291.jdk/Contents/Home
major
=
`
cat
../ademco_version.h |
grep
ADEMCO_VERSION_MAJOR |
head
-n1
|
awk
'{print $3}'
`
minor
=
`
cat
../ademco_version.h |
grep
ADEMCO_VERSION_MINOR |
head
-n1
|
awk
'{print $3}'
`
patch
=
`
cat
../ademco_version.h |
grep
ADEMCO_VERSION_PATCH |
head
-n1
|
awk
'{print $3}'
`
version
=
$major
.
$minor
.
$patch
echo
"version:
$version
"
rm
-rf
dist
rm
-rf
dist
mkdir
-p
dist
mkdir
-p
dist
...
@@ -43,4 +51,9 @@ mkdir -p dist
...
@@ -43,4 +51,9 @@ mkdir -p dist
./mk_linux_node.sh
./mk_linux_node.sh
# mac-node
# mac-node
./mk_macos_node.sh
./mk_macos_node.sh
\ No newline at end of file
mv
dist ademco_hb-
$version
tar
-zcvf
ademco_hb-
$version
.tar.gz ademco_hb-
$version
zip
-r
ademco_hb-
$version
.zip ademco_hb-
$version
rm
-rf
ademco_hb-
$version
tools/test.sh
View file @
80489de5
#!/bin/bash
#!/bin/bash
# win-node
CURRENT_DIR
=
$(
cd
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
"
;
pwd
-P
)
./clean.sh
cd
$CURRENT_DIR
mkdir
-p
win_node
./win_node.bat
cp
-r
../swig/build/ win_node/
cp
../swig/nodejs-demo.js win_node/
rm
-f
win_node.zip
cd
win_node
zip
-r
../win_node.zip
.
*
cd
..
rm
-rf
win_node/
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