HSFW management little fixes

HSFW_management/CMakeLists.txt

@@ -28,14 +28,6 @@ endif()
 # directory should contain dir locale/ru for gettext translations
 set(LCPATH ${CMAKE_SOURCE_DIR}/locale/ru)
 
-if(NOT DEFINED LOCALEDIR)
-	if(DEFINED DEBUG)
-		set(LOCALEDIR ${CMAKE_CURRENT_SOURCE_DIR}/locale)
-	else()
-		set(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
-	endif()
-endif()
-
 ###### pkgconfig ######
 # pkg-config modules (for pkg-check-modules)
 set(MODULES libudev)
@@ -54,6 +46,13 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND CMAKE_INSTALL_PREFIX MATCHES
 	set(CMAKE_INSTALL_PREFIX "/usr")
 endif()
 message("Install dir prefix: ${CMAKE_INSTALL_PREFIX}")
+if(NOT DEFINED LOCALEDIR)
+	if(DEFINED DEBUG)
+		set(LOCALEDIR ${CMAKE_CURRENT_SOURCE_DIR}/locale)
+	else()
+		set(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
+	endif()
+endif()
 
 # gettext files
 set(PO_FILE ${LCPATH}/messages.po)
@@ -75,9 +74,10 @@ add_definitions(${CFLAGS} -DLOCALEDIR=\"${LOCALEDIR}\"
 target_link_libraries(${PROJ} ${${PROJ}_LIBRARIES} ${USB_LIBRARIES})
 
 # Installation of the program
+INSTALL(TARGETS ${PROJ} DESTINATION "bin")
 INSTALL(FILES ${MO_FILE} DESTINATION "share/locale/ru/LC_MESSAGES")
 INSTALL(FILES "99-edmund_hsfw.rules" DESTINATION "/etc/udev/rules.d")
-INSTALL(TARGETS ${PROJ} DESTINATION "bin")
+
 
 ###### gettext ######
 find_package(Gettext REQUIRED)

HSFW_management/cmdlnopts.c

@@ -40,6 +40,7 @@ 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
 ;
 
 
@@ -81,6 +82,7 @@ myoption cmdlnopts[] = {
 	{"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
 };
 

HSFW_management/cmdlnopts.h

@@ -43,7 +43,7 @@ typedef struct{
 
 // default & global parameters
 extern glob_pars const Gdefault;
-extern int listNms, gohome, reName, showpos;
+extern int listNms, gohome, reName, showpos, setdef;
 
 extern glob_pars G;
 

HSFW_management/hsfw.c

@@ -43,7 +43,7 @@ static wheel_descr *wheels = NULL; // array with descriptors of found devs
 char *get_filter_name(wheel_descr *wheel, int pos);
 void list_hw(int show);
 void rename_hw();
-void move_wheel();
+int move_wheel();
 void set_cur_wheel(int idx);
 int writereg(int fd, uint8_t *buf, int l);
 int readreg(int fd, uint8_t *buf, int reg, int l);
@@ -72,19 +72,23 @@ void check_args(){
 	int i;
 	if(G.wheelID || G.filterId){
 		char wID = (G.wheelID) ? *G.wheelID : *G.filterId;
-		if((wID < 'A' || wID > 'H') || (G.wheelID && strlen(G.wheelID) != 1)){
+		if((wID < 'A' || wID > POS_B_END) || (G.wheelID && strlen(G.wheelID) != 1)){
 			/// "éÄÅÎÔÉÆÉËÁÔÏÒ ËÏÌÅÓÁ ÄÏÌÖÅÎ ÂÙÔØ ÂÕË×ÏÊ ÏÔ \"A\" ÄÏ \"H\"!"
 			ERRX(_("Wheel ID should be a letter from \"A\" to \"H\"!"));
 		}
 		wheel_id = wID;
 		DBG("wheel given by id: %c", wheel_id);
 		for(i = 0; i < HW_found; ++i){
-			if(wheels[i].ID == wheel_id)
+			if(wheels[i].ID == wheel_id){
+				/// "ïÂÎÁÒÕÖÅÎÏ ÂÏÌÅÅ ÏÄÎÏÇÏ ËÏÌÅÓÁ Ó ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ '%c'!"
+				if(wheel_fd > 0) ERRX(_("More than one wheel with ID '%c' found!"), wheel_id);
 				set_cur_wheel(i);
 			}
 		}
-	if(!reName && G.wheelName){ // find wheel by name given
+	}
-		if(G.wheelID){
+	char oldid = wheel_id;
+	if(G.wheelName && (!reName || (G.filterPos || G.filterName))){ // find wheel by name given
+		if(G.wheelID && !reName){
 			/// "úÁÄÁÎÙ É ÉÄÅÎÔÉÆÉËÁÔÏÒ, É ÉÍÑ ËÏÌÅÓÁ; ÐÏÐÒÏÂÕÊÔÅ ÞÔÏ-ÔÏ ÏÄÎÏ!"
 			ERRX(_("You give both wheel ID and wheel name, try something one!"));
 		}
@@ -94,8 +98,8 @@ void check_args(){
 				break;
 			}
 		}
+		if(reName) wheel_id = oldid;
 	}
-	char oldid = wheel_id;
 	void setWid(){
 		if(oldid > 0) wheel_id = oldid;
 		if(!G.wheelID){
@@ -103,11 +107,7 @@ void check_args(){
 			*G.wheelID = wheel_id;
 		}
 	}
-	// if there's only one turret, fill wheel_id
+	if(G.serial){ // HW given by its serial
-	if(HW_found == 1 && (wheel_id < 0 || (wheel_fd < 0 && reName))){
-		set_cur_wheel(0);
-		if(reName) setWid();
-	}else if(G.serial){ /// HW given by its serial
 		for(i = 0; i < HW_found; ++i){
 			if(strcmp(wheels[i].serial, G.serial) == 0){
 				set_cur_wheel(i);
@@ -115,12 +115,18 @@ void check_args(){
 				break;
 			}
 		}
+		if(i == HW_found) wheel_id = 0; // make an error message later
 	}
-	if(wheel_fd < 0 || !wheel_chosen){
+	// if there's only one turret, fill wheel_id
+	if(HW_found == 1 && (wheel_id < 0 || (wheel_fd < 0 && reName))){
+		set_cur_wheel(0);
+		if(reName) setWid();
+	}
+	if((wheel_fd < 0 || !wheel_chosen) && !G.filterName){
 		/// "úÁÄÁÎÎÏÅ ËÏÌÅÓÏ ÎÅ ÏÂÎÁÒÕÖÅÎÏ!"
 		ERRX(_("Given wheel not found!"));
 	}
-	if(showpos || gohome) return;
+	if(showpos || setdef) return;
 	if(G.filterId){ // filter given by its id like "B3"
 		char *fid = G.filterId;
 		/// "éÄÅÎÔÉÆÉËÁÔÏÒ ÆÉÌØÔÒÁ ÓÏÓÔÏÉÔ ÉÚ ÂÕË×Ù (ËÏÌÅÓÏ) É ÃÉÆÒÙ (ÐÏÚÉÃÉÑ)"
@@ -131,22 +137,35 @@ void check_args(){
 	}else if(G.filterPos){ // filter given by numerical position
 		filter_pos = G.filterPos;
 	}else if(G.filterName){ // filter given by name - search it
-		for(i = 1; i <= max_pos; ++i){
+		int search_f(int N){
-			DBG("Search filter %s in pos %d (%s)", G.filterName, i, get_filter_name(wheel_chosen, i));
+			int i, m = wheels[N].maxpos;
-			if(strcmp(G.filterName, get_filter_name(wheel_chosen, i)) == 0){
+			for(i = 1; i <= m; ++i){
+				DBG("Search filter %s in pos %d (%s)", G.filterName, i, get_filter_name(&wheels[N], i));
+				if(strcmp(G.filterName, get_filter_name(&wheels[N], i)) == 0){
 					filter_pos = i;
+					if(!wheel_chosen){
+						set_cur_wheel(N);
+					}
 					break;
 				}
 			}
-		if(i > max_pos){
+			if(i > m) return 1;
+			return 0;
+		}
+		int not_found = 1;
+		if(wheel_chosen) not_found = search_f(wheel_id);
+		else for(i = 0; i < HW_found && not_found; ++i){
+			not_found = search_f(i);
+		}
+		if(not_found){
 			/// "æÉÌØÔÒ %s ÎÅ ÏÂÎÁÒÕÖÅÎ"
 			ERRX(_("Filter %s not found!"), G.filterName);
 		}
 	}else{
-		if(reName) return;
+		if(!gohome) showpos = 1; // no action given - just show position
-		/// "疽 憫컨卦 炚個蓋하 컵柬洞<E69FAC>"
+		return;
-		ERRX("No action given");
 	}
+	if(reName) max_pos = get_max_pos(wheel_id);
 	if(filter_pos < 1 || filter_pos > max_pos){
 		/// "ðÏÚÉÃÉÑ ÆÉÌØÔÒÁ ÄÏÌÖÎÁ ÂÙÔØ ÞÉÓÌÏÍ ÏÔ 1 ÄÏ %d!"
 		ERRX(_("Filter position should be a number from 1 to %d!"), max_pos);
@@ -356,16 +375,16 @@ void list_props(_U_ int verblevl, wheel_descr *wheel){
 	green(_("\nAll records from EEPROM\n"));
 	wheel_descr wl;
 	wl.fd = fd;
-	wl.maxpos = ABS_MAX_POS;
 	if(wheel->serial) printf("Turret with serial '%s'\n", wheel->serial);
 	for(w = 'A'; w < 'I'; ++w){
 		char *nm = getwname(w);
 		int f;
 		printf("Wheel ID '%c'", w);
+		wl.maxpos = get_max_pos(w);
 		if(nm) printf(", name '%s'", nm);
-		printf(", filters:\n");
+		printf(", %d filters:\n", wl.maxpos );
 		wl.ID = w;
-		for(f = 1; f <= ABS_MAX_POS; ++f){
+		for(f = 1; f <= wl.maxpos; ++f){
 			nm = get_filter_name(&wl, f);
 			if(!nm){
 				check_and_clear_err(fd);
@@ -422,7 +441,10 @@ void rename_hw(){
 	memset(buf, 0, sizeof(buf));
 	uint8_t cmd = 0;
 	// now check what user wants to rename
-	if(G.filterName && (G.filterId || G.filterPos)){ // user wants to rename filter
+	if(setdef){
+		DBG("Reset names to default");
+		cmd = RESTORE_DEFVALS;
+	}else if(G.filterName && (G.filterId || G.filterPos)){ // user wants to rename filter
 		checknm(G.filterName);
 		DBG("Rename filter %d to %s", filter_pos, newname);
 		cmd = RENAME_FILTER;
@@ -440,9 +462,11 @@ void rename_hw(){
 	for(i = 0; i < 10 && stat; ++i){
 		buf[0] = REG_NAME;
 		buf[1] = cmd;
+		if(cmd != RESTORE_DEFVALS){
 			buf[2] = wheel_id;
-		if(cmd == RENAME_FILTER) buf[3] = filter_pos;
 			memcpy(&buf[4], newname, L);
+		}
+		if(cmd == RENAME_FILTER) buf[3] = filter_pos;
 		if((stat = writereg(wheel_fd, buf, REG_NAME_LEN))) continue;
 		if((stat = readreg(wheel_fd, buf, REG_NAME, REG_NAME_LEN))) continue;
 		if(buf[2]){ // err not empty
@@ -493,13 +517,17 @@ void go_home(int fd){
 	check_and_clear_err(fd);
 }
 
-void move_wheel(){
+/**
+ * move given wheel
+ * @return 0 if all OK
+ */
+int move_wheel(){
 	DBG("Move wheel %c to pos %d", wheel_id, filter_pos);
-	if(wheel_fd < 0) return;
+	if(wheel_fd < 0) return 1;
 	if(filter_pos == poll_regstatus(wheel_fd, 0)){
 		/// "õÖÅ × ÚÁÄÁÎÎÏÊ ÐÏÚÉÃÉÉ"
 		WARNX(_("Already at position"));
-		exit(0);
+		return 0;
 	}
 	uint8_t buf[REG_GOTO_LEN];
 	int i, stat = 1;
@@ -519,25 +547,38 @@ void move_wheel(){
 			break;
 		}
 	}
-	if(i == 10) exit(1);
+	if(i == 10) return 1;
 	poll_regstatus(wheel_fd, 1);
 	check_and_clear_err(wheel_fd);
+	return 0;
 }
 
-void process_args(){
+/**
+ * process arguments given
+ * @return 0 if all OK
+ */
+int process_args(){
 	FNAME();
-	if(wheel_id < 0) return;
+	if(wheel_id < 0) return 1;
 	if(showpos){
 		printf("%d\n", poll_regstatus(wheel_fd, 0));
+		return 0;
 	}
 	if(gohome){
 		go_home(wheel_fd);
-		return;
+		return 0;
 	}
-	if(reName){
+	if(reName || setdef){
 		rename_hw();
-		return;
+		return 0;
 	}
-	if(filter_pos < 0) return;
+	if(filter_pos < 0) return 1;
-	move_wheel();
+	return move_wheel();
+}
+
+// check max position allowed for given filter id
+int get_max_pos(char id){
+	if(id >= 'A' && id <= POS_A_END) return ABS_MAX_POS_A;
+	else if(id > POS_A_END && id <= POS_B_END) return ABS_MAX_POS_B;
+	return 0;
 }

HSFW_management/hsfw.h

@@ -35,8 +35,13 @@
 #define REG_NAME		(0x16)
 #define REG_NAME_LEN	(14)
 
-// absolute max position (for any wheel)
+// absolute max position (5 for wheels 'A'..'E' & 8 for wheels 'F'..'G')
-#define ABS_MAX_POS		(8)
+#define ABS_MAX_POS_A		(5)
+#define ABS_MAX_POS_B		(8)
+// end of 5-position wheel descriptor range
+#define POS_A_END			('E')
+// end of 8-pos range
+#define POS_B_END			('H')
 
 enum name_cmd{
 	RESTORE_DEFVALS = 1,
@@ -47,5 +52,6 @@ enum name_cmd{
 };
 
 void check_args();
-void process_args();
+int process_args();
+int get_max_pos(char filter_id);
 #endif // __HSFW_H__

HSFW_management/locale/ru/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-14 16:45+0300\n"
+"POT-Creation-Date: 2016-05-16 14:08+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,277 +19,287 @@ msgstr ""
 
 #. amount of pcount and/or scount wrong
 #. / "îÅÐÒÁ×ÉÌØÎÙÊ ÆÏÒÍÁÔ ÓÔÒÏËÉ ÐÏÍÏÝÉ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/parseargs.c:56
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/parseargs.c:56
 msgid "Wrong helpstring!"
 msgstr ""
 
 #. / "ãÅÌÏÅ ×ÎÅ ÄÏÐÕÓÔÉÍÏÇÏ ÄÉÁÐÁÚÏÎÁ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/parseargs.c:86
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/parseargs.c:86
 msgid "Integer out of range"
 msgstr ""
 
 #. / "îÅÐÒÁ×ÉÌØÎÙÊ ÐÁÒÁÍÅÔÒ: %s"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/parseargs.c:480
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/parseargs.c:480
 #, c-format
 msgid "Wrong parameter: %s"
 msgstr ""
 
 #. / "%s: ÎÅÏÂÈÏÄÉÍ ÁÒÇÕÍÅÎÔ!"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/parseargs.c:485
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/parseargs.c:485
 #, c-format
 msgid "%s: argument needed!"
 msgstr ""
 
 #. / "îÅÐÒÁ×ÉÌØÎÙÊ ÁÒÇÕÍÅÎÔ \"%s\" ÐÁÒÁÍÅÔÒÁ \"%s\""
-#: /Big/Data/SAO/edmund_opt/HSFW_management/parseargs.c:490
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/parseargs.c:490
 #, c-format
 msgid "Wrong argument \"%s\" of parameter \"%s\""
 msgstr ""
 
+#. / "îÅ ÍÏÇÕ ÏÔËÒÙÔØ %s"
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hidmanage.c:80
+#, c-format
+msgid "Can't open %s"
+msgstr ""
+
 #. / "îÅ ÚÁÄÁÎÏ ÉÍÑ ÆÁÊÌÁ!"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/usefull_macros.c:174
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/usefull_macros.c:174
 msgid "No filename given!"
 msgstr ""
 
 #. / "îÅ ÍÏÇÕ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/usefull_macros.c:177
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/usefull_macros.c:177
 #, c-format
 msgid "Can't open %s for reading"
 msgstr ""
 
 #. / "îÅ ÍÏÇÕ ×ÙÐÏÌÎÉÔØ stat %s"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/usefull_macros.c:180
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/usefull_macros.c:180
 #, c-format
 msgid "Can't stat %s"
 msgstr ""
 
 #. / "ïÛÉÂËÁ mmap"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/usefull_macros.c:184
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/usefull_macros.c:184
 msgid "Mmap error for input"
 msgstr ""
 
 #. / "îÅ ÍÏÇÕ ÚÁËÒÙÔØ mmap'ÎÕÔÙÊ ÆÁÊÌ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/usefull_macros.c:186
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/usefull_macros.c:186
 msgid "Can't close mmap'ed file"
 msgstr ""
 
 #. / "îÅ ÍÏÇÕ munmap"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/usefull_macros.c:196
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/usefull_macros.c:196
 msgid "Can't munmap"
 msgstr ""
 
 #. / "îÅ ÍÏÇÕ ÎÁÓÔÒÏÉÔØ ËÏÎÓÏÌØ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/usefull_macros.c:221
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/usefull_macros.c:221
 msgid "Can't setup console"
 msgstr ""
 
 #. Get settings
 #. / "îÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ ÎÁÓÔÒÏÊËÉ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/usefull_macros.c:291
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/usefull_macros.c:291
 msgid "Can't get settings"
 msgstr ""
 
 #. / "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÎÁÓÔÒÏÊËÉ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/usefull_macros.c:302
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/usefull_macros.c:302
 msgid "Can't set settings"
 msgstr ""
 
-#. / "îÅ ÍÏÇÕ ÏÔËÒÙÔØ %s"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hidmanage.c:80
-#, c-format
-msgid "Can't open %s"
-msgstr ""
-
-#. / "ÏÔÏÂÒÁÚÉÔØ ÜÔÕ ÓÐÒÁ×ËÕ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:63
-msgid "show this help"
-msgstr ""
-
-#. / "ÂÕË×ÅÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ËÏÌÅÓÁ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:65
-msgid "letter wheel identificator"
-msgstr ""
-
-#. / "ÎÁÚ×ÁÎÉÅ ËÏÌÅÓÁ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:67
-msgid "wheel name"
-msgstr ""
-
-#. / "ÓÅÒÉÊÎÙÊ ÎÏÍÅÒ ÔÕÒÅÌÉ (Ó ÎÁÞÁÌØÎÙÍÉ ÎÕÌÑÍÉ)"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:69
-msgid "turret serial (with leading zeros)"
-msgstr ""
-
-#. / "ÎÏÍÅÒ ÐÏÚÉÃÉÉ ÆÉÌØÔÒÁ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:71
-msgid "filter position number"
-msgstr ""
-
-#. / "ÎÁÚ×ÁÎÉÅ ÆÉÌØÔÒÁ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:73
-msgid "filter name"
-msgstr ""
-
-#. / "ÉÄÅÎÔÉÆÉËÁÔÏÒ ÆÉÌØÔÒÁ, ÎÁÐÒÉÍÅÒ, \"A3\""
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:75
-msgid "filter identificator like \"A3\""
-msgstr ""
-
-#. / "ÓÐÉÓÏË ×ÓÅÈ ÓÏÈÒÁÎÅÎÎÙÈ ÉÍÅÎ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:77
-msgid "list all stored names"
-msgstr ""
-
-#. / "ÓÐÉÓÏË ÉÍÅÎ ÔÏÌØËÏ ÐÒÉÓÕÔÓÔ×ÕÀÝÉÈ ÕÓÔÒÏÊÓÔ×"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:79
-msgid "list only present devices' names"
-msgstr ""
-
-#. / "ÐÅÒÅÍÅÓÔÉÔØÓÑ × ÓÔÁÒÔÏ×ÕÀ ÐÏÚÉÃÉÀ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:81
-msgid "move to home position"
-msgstr ""
-
-#. / "ÐÅÒÅÉÍÅÎÏ×ÁÔØ ÓÏÈÒÁÎÅÎÎÙÅ ÉÍÅÎÁ ËÏÌÅÓ/ÆÉÌØÔÒÏ×"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:83
-msgid "rename stored wheels/filters names"
-msgstr ""
-
-#. / "îÅÐÒÁ×ÉÌØÎÙÊ ÆÏÒÍÁÔ ÞÉÓÌÁ double!"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:101
-msgid "Wrong double number format!"
-msgstr ""
-
-#. / "éÇÎÏÒÉÒÕÀÔÓÑ ÐÁÒÁÍÅÔÒÙ: "
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:126
-msgid "Ignore parameters:"
-msgstr ""
-
 #. / "éÄÅÎÔÉÆÉËÁÔÏÒ ËÏÌÅÓÁ ÄÏÌÖÅÎ ÂÙÔØ ÂÕË×ÏÊ ÏÔ \"A\" ÄÏ \"H\"!"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:77
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:77
 msgid "Wheel ID should be a letter from \"A\" to \"H\"!"
 msgstr ""
 
+#. / "ïÂÎÁÒÕÖÅÎÏ ÂÏÌÅÅ ÏÄÎÏÇÏ ËÏÌÅÓÁ Ó ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ '%c'!"
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:84
+#, c-format
+msgid "More than one wheel with ID '%c' found!"
+msgstr ""
+
 #. / "úÁÄÁÎÙ É ÉÄÅÎÔÉÆÉËÁÔÏÒ, É ÉÍÑ ËÏÌÅÓÁ; ÐÏÐÒÏÂÕÊÔÅ ÞÔÏ-ÔÏ ÏÄÎÏ!"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:89
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:93
 msgid "You give both wheel ID and wheel name, try something one!"
 msgstr ""
 
 #. / "úÁÄÁÎÎÏÅ ËÏÌÅÓÏ ÎÅ ÏÂÎÁÒÕÖÅÎÏ!"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:121
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:127
 msgid "Given wheel not found!"
 msgstr ""
 
 #. / "éÄÅÎÔÉÆÉËÁÔÏÒ ÆÉÌØÔÒÁ - ÂÕË×Á (ËÏÌÅÓÏ) É ÞÉÓÌÏ (ÐÏÚÉÃÉÑ)"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:129
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:135
 msgid "Filter ID is letter (wheel) and number (position)"
 msgstr ""
 
 #. / "æÉÌØÔÒ %s ÎÅ ÏÂÎÁÒÕÖÅÎ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:143
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:162
 #, c-format
 msgid "Filter %s not found!"
 msgstr ""
 
 #. / "ðÏÚÉÃÉÑ ÆÉÌØÔÒÁ ÄÏÌÖÎÁ ÂÙÔØ ÞÉÓÌÏÍ ÏÔ 1 ÄÏ %d!"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:152
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:171
 #, c-format
 msgid "Filter position should be a number from 1 to %d!"
 msgstr ""
 
 #. / "ïÛÉÂËÁ ÏÔÐÒÁ×ËÉ ÄÁÎÎÙÈ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:172
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:191
 msgid "Error sending data"
 msgstr ""
 
 #. / "ïÛÉÂËÁ ÞÔÅÎÉÑ ÄÁÎÎÙÈ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:187
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:206
 msgid "Error reading data"
 msgstr ""
 
 #. / "ïÛÉÂËÁ, ËÏÌÉÞÅÓÔ×Ï ÐÏÐÙÔÏË ÉÓÔÅËÌÏ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:211
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:230
 msgid "Error, tries amount exceed"
 msgstr ""
 
 #. / "ôÕÒÅÌØ ÎÅ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÎÁ, Ä×ÉÖÅÎÉÅ × \"ÄÏÍ\""
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:229
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:248
 msgid "Turret isn't initialized, move home..."
 msgstr ""
 
 #. / "ïÖÉÄÁÎÉÅ ÏËÏÎÞÁÎÉÑ Ä×ÉÖÅÎÉÑ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:246
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:265
 #, c-format
 msgid "Wait for end of moving "
 msgstr ""
 
 #. / "ðÒÏÉÚÏÛÌÁ ÏÛÉÂËÁ, ÐÏ×ÔÏÒÉÔÅ ÚÁÐÕÓË"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:255
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:274
 msgid "Error ocured, repeat again"
 msgstr ""
 
 #. / "úÁÄÁÎÎÁÑ ÐÏÚÉÃÉÑ ×ÎÅ ÄÉÁÐÁÚÏÎÁ 1..%d"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:275
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:294
 #, c-format
 msgid "Given position out of range 1..%d"
 msgstr ""
 
 #. / "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÕÓÔÒÏÊÓÔ×Ï"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:302
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:321
 msgid "Can't open device"
 msgstr ""
 
 #. / "\nó×ÏÊÓÔ×Á ÐÏÄËÌÀÞÅÎÎÏÇÏ ËÏÌÅÓÁ\n"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:328
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:347
 msgid ""
 "\n"
 "Connected wheel properties\n"
 msgstr ""
 
 #. / "\n÷ÓÅ ÚÁÐÉÓÉ EEPROM\n"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:356
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:375
 msgid ""
 "\n"
 "All records from EEPROM\n"
 msgstr ""
 
 #. / "ôÕÒÅÌÉ ÎÅ ÏÂÎÁÒÕÖÅÎÙ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:394
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:413
 msgid "No turrets found"
 msgstr ""
 
 #. / "ïÂÎÁÒÕÖÅÎÏ %d ÔÕÒÅÌÅÊ, ÎÏ ÎÉ Ë ÏÄÎÏÊ ÎÅÔ ÐÒÁ× ÄÏÓÔÕÐÁ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:400
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:419
 #, c-format
 msgid "Found %d turrets but have no access rights to any"
 msgstr ""
 
 #. / "îÁÚ×ÁÎÉÅ ÎÅ ÄÏÌÖÎÏ ÐÒÅ×ÙÛÁÔØ ×ÏÓØÍÉ ÓÉÍ×ÏÌÏ×"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:420
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:439
 msgid "Name should be not longer than 8 symbols"
 msgstr ""
 
 #. / "þÔÏÂÙ ÐÅÒÅÉÍÅÎÏ×ÁÔØ, ÎÅÏÂÈÏÄÉÍÏ ÕËÁÚÁÔØ ÎÏ×ÏÅ ÎÁÚ×ÁÎÉÅ ÆÉÌØÔÒÁ/ËÏÌÅÓÁ É ÅÇÏ ÐÏÚÉÃÉÀ/ÉÄÅÎÔÉÆÉËÁÔÏÒ!"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:436
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:458
 msgid "You should give new filter/wheel name and its POS/ID to rename!"
 msgstr ""
 
 #. / "îÅ ÕÄÁÌÏÓØ ÐÅÒÅÉÍÅÎÏ×ÁÔØ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:461
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:485
 msgid "Can't rename"
 msgstr ""
 
 #. / "ðÅÒÅÉÍÅÎÏ×ÁÎÏ ÕÄÁÞÎÏ!"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:463
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:487
 msgid "Succesfully renamed!\n"
 msgstr ""
 
 #. / "úÁÃÉËÌÉ×ÁÎÉÅ, ÐÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:472
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:496
 msgid "Cycling detected, try again"
 msgstr ""
 
 #. / "õÖÅ × ÚÁÄÁÎÎÏÊ ÐÏÚÉÃÉÉ"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:501
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:529
 msgid "Already at position"
 msgstr ""
+
+#. / "ÏÔÏÂÒÁÚÉÔØ ÜÔÕ ÓÐÒÁ×ËÕ"
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:64
+msgid "show this help"
+msgstr ""
+
+#. / "ÂÕË×ÅÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ËÏÌÅÓÁ"
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:66
+msgid "letter wheel identificator"
+msgstr ""
+
+#. / "ÎÁÚ×ÁÎÉÅ ËÏÌÅÓÁ"
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:68
+msgid "wheel name"
+msgstr ""
+
+#. / "ÓÅÒÉÊÎÙÊ ÎÏÍÅÒ ÔÕÒÅÌÉ (Ó ÎÁÞÁÌØÎÙÍÉ ÎÕÌÑÍÉ)"
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:70
+msgid "turret serial (with leading zeros)"
+msgstr ""
+
+#. / "ÎÏÍÅÒ ÐÏÚÉÃÉÉ ÆÉÌØÔÒÁ"
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:72
+msgid "filter position number"
+msgstr ""
+
+#. / "ÎÁÚ×ÁÎÉÅ ÆÉÌØÔÒÁ"
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:74
+msgid "filter name"
+msgstr ""
+
+#. / "ÉÄÅÎÔÉÆÉËÁÔÏÒ ÆÉÌØÔÒÁ, ÎÁÐÒÉÍÅÒ, \"A3\""
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:76
+msgid "filter identificator like \"A3\""
+msgstr ""
+
+#. / "ÓÐÉÓÏË ×ÓÅÈ ÓÏÈÒÁÎÅÎÎÙÈ ÉÍÅÎ"
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:78
+msgid "list all stored names"
+msgstr ""
+
+#. / "ÓÐÉÓÏË ÉÍÅÎ ÔÏÌØËÏ ÐÒÉÓÕÔÓÔ×ÕÀÝÉÈ ÕÓÔÒÏÊÓÔ×"
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:80
+msgid "list only present devices' names"
+msgstr ""
+
+#. / "ÐÅÒÅÍÅÓÔÉÔØÓÑ × ÓÔÁÒÔÏ×ÕÀ ÐÏÚÉÃÉÀ"
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:82
+msgid "move to home position"
+msgstr ""
+
+#. / "ÐÅÒÅÉÍÅÎÏ×ÁÔØ ÓÏÈÒÁÎÅÎÎÙÅ ÉÍÅÎÁ ËÏÌÅÓ/ÆÉÌØÔÒÏ×"
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:84
+msgid "rename stored wheels/filters names"
+msgstr ""
+
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:85
+msgid "reset all names to default values"
+msgstr ""
+
+#. / "îÅÐÒÁ×ÉÌØÎÙÊ ÆÏÒÍÁÔ ÞÉÓÌÁ double!"
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:103
+msgid "Wrong double number format!"
+msgstr ""
+
+#. / "éÇÎÏÒÉÒÕÀÔÓÑ ÐÁÒÁÍÅÔÒÙ: "
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:128
+msgid "Ignore parameters:"
+msgstr ""

HSFW_management/locale/ru/ru.po

@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: PACKAGE VERSION\n"
         "Report-Msgid-Bugs-To: \n"
-        "POT-Creation-Date: 2016-05-14 16:45+0300\n"
+        "POT-Creation-Date: 2016-05-16 14:03+0300\n"
         "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
         "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
         "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,278 +17,289 @@ msgstr  "Project-Id-Version: PACKAGE VERSION\n"
         "Content-Transfer-Encoding: 8bit\n"
 
 #. / "\nВсе записи EEPROM\n"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:356
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:375
 msgid   "\n"
         "All records from EEPROM\n"
 msgstr  "\n"
         "Все записи EEPROM\n"
 
 #. / "\nСвойства подключенного колеса\n"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:328
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:347
 msgid   "\n"
         "Connected wheel properties\n"
 msgstr  "\n"
         "Свойства подключенного колеса\n"
 
 #. / "%s: необходим аргумент!"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/parseargs.c:485
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/parseargs.c:485
 #, c-format
 msgid   "%s: argument needed!"
 msgstr  "%s: необходим аргумент!"
 
 #. / "Уже в заданной позиции"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:501
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:529
 msgid   "Already at position"
 msgstr  "Уже в заданной позиции"
 
 #. / "Не могу закрыть mmap'нутый файл"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/usefull_macros.c:186
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/usefull_macros.c:186
 msgid   "Can't close mmap'ed file"
 msgstr  "Не могу закрыть mmap'нутый файл"
 
 #. Get settings
 #. / "Не могу получить настройки"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/usefull_macros.c:291
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/usefull_macros.c:291
 msgid   "Can't get settings"
 msgstr  "Не могу получить настройки"
 
 #. / "Не могу munmap"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/usefull_macros.c:196
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/usefull_macros.c:196
 msgid   "Can't munmap"
 msgstr  "Не могу munmap"
 
 #. / "Не могу открыть %s"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hidmanage.c:80
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hidmanage.c:80
 #, c-format
 msgid   "Can't open %s"
 msgstr  "Не могу открыть %s"
 
 #. / "Не могу открыть %s для чтения"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/usefull_macros.c:177
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/usefull_macros.c:177
 #, c-format
 msgid   "Can't open %s for reading"
 msgstr  "Не могу открыть %s для чтения"
 
 #. / "Не могу открыть устройство"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:302
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:321
 msgid   "Can't open device"
 msgstr  "Не могу открыть устройство"
 
 #. / "Не удалось переименовать"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:461
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:485
 msgid   "Can't rename"
 msgstr  "Не удалось переименовать"
 
 #. / "Не могу установить настройки"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/usefull_macros.c:302
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/usefull_macros.c:302
 msgid   "Can't set settings"
 msgstr  "Не могу установить настройки"
 
 #. / "Не могу настроить консоль"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/usefull_macros.c:221
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/usefull_macros.c:221
 msgid   "Can't setup console"
 msgstr  "Не могу настроить консоль"
 
 #. / "Не могу выполнить stat %s"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/usefull_macros.c:180
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/usefull_macros.c:180
 #, c-format
 msgid   "Can't stat %s"
 msgstr  "Не могу выполнить stat %s"
 
 #. / "Зацикливание, попробуйте еще раз"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:472
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:496
 msgid   "Cycling detected, try again"
 msgstr  "Зацикливание, попробуйте еще раз"
 
 #. / "Произошла ошибка, повторите запуск"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:255
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:274
 msgid   "Error ocured, repeat again"
 msgstr  "Произошла ошибка, повторите запуск"
 
 #. / "Ошибка чтения данных"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:187
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:206
 msgid   "Error reading data"
 msgstr  "Ошибка чтения данных"
 
 #. / "Ошибка отправки данных"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:172
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:191
 msgid   "Error sending data"
 msgstr  "Ошибка отправки данных"
 
 #. / "Ошибка, количество попыток истекло"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:211
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:230
 msgid   "Error, tries amount exceed"
 msgstr  "Ошибка, количество попыток истекло"
 
 #. / "Фильтр %s не обнаружен"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:143
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:162
 #, c-format
 msgid   "Filter %s not found!"
 msgstr  "Фильтр %s не обнаружен"
 
 #. / "Идентификатор фильтра - буква (колесо) и число (позиция)"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:129
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:135
 msgid   "Filter ID is letter (wheel) and number (position)"
 msgstr  "Идентификатор фильтра - буква (колесо) и число (позиция)"
 
 #. / "Позиция фильтра должна быть числом от 1 до %d!"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:152
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:171
 #, c-format
 msgid   "Filter position should be a number from 1 to %d!"
 msgstr  "Позиция фильтра должна быть числом от 1 до %d!"
 
 #. / "Обнаружено %d турелей, но ни к одной нет прав доступа"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:400
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:419
 #, c-format
 msgid   "Found %d turrets but have no access rights to any"
 msgstr  "Обнаружено %d турелей, но ни к одной нет прав доступа"
 
 #. / "Заданная позиция вне диапазона 1..%d"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:275
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:294
 #, c-format
 msgid   "Given position out of range 1..%d"
 msgstr  "Заданная позиция вне диапазона 1..%d"
 
 #. / "Заданное колесо не обнаружено!"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:121
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:127
 msgid   "Given wheel not found!"
 msgstr  "Заданное колесо не обнаружено!"
 
 #. / "Игнорируются параметры: "
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:126
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:128
 msgid   "Ignore parameters:"
 msgstr  "Игнорируются параметры:"
 
 #. / "Целое вне допустимого диапазона"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/parseargs.c:86
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/parseargs.c:86
 msgid   "Integer out of range"
 msgstr  "Целое вне допустимого диапазона"
 
 #. / "Ошибка mmap"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/usefull_macros.c:184
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/usefull_macros.c:184
 msgid   "Mmap error for input"
 msgstr  "Ошибка mmap"
 
+#. / "ïÂÎÁÒÕÖÅÎÏ ÂÏÌÅÅ ÏÄÎÏÇÏ ËÏÌÅÓÁ Ó ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ '%c'!"
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:84
+#, c-format
+msgid   "More than one wheel with ID '%c' found!"
+msgstr  "ïÂÎÁÒÕÖÅÎÏ ÂÏÌÅÅ ÏÄÎÏÇÏ ËÏÌÅÓÁ Ó ÉÄÅÎÔÉÆÉËÁÔÏÒÏÍ '%c'!"
+
 #. / "Название не должно превышать восьми символов"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:420
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:439
 msgid   "Name should be not longer than 8 symbols"
 msgstr  "Название не должно превышать восьми символов"
 
 #. / "Не задано имя файла!"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/usefull_macros.c:174
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/usefull_macros.c:174
 msgid   "No filename given!"
 msgstr  "Не задано имя файла!"
 
 #. / "Турели не обнаружены"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:394
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:413
 msgid   "No turrets found"
 msgstr  "Турели не обнаружены"
 
 #. / "Переименовано удачно!"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:463
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:487
 msgid   "Succesfully renamed!\n"
 msgstr  "Переименовано удачно!\n"
 
 #. / "Турель не инициализирована, движение в \"дом\""
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:229
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:248
 msgid   "Turret isn't initialized, move home..."
 msgstr  "Турель не инициализирована, движение в \"дом\""
 
 #. / "Ожидание окончания движения"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:246
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:265
 #, c-format
 msgid   "Wait for end of moving "
 msgstr  "Ожидание окончания движения"
 
 #. / "Идентификатор колеса должен быть буквой от \"A\" до \"H\"!"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:77
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:77
 msgid   "Wheel ID should be a letter from \"A\" to \"H\"!"
 msgstr  "Идентификатор колеса должен быть буквой от \"A\" до \"H\"!"
 
 #. / "Неправильный аргумент \"%s\" параметра \"%s\""
-#: /Big/Data/SAO/edmund_opt/HSFW_management/parseargs.c:490
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/parseargs.c:490
 #, c-format
 msgid   "Wrong argument \"%s\" of parameter \"%s\""
 msgstr  "Неправильный аргумент \"%s\" параметра \"%s\""
 
 #. / "Неправильный формат числа double!"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:101
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:103
 msgid   "Wrong double number format!"
 msgstr  "Неправильный формат числа double!"
 
 #. amount of pcount and/or scount wrong
 #. / "Неправильный формат строки помощи"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/parseargs.c:56
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/parseargs.c:56
 msgid   "Wrong helpstring!"
 msgstr  "Неправильный формат строки помощи"
 
 #. / "Неправильный параметр: %s"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/parseargs.c:480
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/parseargs.c:480
 #, c-format
 msgid   "Wrong parameter: %s"
 msgstr  "Неправильный параметр: %s"
 
 #. / "Заданы и идентификатор, и имя колеса; попробуйте что-то одно!"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:89
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:93
 msgid   "You give both wheel ID and wheel name, try something one!"
 msgstr  "Заданы и идентификатор, и имя колеса; попробуйте что-то одно!"
 
 #. / "Чтобы переименовать, необходимо указать новое название фильтра/колеса и его позицию/идентификатор!"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/hsfw.c:436
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/hsfw.c:458
 msgid   "You should give new filter/wheel name and its POS/ID to rename!"
-msgstr  "þÔÏÂÙ ÐÅÒÅÉÍÅÎÏ×ÁÔØ, ÎÅÏÂÈÏÄÉÍÏ ÕËÁÚÁÔØ ÎÏ×ÏÅ ÎÁÚ×ÁÎÉÅ ÆÉÌØÔÒÁ/ËÏÌÅÓÁ É ÅÇÏ ÐÏÚÉÃÉÀ/ÉÄÅÎÔÉÆÉËÁÔÏÒ!"
+msgstr  "þÔÏÂÙ ÐÅÒÅÉÍÅÎÏ×ÁÔØ, ÎÅÏÂÈÏÄÉÍÏ ÕËÁÚÁÔØ ÎÏ×ÏÅ ÎÁÚ×ÁÎÉÅ ÆÉÌØÔÒÁ/"
+        "ËÏÌÅÓÁ É ÅÇÏ ÐÏÚÉÃÉÀ/ÉÄÅÎÔÉÆÉËÁÔÏÒ!"
 
 #. / "идентификатор фильтра, например, \"A3\""
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:75
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:76
 msgid   "filter identificator like \"A3\""
 msgstr  "идентификатор фильтра, например, \"A3\""
 
 #. / "название фильтра"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:73
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:74
 msgid   "filter name"
 msgstr  "название фильтра"
 
 #. / "номер позиции фильтра"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:71
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:72
 msgid   "filter position number"
 msgstr  "номер позиции фильтра"
 
 #. / "буквенный идентификатор колеса"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:65
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:66
 msgid   "letter wheel identificator"
 msgstr  "буквенный идентификатор колеса"
 
 #. / "список всех сохраненных имен"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:77
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:78
 msgid   "list all stored names"
 msgstr  "список всех сохраненных имен"
 
 #. / "список имен только присутствующих устройств"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:79
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:80
 msgid   "list only present devices' names"
 msgstr  "список имен только присутствующих устройств"
 
 #. / "переместиться в стартовую позицию"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:81
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:82
 msgid   "move to home position"
 msgstr  "переместиться в стартовую позицию"
 
 #. / "переименовать сохраненные имена колес/фильтров"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:83
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:84
 msgid   "rename stored wheels/filters names"
 msgstr  "переименовать сохраненные имена колес/фильтров"
 
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:85
+msgid   "reset all names to default values"
+msgstr  "ÓÂÒÏÓÉÔØ ×ÓÅ ÎÁÚ×ÁÎÉÑ × ÚÎÁÞÅÎÉÑ ÐÏ ÕÍÏÌÞÁÎÉÀ"
+
 #. / "отобразить эту справку"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:63
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:64
 msgid   "show this help"
 msgstr  "отобразить эту справку"
 
 #. / "серийный номер турели (с начальными нулями)"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:69
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:70
 msgid   "turret serial (with leading zeros)"
 msgstr  "серийный номер турели (с начальными нулями)"
 
 #. / "название колеса"
-#: /Big/Data/SAO/edmund_opt/HSFW_management/cmdlnopts.c:67
+#: /home/eddy/Docs/SAO/Edmund_optics/HSFW_management/cmdlnopts.c:68
 msgid   "wheel name"
 msgstr  "название колеса"

HSFW_management/main.c

@@ -32,7 +32,6 @@ int main(int argc, char **argv){
 	initial_setup();
 	parse_args(argc, argv);
 	check_args();
-	process_args();
+	return process_args();
-	return 0;
 }