Add short list to HSFV_manage

This commit is contained in:
eddyem
2018-03-25 10:50:23 +03:00
parent bf4ea0c493
commit b73587a5e4
15 changed files with 889 additions and 112 deletions

View File

@@ -36,54 +36,54 @@
int help;
glob_pars G;
int listNms = 0 // list names
,gohome = 0 // first go home
,reName = 0 // rename wheels/positions
,showpos = 0 // show current position (if none args)
,setdef = 0 // reset all names to default values
int listNms = LIST_NONE // list names
,gohome = 0 // first go home
,reName = 0 // rename wheels/positions
,showpos = 0 // show current position (if none args)
,setdef = 0 // reset all names to default values
;
// DEFAULTS
// default global parameters
glob_pars const Gdefault = {
NULL // wheelID
,NULL // wheelName
,NULL // serial
,0 // filterPos ( 0 - get current position)
,NULL // filterName
,NULL // filterId
NULL // wheelID
,NULL // wheelName
,NULL // serial
,0 // filterPos ( 0 - get current position)
,NULL // filterName
,NULL // filterId
};
/*
* Define command line options by filling structure:
* name has_arg flag val type argptr help
* name has_arg flag val type argptr help
*/
myoption cmdlnopts[] = {
/// "ÏÔÏÂÒÁÚÉÔØ ÜÔÕ ÓÐÒÁ×ËÕ"
{"help", NO_ARGS, NULL, 'h', arg_int, APTR(&help), N_("show this help")},
/// "ÂÕË×ÅÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ËÏÌÅÓÁ"
{"wheel-id",NEED_ARG, NULL, 'W', arg_string, APTR(&G.wheelID), N_("letter wheel identificator")},
/// "ÎÁÚ×ÁÎÉÅ ËÏÌÅÓÁ"
{"wheel-name",NEED_ARG, NULL, 'N', arg_string, APTR(&G.wheelName), N_("wheel name")},
/// "ÓÅÒÉÊÎÙÊ ÎÏÍÅÒ ÔÕÒÅÌÉ (Ó ÎÁÞÁÌØÎÙÍÉ ÎÕÌÑÍÉ)"
{"serial", NEED_ARG, NULL, 's', arg_string, APTR(&G.serial), N_("turret serial (with leading zeros)")},
/// "ÎÏÍÅÒ ÐÏÚÉÃÉÉ ÆÉÌØÔÒÁ"
{"f-position",NEED_ARG, NULL, 'p', arg_int, APTR(&G.filterPos), N_("filter position number")},
/// "ÎÁÚ×ÁÎÉÅ ÆÉÌØÔÒÁ"
{"filter-name",NEED_ARG,NULL, 'n', arg_string, APTR(&G.filterName),N_("filter name")},
/// "ÉÄÅÎÔÉÆÉËÁÔÏÒ ÆÉÌØÔÒÁ, ÎÁÐÒÉÍÅÒ, \"A3\""
{"filter-id",NEED_ARG, NULL, 'i', arg_string, APTR(&G.filterId), N_("filter identificator like \"A3\"")},
/// "ÓÐÉÓÏË ×ÓÅÈ ÓÏÈÒÁÎÅÎÎÙÈ ÉÍÅÎ"
{"list-all",NO_ARGS, &listNms,LIST_ALL,arg_none, NULL, N_("list all stored names")},
/// "ÓÐÉÓÏË ÉÍÅÎ ÔÏÌØËÏ ÐÒÉÓÕÔÓÔ×ÕÀÝÉÈ ÕÓÔÒÏÊÓÔ×"
{"list", NO_ARGS, &listNms,LIST_PRES,arg_none,NULL, N_("list only present devices' names")},
/// "ÐÅÒÅÍÅÓÔÉÔØÓÑ × ÓÔÁÒÔÏ×ÕÀ ÐÏÚÉÃÉÀ"
{"home", NO_ARGS, NULL, 'H', arg_none, &gohome, N_("move to home position")},
/// "ÐÅÒÅÉÍÅÎÏ×ÁÔØ ÓÏÈÒÁÎÅÎÎÙÅ ÉÍÅÎÁ ËÏÌÅÓ/ÆÉÌØÔÒÏ×"
{"rename", NO_ARGS, &reName,1, arg_none, NULL, N_("rename stored wheels/filters names")},
{"resetnames",NO_ARGS, &setdef,1, arg_none, NULL, N_("reset all names to default values")},
end_option
/// "ÏÔÏÂÒÁÚÉÔØ ÜÔÕ ÓÐÒÁ×ËÕ"
{"help", NO_ARGS, NULL, 'h', arg_int, APTR(&help), N_("show this help")},
/// "ÂÕË×ÅÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ËÏÌÅÓÁ"
{"wheel-id",NEED_ARG, NULL, 'W', arg_string, APTR(&G.wheelID), N_("letter wheel identificator")},
/// "ÎÁÚ×ÁÎÉÅ ËÏÌÅÓÁ"
{"wheel-name",NEED_ARG, NULL, 'N', arg_string, APTR(&G.wheelName), N_("wheel name")},
/// "ÓÅÒÉÊÎÙÊ ÎÏÍÅÒ ÔÕÒÅÌÉ (Ó ÎÁÞÁÌØÎÙÍÉ ÎÕÌÑÍÉ)"
{"serial", NEED_ARG, NULL, 's', arg_string, APTR(&G.serial), N_("turret serial (with leading zeros)")},
/// "ÎÏÍÅÒ ÐÏÚÉÃÉÉ ÆÉÌØÔÒÁ"
{"f-position",NEED_ARG, NULL, 'p', arg_int, APTR(&G.filterPos), N_("filter position number")},
/// "ÎÁÚ×ÁÎÉÅ ÆÉÌØÔÒÁ"
{"filter-name",NEED_ARG,NULL, 'n', arg_string, APTR(&G.filterName),N_("filter name")},
/// "ÉÄÅÎÔÉÆÉËÁÔÏÒ ÆÉÌØÔÒÁ, ÎÁÐÒÉÍÅÒ, \"A3\""
{"filter-id",NEED_ARG, NULL, 'i', arg_string, APTR(&G.filterId), N_("filter identificator like \"A3\"")},
/// "ÓÐÉÓÏË ×ÓÅÈ ÓÏÈÒÁÎÅÎÎÙÈ ÉÍÅÎ"
{"list-all",NO_ARGS, &listNms,LIST_ALL,arg_none, NULL, N_("list all stored names")},
/// "ÓÐÉÓÏË ÉÍÅÎ ÔÏÌØËÏ ÐÒÉÓÕÔÓÔ×ÕÀÝÉÈ ÕÓÔÒÏÊÓÔ×"
{"list", NO_ARGS, &listNms,LIST_PRES,arg_none,NULL, N_("list only present devices' names")},
/// "ÐÅÒÅÍÅÓÔÉÔØÓÑ × ÓÔÁÒÔÏ×ÕÀ ÐÏÚÉÃÉÀ"
{"home", NO_ARGS, NULL, 'H', arg_none, &gohome, N_("move to home position")},
/// "ÐÅÒÅÉÍÅÎÏ×ÁÔØ ÓÏÈÒÁÎÅÎÎÙÅ ÉÍÅÎÁ ËÏÌÅÓ/ÆÉÌØÔÒÏ×"
{"rename", NO_ARGS, &reName,1, arg_none, NULL, N_("rename stored wheels/filters names")},
{"resetnames",NO_ARGS, &setdef,1, arg_none, NULL, N_("reset all names to default values")},
end_option
};
/**
@@ -94,45 +94,46 @@ myoption cmdlnopts[] = {
* @return TRUE if success
*/
bool myatod(double *num, const char *str){
double res;
char *endptr;
assert(str);
res = strtod(str, &endptr);
if(endptr == str || *str == '\0' || *endptr != '\0'){
/// "îÅÐÒÁ×ÉÌØÎÙÊ ÆÏÒÍÁÔ ÞÉÓÌÁ double!"
WARNX(_("Wrong double number format!"));
return FALSE;
}
*num = res;
return TRUE;
double res;
char *endptr;
assert(str);
res = strtod(str, &endptr);
if(endptr == str || *str == '\0' || *endptr != '\0'){
/// "îÅÐÒÁ×ÉÌØÎÙÊ ÆÏÒÍÁÔ ÞÉÓÌÁ double!"
WARNX(_("Wrong double number format!"));
return FALSE;
}
*num = res;
return TRUE;
}
/**
* Parse command line options and return dynamically allocated structure
* to global parameters
* to global parameters
* @param argc - copy of argc from main
* @param argv - copy of argv from main
* @return allocated structure with global parameters
*/
glob_pars *parse_args(int argc, char **argv){
int i, oldargc = argc - 1;
void *ptr;
ptr = memcpy(&G, &Gdefault, sizeof(G)); assert(ptr);
/// "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ÁÒÇÕÍÅÎÔÙ] [ÐÒÅÆÉËÓ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ]\n\n\tçÄÅ [ÁÒÇÕÍÅÎÔÙ]:\n"
//change_helpstring(_("Usage: %s [args] [outfile prefix] [file list for group operations]\n\n\tWhere args are:\n"));
// parse arguments
parseargs(&argc, &argv, cmdlnopts);
if(help) showhelp(-1, cmdlnopts);
if(argc > 0){
/// "éÇÎÏÒÉÒÕÀÔÓÑ ÐÁÒÁÍÅÔÒÙ: "
WARNX(_("Ignore parameters:"));
for (i = 0; i < argc; i++){
printf("%s\n", argv[i]);
}
}
if(argc == oldargc){ // no parameters given or given only wrong parameters
showpos = 1;
}
return &G;
int i, oldargc = argc - 1;
void *ptr;
ptr = memcpy(&G, &Gdefault, sizeof(G)); assert(ptr);
/// "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ÁÒÇÕÍÅÎÔÙ] [ÐÒÅÆÉËÓ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ]\n\n\tçÄÅ [ÁÒÇÕÍÅÎÔÙ]:\n"
//change_helpstring(_("Usage: %s [args] [outfile prefix] [file list for group operations]\n\n\tWhere args are:\n"));
// parse arguments
parseargs(&argc, &argv, cmdlnopts);
if(help) showhelp(-1, cmdlnopts);
if(argc > 0){
/// "éÇÎÏÒÉÒÕÀÔÓÑ ÐÁÒÁÍÅÔÒÙ: "
WARNX(_("Ignore parameters:"));
for (i = 0; i < argc; i++){
printf("%s\n", argv[i]);
}
}
if(argc == oldargc){ // no parameters given or given only wrong parameters
//showpos = 1;
listNms = LIST_SHORT; // short list of turrets present
}
return &G;
}