 researchman
|
3ddff01b1f
fix merging
|
пре 7 година |
|
researchman
|
8c441706e9
fix merging
|
пре 7 година |
|
researchman
|
a628e5e420
add data filter
|
пре 7 година |
|
researchman
|
66ba9bfb69
fix merge devalgo
|
пре 7 година |
|
researchman
|
329a9e7454
fix tof calc time interval
|
пре 7 година |
 lixiaoyao
|
584283d556
over
|
пре 7 година |
|
lixiaoyao
|
a239f1a0c8
Merge branch 'newprotocal' of http://local.beijingyongan.com:3000/collector/YA-YAServer into newprotocal
|
пре 7 година |
|
lixiaoyao
|
4edc17f30a
drivingface card lost
|
пре 7 година |
 lihz
|
959ed21bbf
Merge branch 'newprotocal' of http://local.beijingyongan.com:3000/lihz/YAServer; branch 'newprotocal' of http://local.beijingyongan.com:3000/collector/YA-YAServer into newprotocal
|
пре 7 година |
|
lihz
|
a502c00dbe
add area_id to landmark
|
пре 7 година |
|
lixiaoyao
|
be383acce4
down_mine_over_time && area_over_time alarm
|
пре 7 година |
|
lixiaoyao
|
ab14aeb346
Merge branch 'newprotocal' of http://local.beijingyongan.com:3000/collector/YA-YAServer into newprotocal
|
пре 7 година |
|
lihz
|
e8c6726bb5
Merge branch 'newprotocal' of http://local.beijingyongan.com:3000/collector/YA-YAServer into newprotocal
|
пре 7 година |
|
lihz
|
e85aa87750
deal help
|
пре 7 година |
|
lixiaoyao
|
3dbbbdba64
get_json_event(true)
|
пре 7 година |
|
lihz
|
0eb1432dcf
cal-pos-by-cache
|
пре 7 година |
|
lixiaoyao
|
76209f754a
Merge branch 'newprotocal' of http://local.beijingyongan.com:3000/collector/YA-YAServer into newprotocal
|
пре 7 година |
|
lixiaoyao
|
ff730588f9
change the logic that drivingface alarm
|
пре 7 година |
|
lihz
|
c0a6763b87
Merge branch 'newprotocal' of http://local.beijingyongan.com:3000/collector/YA-YAServer into newprotocal
|
пре 7 година |
|
researchman
|
99b7a8c6ab
tof ins protocal
|
пре 7 година |
|
lixiaoyao
|
14a53d19eb
modify the algo for dirvingface
|
пре 7 година |
|
lihz
|
c9860763b5
init sls_setting
|
пре 7 година |
|
lihz
|
eb0f523413
fixed bugs
|
пре 7 година |
|
researchman
|
ce1e5a3e4b
fix merging
|
пре 7 година |
|
lixiaoyao
|
5a4e6db783
Merge branch 'newprotocal' of http://local.beijingyongan.com:3000/collector/YA-YAServer into newprotocal
|
пре 7 година |
|
lixiaoyao
|
0d63e5b413
string 2 int
|
пре 7 година |
|
researchman
|
0d11da37a9
no fix
|
пре 7 година |
|
researchman
|
566cf006dd
Merge branch 'newprotocal' of http://124.204.33.42:3000/collector/YA-YAServer into newprotocal
|
пре 7 година |
|
lixiaoyao
|
37ad2bfcd4
del cardid zero && drivingface length ,post json
|
пре 7 година |
|
researchman
|
8409251b41
Merge branch 'newprotocal' of http://124.204.33.42:3000/collector/YA-YAServer into newprotocal
|
пре 7 година |
