修改电机速度条件;异常退出信号处理中,关闭扫描仪对象
This commit is contained in:
parent
cae6964184
commit
bf8348cf95
File diff suppressed because one or more lines are too long
|
@ -415,9 +415,23 @@ public:
|
|||
// "ui-pos": 18,
|
||||
// "auth": 0,
|
||||
// "size": 4,
|
||||
// "cur": 100,
|
||||
// "default": 100,
|
||||
// "range": [70, 100, 120, 150]
|
||||
// "default": {
|
||||
// "dev-model!=G200": 70,
|
||||
// "default": 100
|
||||
// },
|
||||
// "range": [{
|
||||
// "dev-model!=G200": 70
|
||||
// }, {
|
||||
// "dev-model!=G200": 80
|
||||
// }, {
|
||||
// "dev-model!=G200": 90
|
||||
// }, 100, {
|
||||
// "dev-model==G200": 110
|
||||
// }, {
|
||||
// "dev-model==G200": 120
|
||||
// }, {
|
||||
// "dev-model==G200": 130
|
||||
// }]
|
||||
// },
|
||||
// "is-check-askew": {
|
||||
// "cat": "none",
|
||||
|
|
|
@ -16,11 +16,18 @@
|
|||
#define BUF_LEN_FOR_PID 64
|
||||
|
||||
|
||||
static async_scanner *scanner = nullptr;
|
||||
static void sigHandler(int sig)
|
||||
{
|
||||
// if (sig == SIGINT || sig == SIGTERM)
|
||||
// remove(MY_PID_FILE);
|
||||
printf("exit now for signal: %d\n", sig);
|
||||
if(scanner)
|
||||
{
|
||||
scanner->stop();
|
||||
scanner->release();
|
||||
}
|
||||
|
||||
_exit(0);
|
||||
}
|
||||
|
||||
|
@ -38,7 +45,7 @@ int main()
|
|||
{
|
||||
exit(-1);
|
||||
}
|
||||
async_scanner *scanner = new async_scanner();
|
||||
scanner = new async_scanner();
|
||||
int err = scanner->last_error();
|
||||
|
||||
if(err == 0)
|
||||
|
@ -59,8 +66,11 @@ int main()
|
|||
}
|
||||
}
|
||||
|
||||
scanner->stop();
|
||||
scanner->release();
|
||||
async_scanner* tmp = scanner;
|
||||
|
||||
scanner = nullptr;
|
||||
tmp->stop();
|
||||
tmp->release();
|
||||
|
||||
return 0;
|
||||
}
|
Loading…
Reference in New Issue