add ability of appending FITS records from outern files

fli_control/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
 set(PROJ fli_control)
 project(${PROJ})
 set(MINOR_VERSION "0")
-set(MID_VERSION "1")
+set(MID_VERSION "2")
 set(MAJOR_VERSION "0")
 set(VERSION "${MAJOR_VERSION}.${MID_VERSION}.${MINOR_VERSION}")
 
@@ -23,8 +23,10 @@ if(DEFINED EBUG)
     add_definitions(-DEBUG)
 endif()
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
+find_package(CFITSIO REQUIRED)
 find_package(PkgConfig REQUIRED)
-set(MODULES cfitsio>=3.0 fli>=1.71)
+set(MODULES fli>=1.71)
 # additional modules on condition
 if(DEFINED USEPNG)
     set(MODULES ${MODULES} libpng>=1.2)
@@ -60,7 +62,7 @@ set(RU_FILE ${LCPATH}/ru.po)
 
 # exe file
 add_executable(${PROJ} ${SOURCES} ${PO_FILE} ${MO_FILE})
-target_link_libraries(${PROJ} ${${PROJ}_LIBRARIES})
+target_link_libraries(${PROJ}  ${CFITSIO_LIBRARIES} ${${PROJ}_LIBRARIES})
 include_directories(${${PROJ}_INCLUDE_DIRS})
 link_directories(${${PROJ}_LIBRARY_DIRS} )
 add_definitions(${CFLAGS} -DLOCALEDIR=\"${LOCALEDIR}\"

fli_control/cmdlnopts.c

@@ -82,6 +82,7 @@ myoption cmdlnopts[] = {
     {"object",  NEED_ARG,   NULL,   'O',    arg_string, APTR(&G.objname),   N_("object name")},
     {"obsname", NEED_ARG,   NULL,   'N',    arg_string, APTR(&G.observers), N_("observers' names")},
     {"prog-id", NEED_ARG,   NULL,   'P',    arg_string, APTR(&G.prog_id),   N_("observing program name")},
+    {"addrec",  MULT_PAR,   NULL,   'r',    arg_string, APTR(&G.addhdr),    N_("add records to header from given file[s]")},
     //{"",  NEED_ARG,   NULL,   '',    arg_string, APTR(&G.),    N_("")},
 
     {"nflushes",NEED_ARG,   NULL,   'f',    arg_int,    APTR(&G.nflushes),  N_("N flushes before exposing")},

fli_control/cmdlnopts.h

@@ -56,6 +56,7 @@ typedef struct{
 //    int getwheel;       // get position of wheel
     int setwheel;       // set wheel position
     int async;          // asynchronous moving
+    char **addhdr;      // list of files from which to add header records
 } glob_pars;
 
 

fli_control/locale/ru/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-01 10:51+0300\n"
+"POT-Creation-Date: 2020-02-22 20:05+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,424 +17,433 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:65
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:65
 msgid "show this help"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:66
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:66
 msgid "rewrite output file if exists"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:67
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:67
 msgid "verbose level (each -v increase it)"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:68
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:68
 msgid "not open shutter, when exposing (\"dark frames\")"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:69
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:69
 msgid "open shutter"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:70
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:70
 msgid "close shutter"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:71
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:71
 msgid "run exposition on LOW @ pin5 I/O port"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:72
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:72
 msgid "run exposition on HIGH @ pin5 I/O port"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:73
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:73
 msgid "get value of I/O port pins"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:74
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:74
 msgid "move stepper motor asynchronous"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:75
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:75
 msgid "run in 8-bit mode"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:76
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:76
 msgid "fast (8MHz) readout mode"
 msgstr ""
 
 #. {"",  NO_ARGS,    NULL,   '',    arg_int,  APTR(&G.),    N_("")},
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:79
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:79
 msgid "program author"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:80
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:80
 msgid "object type (neon, object, flat etc)"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:81
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:81
 msgid "instrument name"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:82
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:82
 msgid "object name"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:83
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:83
 msgid "observers' names"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:84
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:84
 msgid "observing program name"
 msgstr ""
 
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:85
+msgid "add records to header from given file[s]"
+msgstr ""
+
 #. {"",  NEED_ARG,   NULL,   '',    arg_string, APTR(&G.),    N_("")},
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:87
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:88
 msgid "N flushes before exposing"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:88
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:89
 msgid "horizontal binning to N pixels"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:89
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:90
 msgid "vertical binning to N pixels"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:90
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:91
 msgid "make series of N frames"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:91
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:92
 msgid "make pause for N seconds between expositions"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:92
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:93
 msgid "set exposure time to given value (ms)"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:93
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:94
 msgid "frame X0 coordinate (-1 - all with overscan)"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:94
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:95
 msgid "frame Y0 coordinate (-1 - all with overscan)"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:95
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:96
 msgid "frame X1 coordinate (-1 - all with overscan)"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:96
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:97
 msgid "frame Y1 coordinate (-1 - all with overscan)"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:97
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:98
 msgid "set I/O port pins to given value (decimal number, pin1 is LSB)"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:98
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:99
 msgid ""
 "configure I/O port pins to given value (decimal number, pin1 is LSB, 1 == "
 "output, 0 == input)"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:99
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:100
 msgid "move focuser to absolute position"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:100
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:101
 msgid "move focuser to relative position"
 msgstr ""
 
 #. {"wheel-get",NO_ARGS,   NULL,   0,      arg_none,   APTR(&G.getwheel),  N_("get current wheel position")},
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:102
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:103
 msgid "set wheel position"
 msgstr ""
 
 #. {"",  NEED_ARG,   NULL,   '',    arg_int,   APTR(&G.),    N_("")},
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:105
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:106
 msgid "set CCD temperature to given value (degr C)"
 msgstr ""
 
 #. ÷ÅÒÓÉÑ ÂÉÂÌÉÏÔÅËÉ '%s'
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:127
+#: /home/eddy/Doc/FLI/fli_control/main.c:130
 #, c-format
 msgid "Library version '%s'"
 msgstr ""
 
 #. íÏÄÅÌØ:\t\t%s
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:143
+#: /home/eddy/Doc/FLI/fli_control/main.c:146
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:234
+#: /home/eddy/Doc/FLI/fli_control/main.c:237
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:299
+#: /home/eddy/Doc/FLI/fli_control/main.c:318
 #, c-format
 msgid "Model:\t\t%s"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:146
+#: /home/eddy/Doc/FLI/fli_control/main.c:149
 #, c-format
 msgid "Focuser '%s', domain %s"
 msgstr ""
 
 #. áÐÐ. ×ÅÒÓÉÑ: %ld
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:149
+#: /home/eddy/Doc/FLI/fli_control/main.c:152
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:237
+#: /home/eddy/Doc/FLI/fli_control/main.c:240
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:303
+#: /home/eddy/Doc/FLI/fli_control/main.c:322
 #, c-format
 msgid "HW revision: %ld"
 msgstr ""
 
 #. ðÒÏÇÒ. ×ÅÒÓÉÑ: %ld
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:152
+#: /home/eddy/Doc/FLI/fli_control/main.c:155
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:240
+#: /home/eddy/Doc/FLI/fli_control/main.c:243
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:306
+#: /home/eddy/Doc/FLI/fli_control/main.c:325
 #, c-format
 msgid "SW revision: %ld"
 msgstr ""
 
 #. îÅÌØÚÑ ÏÄÎÏ×ÒÅÍÅÎÎÏ ÕËÁÚÙ×ÁÔØ ÏÔÎÏÓÉÔÅÌØÎÕÀ É ÁÂÓÏÌÀÔÎÕÀ ÐÏÚÉÃÉÀ
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:168
+#: /home/eddy/Doc/FLI/fli_control/main.c:171
 msgid "You can't use both relative and absolute position"
 msgstr ""
 
 #. ïÛÉÂËÁ ÏÐÒÅÄÅÌÅÎÉÑ ÐÏÚÉÃÉÉ
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:173
+#: /home/eddy/Doc/FLI/fli_control/main.c:176
 msgid "Error in position detection"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:185
+#: /home/eddy/Doc/FLI/fli_control/main.c:188
 msgid "Already at position"
 msgstr ""
 
 #. ðÏÚÉÃÉÑ ÎÅ ÄÏÌÖÎÁ ×ÙÈÏÄÉÔØ ÚÁ ÐÒÅÄÅÌÙ 0...%ld
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:190
+#: /home/eddy/Doc/FLI/fli_control/main.c:193
 #, c-format
 msgid "Position should be in 0...%ld"
 msgstr ""
 
 #. ðÅÒÅÍÅÝÅÎÉÅ × ÎÕÌÅ×ÕÀ ÐÏÚÉÃÉÀ
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:195
+#: /home/eddy/Doc/FLI/fli_control/main.c:198
 msgid "Moving to home position"
 msgstr ""
 
 #. ðÅÒÅÍÅÝÅÎÉÅ ÎÁ %ld ÛÁÇÏ×
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:200
+#: /home/eddy/Doc/FLI/fli_control/main.c:203
 #, c-format
 msgid "Moving for %ld steps"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:213
+#: /home/eddy/Doc/FLI/fli_control/main.c:215
 msgid "No focusers found"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:230
+#: /home/eddy/Doc/FLI/fli_control/main.c:232
 #, c-format
 msgid "Wheel '%s', domain %s"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:244
+#: /home/eddy/Doc/FLI/fli_control/main.c:247
 #, c-format
 msgid "Wheel position should be from 0 to %ld"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:268
+#: /home/eddy/Doc/FLI/fli_control/main.c:271
+#, c-format
+msgid "Position is too big (max %d)"
+msgstr ""
+
+#: /home/eddy/Doc/FLI/fli_control/main.c:275
 msgid "Arrive to position"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:280
+#: /home/eddy/Doc/FLI/fli_control/main.c:299
 msgid "No wheels found"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:288
+#: /home/eddy/Doc/FLI/fli_control/main.c:307
 msgid "No CCD found"
 msgstr ""
 
 #. ëÁÍÅÒÁ '%s' ÉÚ ÄÏÍÅÎÁ %s
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:294
+#: /home/eddy/Doc/FLI/fli_control/main.c:313
 #, c-format
 msgid "Camera '%s', domain %s"
 msgstr ""
 
 #. òÁÚÍÅÒ ÐÉËÓÅÌÑ: %g x %g
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:309
+#: /home/eddy/Doc/FLI/fli_control/main.c:328
 #, c-format
 msgid "Pixel size: %g x %g"
 msgstr ""
 
 #. ÷ÉÄÉÍÏÅ ÐÏÌÅ: %s
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:313
+#: /home/eddy/Doc/FLI/fli_control/main.c:332
 #, c-format
 msgid "Field of view: %s"
 msgstr ""
 
 #. ðÏÌÅ ÉÚÏÂÒÁÖÅÎÉÑ: (%ld, %ld)(%ld, %ld)
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:318
+#: /home/eddy/Doc/FLI/fli_control/main.c:337
 #, c-format
 msgid "Array field: (%ld, %ld)(%ld, %ld)"
 msgstr ""
 
 #. "õÓÔÁÎÏ×ËÁ ÔÅÍÐÅÒÁÔÕÒÙ ðúó: %g ÇÒÁÄÕÓÏ× ãÅÌØÓÉÑ\n"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:332
+#: /home/eddy/Doc/FLI/fli_control/main.c:351
 #, c-format
 msgid "Set CCD temperature to %g degr.C\n"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:358
+#: /home/eddy/Doc/FLI/fli_control/main.c:377
 #, c-format
 msgid "%s CCD shutter\n"
 msgstr ""
 
 #. "ðÏÐÙÔËÁ ÓËÏÎÆÉÇÕÒÉÒÏ×ÁÔØ ÐÏÒÔ I/O ËÁË %d\n"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:369
+#: /home/eddy/Doc/FLI/fli_control/main.c:388
 #, c-format
 msgid "Try to convfigure I/O port as %d\n"
 msgstr ""
 
 #. "ðÏÐÙÔËÁ ÚÁÐÉÓÉ %d × ÐÏÒÔ I/O\n"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:379
+#: /home/eddy/Doc/FLI/fli_control/main.c:398
 #, c-format
 msgid "Try to write %d to I/O port\n"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:400
+#: /home/eddy/Doc/FLI/fli_control/main.c:419
 msgid "8 bit mode\n"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:403
+#: /home/eddy/Doc/FLI/fli_control/main.c:422
 msgid "Fast readout mode\n"
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:404
+#: /home/eddy/Doc/FLI/fli_control/main.c:423
 msgid "Only show statistics\n"
 msgstr ""
 
 #. úÁÈ×ÁÔ ËÁÄÒÁ %d\n
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:410
+#: /home/eddy/Doc/FLI/fli_control/main.c:429
 #, c-format
 msgid "Capture frame %d\n"
 msgstr ""
 
 #. ÄÁÔÁ/×ÒÅÍÑ
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:418
+#: /home/eddy/Doc/FLI/fli_control/main.c:437
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:482
+#: /home/eddy/Doc/FLI/fli_control/main.c:501
 msgid "date/time"
 msgstr ""
 
 #. "ÏÖÉÄÁÎÉÅ ×ÎÅÛÎÅÇÏ ÔÒÉÇÇÅÒÁ"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:425
+#: /home/eddy/Doc/FLI/fli_control/main.c:444
 #, c-format
 msgid "wait for external trigger...\n"
 msgstr ""
 
 #. %.3f ÓÅËÕÎÄ ÄÏ ÏËÏÎÞÁÎÉÑ ÜËÓÐÏÚÉÃÉÉ\n
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:429
+#: /home/eddy/Doc/FLI/fli_control/main.c:448
 #, c-format
 msgid "%.3f seconds till exposition ends\n"
 msgstr ""
 
 #. óÞÉÔÙ×ÁÎÉÅ ÉÚÏÂÒÁÖÅÎÉÑ:
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:435
+#: /home/eddy/Doc/FLI/fli_control/main.c:454
 #, c-format
 msgid "Read image: "
 msgstr ""
 
 #. îÅ ÍÏÇÕ ÓÏÈÒÁÎÉÔØ ÆÁÊÌ
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:454
+#: /home/eddy/Doc/FLI/fli_control/main.c:473
 msgid "Can't save file"
 msgstr ""
 
 #. æÁÊÌ ÚÁÐÉÓÁÎ × '%s'
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:463
+#: /home/eddy/Doc/FLI/fli_control/main.c:482
 #, c-format
 msgid "File saved as '%s'"
 msgstr ""
 
 #. %d ÓÅËÕÎÄ ÄÏ ÏËÏÎÞÁÎÉÑ ÐÁÕÚÙ\n
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:477
+#: /home/eddy/Doc/FLI/fli_control/main.c:496
 #, c-format
 msgid "%d seconds till pause ends\n"
 msgstr ""
 
 #. óÔÁÔÉÓÔÉËÁ ÐÏ ÉÚÏÂÒÁÖÅÎÉÀ:\n
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:714
+#: /home/eddy/Doc/FLI/fli_control/main.c:770
 #, c-format
 msgid "Image stat:\n"
 msgstr ""
 
 #. amount of pcount and/or scount wrong
 #. / "îÅÐÒÁ×ÉÌØÎÙÊ ÆÏÒÍÁÔ ÓÔÒÏËÉ ÐÏÍÏÝÉ"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:56
+#: /home/eddy/Doc/FLI/fli_control/parseargs.c:56
 msgid "Wrong helpstring!"
 msgstr ""
 
 #. / "ãÅÌÏÅ ×ÎÅ ÄÏÐÕÓÔÉÍÏÇÏ ÄÉÁÐÁÚÏÎÁ"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:86
+#: /home/eddy/Doc/FLI/fli_control/parseargs.c:86
 msgid "Integer out of range"
 msgstr ""
 
 #. / "îÅÐÒÁ×ÉÌØÎÙÊ ÐÁÒÁÍÅÔÒ: %s"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:480
+#: /home/eddy/Doc/FLI/fli_control/parseargs.c:480
 #, c-format
 msgid "Wrong parameter: %s"
 msgstr ""
 
 #. / "%s: ÎÅÏÂÈÏÄÉÍ ÁÒÇÕÍÅÎÔ!"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:485
+#: /home/eddy/Doc/FLI/fli_control/parseargs.c:485
 #, c-format
 msgid "%s: argument needed!"
 msgstr ""
 
 #. / "îÅÐÒÁ×ÉÌØÎÙÊ ÁÒÇÕÍÅÎÔ \"%s\" ÐÁÒÁÍÅÔÒÁ \"%s\""
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:490
+#: /home/eddy/Doc/FLI/fli_control/parseargs.c:490
 #, c-format
 msgid "Wrong argument \"%s\" of parameter \"%s\""
 msgstr ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:173
+#: /home/eddy/Doc/FLI/fli_control/usefull_macros.c:173
 msgid "No filename given!"
 msgstr ""
 
 #. / "îÅ ÍÏÇÕ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:178
+#: /home/eddy/Doc/FLI/fli_control/usefull_macros.c:178
 #, c-format
 msgid "Can't open %s for reading"
 msgstr ""
 
 #. / "îÅ ÍÏÇÕ ×ÙÐÏÌÎÉÔØ stat %s"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:183
+#: /home/eddy/Doc/FLI/fli_control/usefull_macros.c:183
 #, c-format
 msgid "Can't stat %s"
 msgstr ""
 
 #. / "ïÛÉÂËÁ mmap"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:190
+#: /home/eddy/Doc/FLI/fli_control/usefull_macros.c:190
 msgid "Mmap error for input"
 msgstr ""
 
 #. / "îÅ ÍÏÇÕ ÚÁËÒÙÔØ mmap'ÎÕÔÙÊ ÆÁÊÌ"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:195
+#: /home/eddy/Doc/FLI/fli_control/usefull_macros.c:195
 msgid "Can't close mmap'ed file"
 msgstr ""
 
 #. / "îÅ ÍÏÇÕ munmap"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:205
+#: /home/eddy/Doc/FLI/fli_control/usefull_macros.c:205
 msgid "Can't munmap"
 msgstr ""
 
 #. / "îÅ ÍÏÇÕ ÎÁÓÔÒÏÉÔØ ËÏÎÓÏÌØ"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:231
+#: /home/eddy/Doc/FLI/fli_control/usefull_macros.c:231
 msgid "Can't setup console"
 msgstr ""
 
 #. Get settings
 #. / "îÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ ÎÁÓÔÒÏÊËÉ"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:301
+#: /home/eddy/Doc/FLI/fli_control/usefull_macros.c:301
 msgid "Can't get settings"
 msgstr ""
 
 #. / "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÎÁÓÔÒÏÊËÉ"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:312
+#: /home/eddy/Doc/FLI/fli_control/usefull_macros.c:312
 msgid "Can't set settings"
 msgstr ""

fli_control/locale/ru/ru.po

@@ -7,7 +7,7 @@
 msgid   ""
 msgstr  "Project-Id-Version: PACKAGE VERSION\n"
         "Report-Msgid-Bugs-To: \n"
-        "POT-Creation-Date: 2019-07-01 10:51+0300\n"
+        "POT-Creation-Date: 2020-02-22 20:05+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,424 +17,431 @@ msgstr  "Project-Id-Version: PACKAGE VERSION\n"
         "Content-Transfer-Encoding: 8bit\n"
 
 #. %.3f ÓÅËÕÎÄ ÄÏ ÏËÏÎÞÁÎÉÑ ÜËÓÐÏÚÉÃÉÉ\n
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:429
+#: /home/eddy/Doc/FLI/fli_control/main.c:448
 #, c-format
 msgid   "%.3f seconds till exposition ends\n"
-msgstr  "%.3f ÓĹËŐÎÄ ÄĎ ĎËĎÎŢÁÎÉŃ ÜËÓĐĎÚÉĂÉÉ\n"
+msgstr  ""
 
 #. %d ÓÅËÕÎÄ ÄÏ ÏËÏÎÞÁÎÉÑ ÐÁÕÚÙ\n
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:477
+#: /home/eddy/Doc/FLI/fli_control/main.c:496
 #, c-format
 msgid   "%d seconds till pause ends\n"
-msgstr  "%d ÓĹËŐÎÄ ÄĎ ĎËĎÎŢÁÎÉŃ ĐÁŐÚŮ\n"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:358
+#: /home/eddy/Doc/FLI/fli_control/main.c:377
 #, c-format
 msgid   "%s CCD shutter\n"
-msgstr  "%s ÚÁÔ×ĎŇ đúó\n"
+msgstr  ""
 
 #. / "%s: ÎÅÏÂÈÏÄÉÍ ÁÒÇÕÍÅÎÔ!"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:485
+#: /home/eddy/Doc/FLI/fli_control/parseargs.c:485
 #, c-format
 msgid   "%s: argument needed!"
-msgstr  "%s: ÎĹĎÂČĎÄÉÍ ÁŇÇŐÍĹÎÔ!"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:400
+#: /home/eddy/Doc/FLI/fli_control/main.c:419
 msgid   "8 bit mode\n"
-msgstr  "8-ÂÉÔÎŮĘ ŇĹÖÉÍ\n"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:185
+#: /home/eddy/Doc/FLI/fli_control/main.c:188
 msgid   "Already at position"
-msgstr  "őÖĹ ÎÁ ĐĎÚÉĂÉÉ"
+msgstr  ""
 
 #. ðÏÌÅ ÉÚÏÂÒÁÖÅÎÉÑ: (%ld, %ld)(%ld, %ld)
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:318
+#: /home/eddy/Doc/FLI/fli_control/main.c:337
 #, c-format
 msgid   "Array field: (%ld, %ld)(%ld, %ld)"
-msgstr  "đĎĚĹ ÉÚĎÂŇÁÖĹÎÉŃ: (%ld, %ld)(%ld, %ld)"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:268
+#: /home/eddy/Doc/FLI/fli_control/main.c:275
 msgid   "Arrive to position"
-msgstr  "đŇÉÂŮĚ ÎÁ ĐĎÚÉĂÉŔ"
+msgstr  ""
 
 #. ëÁÍÅÒÁ '%s' ÉÚ ÄÏÍÅÎÁ %s
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:294
+#: /home/eddy/Doc/FLI/fli_control/main.c:313
 #, c-format
 msgid   "Camera '%s', domain %s"
-msgstr  "ëÁÍĹŇÁ '%s' ÉÚ ÄĎÍĹÎÁ %s"
+msgstr  ""
 
 #. / "îÅ ÍÏÇÕ ÚÁËÒÙÔØ mmap'ÎÕÔÙÊ ÆÁÊÌ"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:195
+#: /home/eddy/Doc/FLI/fli_control/usefull_macros.c:195
 msgid   "Can't close mmap'ed file"
-msgstr  "îĹ ÍĎÇŐ ÚÁËŇŮÔŘ mmap'ÎŐÔŮĘ ĆÁĘĚ"
+msgstr  ""
 
 #. Get settings
 #. / "îÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ ÎÁÓÔÒÏÊËÉ"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:301
+#: /home/eddy/Doc/FLI/fli_control/usefull_macros.c:301
 msgid   "Can't get settings"
-msgstr  "îĹ ÍĎÇŐ ĐĎĚŐŢÉÔŘ ÎÁÓÔŇĎĘËÉ"
+msgstr  ""
 
 #. / "îÅ ÍÏÇÕ munmap"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:205
+#: /home/eddy/Doc/FLI/fli_control/usefull_macros.c:205
 msgid   "Can't munmap"
-msgstr  "îĹ ÍĎÇŐ munmap"
+msgstr  ""
 
 #. / "îÅ ÍÏÇÕ ÏÔËÒÙÔØ %s ÄÌÑ ÞÔÅÎÉÑ"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:178
+#: /home/eddy/Doc/FLI/fli_control/usefull_macros.c:178
 #, c-format
 msgid   "Can't open %s for reading"
-msgstr  "îĹ ÍĎÇŐ ĎÔËŇŮÔŘ %s ÄĚŃ ŢÔĹÎÉŃ"
+msgstr  ""
 
 #. îÅ ÍÏÇÕ ÓÏÈÒÁÎÉÔØ ÆÁÊÌ
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:454
+#: /home/eddy/Doc/FLI/fli_control/main.c:473
 msgid   "Can't save file"
-msgstr  "îĹ ÍĎÇŐ ÓĎČŇÁÎÉÔŘ ĆÁĘĚ"
+msgstr  ""
 
 #. / "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÎÁÓÔÒÏÊËÉ"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:312
+#: /home/eddy/Doc/FLI/fli_control/usefull_macros.c:312
 msgid   "Can't set settings"
-msgstr  "îĹ ÍĎÇŐ ŐÓÔÁÎĎ×ÉÔŘ ÎÁÓÔŇĎĘËÉ"
+msgstr  ""
 
 #. / "îÅ ÍÏÇÕ ÎÁÓÔÒÏÉÔØ ËÏÎÓÏÌØ"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:231
+#: /home/eddy/Doc/FLI/fli_control/usefull_macros.c:231
 msgid   "Can't setup console"
-msgstr  "îĹ ÍĎÇŐ ÎÁÓÔŇĎÉÔŘ ËĎÎÓĎĚŘ"
+msgstr  ""
 
 #. / "îÅ ÍÏÇÕ ×ÙÐÏÌÎÉÔØ stat %s"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:183
+#: /home/eddy/Doc/FLI/fli_control/usefull_macros.c:183
 #, c-format
 msgid   "Can't stat %s"
-msgstr  "îĹ ÍĎÇŐ ×ŮĐĎĚÎÉÔŘ stat %s"
+msgstr  ""
 
 #. úÁÈ×ÁÔ ËÁÄÒÁ %d\n
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:410
+#: /home/eddy/Doc/FLI/fli_control/main.c:429
 #, c-format
 msgid   "Capture frame %d\n"
-msgstr  "úÁČ×ÁÔ ËÁÄŇÁ %d\n"
+msgstr  ""
 
 #. ïÛÉÂËÁ ÏÐÒÅÄÅÌÅÎÉÑ ÐÏÚÉÃÉÉ
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:173
+#: /home/eddy/Doc/FLI/fli_control/main.c:176
 msgid   "Error in position detection"
-msgstr  "ďŰÉÂËÁ ĎĐŇĹÄĹĚĹÎÉŃ ĐĎÚÉĂÉÉ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:403
+#: /home/eddy/Doc/FLI/fli_control/main.c:422
 msgid   "Fast readout mode\n"
-msgstr  "ňĹÖÉÍ ÂŮÓÔŇĎÇĎ ÓŢÉÔŮ×ÁÎÉŃ\n"
+msgstr  ""
 
 #. ÷ÉÄÉÍÏÅ ÐÏÌÅ: %s
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:313
+#: /home/eddy/Doc/FLI/fli_control/main.c:332
 #, c-format
 msgid   "Field of view: %s"
-msgstr  "÷ÉÄÉÍĎĹ ĐĎĚĹ: %s"
+msgstr  ""
 
 #. æÁÊÌ ÚÁÐÉÓÁÎ × '%s'
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:463
+#: /home/eddy/Doc/FLI/fli_control/main.c:482
 #, c-format
 msgid   "File saved as '%s'"
-msgstr  "ćÁĘĚ ÚÁĐÉÓÁÎ × '%s'"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:146
+#: /home/eddy/Doc/FLI/fli_control/main.c:149
 #, c-format
 msgid   "Focuser '%s', domain %s"
-msgstr  "ćĎËŐÓĹŇ '%s', ÄĎÍĹÎ %s"
+msgstr  ""
 
 #. áÐÐ. ×ÅÒÓÉÑ: %ld
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:149
+#: /home/eddy/Doc/FLI/fli_control/main.c:152
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:237
+#: /home/eddy/Doc/FLI/fli_control/main.c:240
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:303
+#: /home/eddy/Doc/FLI/fli_control/main.c:322
 #, c-format
 msgid   "HW revision: %ld"
-msgstr  "áĐĐ. ×ĹŇÓÉŃ: %ld"
+msgstr  ""
 
 #. óÔÁÔÉÓÔÉËÁ ÐÏ ÉÚÏÂÒÁÖÅÎÉÀ:\n
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:714
+#: /home/eddy/Doc/FLI/fli_control/main.c:770
 #, c-format
 msgid   "Image stat:\n"
-msgstr  "óÔÁÔÉÓÔÉËÁ ĐĎ ÉÚĎÂŇÁÖĹÎÉŔ:\n"
+msgstr  ""
 
 #. / "ãÅÌÏÅ ×ÎÅ ÄÏÐÕÓÔÉÍÏÇÏ ÄÉÁÐÁÚÏÎÁ"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:86
+#: /home/eddy/Doc/FLI/fli_control/parseargs.c:86
 msgid   "Integer out of range"
-msgstr  "ăĹĚĎĹ ×ÎĹ ÄĎĐŐÓÔÉÍĎÇĎ ÄÉÁĐÁÚĎÎÁ"
+msgstr  ""
 
 #. ÷ÅÒÓÉÑ ÂÉÂÌÉÏÔÅËÉ '%s'
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:127
+#: /home/eddy/Doc/FLI/fli_control/main.c:130
 #, c-format
 msgid   "Library version '%s'"
-msgstr  "÷ĹŇÓÉŃ ÂÉÂĚÉĎÔĹËÉ '%s'"
+msgstr  ""
 
 #. / "ïÛÉÂËÁ mmap"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:190
+#: /home/eddy/Doc/FLI/fli_control/usefull_macros.c:190
 msgid   "Mmap error for input"
-msgstr  "ďŰÉÂËÁ mmap"
+msgstr  ""
 
 #. íÏÄÅÌØ:\t\t%s
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:143
+#: /home/eddy/Doc/FLI/fli_control/main.c:146
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:234
+#: /home/eddy/Doc/FLI/fli_control/main.c:237
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:299
+#: /home/eddy/Doc/FLI/fli_control/main.c:318
 #, c-format
 msgid   "Model:\t\t%s"
-msgstr  "íĎÄĹĚŘ:\t\t%s"
+msgstr  ""
 
 #. ðÅÒÅÍÅÝÅÎÉÅ ÎÁ %ld ÛÁÇÏ×
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:200
+#: /home/eddy/Doc/FLI/fli_control/main.c:203
 #, c-format
 msgid   "Moving for %ld steps"
-msgstr  "đĹŇĹÍĹÝĹÎÉĹ ÎÁ %ld ŰÁÇĎ×"
+msgstr  ""
 
 #. ðÅÒÅÍÅÝÅÎÉÅ × ÎÕÌÅ×ÕÀ ÐÏÚÉÃÉÀ
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:195
+#: /home/eddy/Doc/FLI/fli_control/main.c:198
 msgid   "Moving to home position"
-msgstr  "đĹŇĹÍĹÝĹÎÉĹ × ÎŐĚĹ×ŐŔ ĐĎÚÉĂÉŔ"
+msgstr  ""
 
 #. {"",  NEED_ARG,   NULL,   '',    arg_string, APTR(&G.),    N_("")},
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:87
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:88
 msgid   "N flushes before exposing"
-msgstr  "N ÓÂŇĎÓĎ× ÄĎ ÜËÓĐĎÚÉĂÉÉ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:288
+#: /home/eddy/Doc/FLI/fli_control/main.c:307
 msgid   "No CCD found"
-msgstr  "đúó ÎĹ ĎÂÎÁŇŐÖĹÎĎ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:173
+#: /home/eddy/Doc/FLI/fli_control/usefull_macros.c:173
 msgid   "No filename given!"
-msgstr  "îĹ ÚÁÄÁÎĎ ÉÍŃ ĆÁĘĚÁ!"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:213
+#: /home/eddy/Doc/FLI/fli_control/main.c:215
 msgid   "No focusers found"
-msgstr  "îĹ ÎÁĘÄĹÎ ĆĎËŐÓĹŇ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:280
+#: /home/eddy/Doc/FLI/fli_control/main.c:299
 msgid   "No wheels found"
-msgstr  "îĹ ÎÁĘÄĹÎŮ ÔŐŇĹĚÉ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:404
+#: /home/eddy/Doc/FLI/fli_control/main.c:423
 msgid   "Only show statistics\n"
-msgstr  "ôĎĚŘËĎ ĎÔĎÂŇÁÚÉÔŘ ÓÔÁÔÉÓÔÉËŐ\n"
+msgstr  ""
 
 #. òÁÚÍÅÒ ÐÉËÓÅÌÑ: %g x %g
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:309
+#: /home/eddy/Doc/FLI/fli_control/main.c:328
 #, c-format
 msgid   "Pixel size: %g x %g"
-msgstr  "ňÁÚÍĹŇ ĐÉËÓĹĚŃ: %g x %g"
+msgstr  ""
+
+#: /home/eddy/Doc/FLI/fli_control/main.c:271
+#, c-format
+msgid   "Position is too big (max %d)"
+msgstr  ""
 
 #. ðÏÚÉÃÉÑ ÎÅ ÄÏÌÖÎÁ ×ÙÈÏÄÉÔØ ÚÁ ÐÒÅÄÅÌÙ 0...%ld
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:190
+#: /home/eddy/Doc/FLI/fli_control/main.c:193
 #, c-format
 msgid   "Position should be in 0...%ld"
-msgstr  "đĎÚÉĂÉŃ ÎĹ ÄĎĚÖÎÁ ×ŮČĎÄÉÔŘ ÚÁ ĐŇĹÄĹĚŮ 0...%ld"
+msgstr  ""
 
 #. óÞÉÔÙ×ÁÎÉÅ ÉÚÏÂÒÁÖÅÎÉÑ:
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:435
+#: /home/eddy/Doc/FLI/fli_control/main.c:454
 #, c-format
 msgid   "Read image: "
-msgstr  "óŢÉÔŮ×ÁÎÉĹ ÉÚĎÂŇÁÖĹÎÉŃ:"
+msgstr  ""
 
 #. ðÒÏÇÒ. ×ÅÒÓÉÑ: %ld
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:152
+#: /home/eddy/Doc/FLI/fli_control/main.c:155
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:240
+#: /home/eddy/Doc/FLI/fli_control/main.c:243
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:306
+#: /home/eddy/Doc/FLI/fli_control/main.c:325
 #, c-format
 msgid   "SW revision: %ld"
-msgstr  "đŇĎÇŇ. ×ĹŇÓÉŃ: %ld"
+msgstr  ""
 
 #. "õÓÔÁÎÏ×ËÁ ÔÅÍÐÅÒÁÔÕÒÙ ðúó: %g ÇÒÁÄÕÓÏ× ãÅÌØÓÉÑ\n"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:332
+#: /home/eddy/Doc/FLI/fli_control/main.c:351
 #, c-format
 msgid   "Set CCD temperature to %g degr.C\n"
-msgstr  "őÓÔÁÎĎ×ËÁ ÔĹÍĐĹŇÁÔŐŇŮ đúó: %g ÇŇÁÄŐÓĎ× ăĹĚŘÓÉŃ\n"
+msgstr  ""
 
 #. "ðÏÐÙÔËÁ ÓËÏÎÆÉÇÕÒÉÒÏ×ÁÔØ ÐÏÒÔ I/O ËÁË %d\n"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:369
+#: /home/eddy/Doc/FLI/fli_control/main.c:388
 #, c-format
 msgid   "Try to convfigure I/O port as %d\n"
-msgstr  "đĎĐŮÔËÁ ÓËĎÎĆÉÇŐŇÉŇĎ×ÁÔŘ ĐĎŇÔ I/O ËÁË %d\n"
+msgstr  ""
 
 #. "ðÏÐÙÔËÁ ÚÁÐÉÓÉ %d × ÐÏÒÔ I/O\n"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:379
+#: /home/eddy/Doc/FLI/fli_control/main.c:398
 #, c-format
 msgid   "Try to write %d to I/O port\n"
-msgstr  "đĎĐŮÔËÁ ÚÁĐÉÓÉ %d × ĐĎŇÔ I/O\n"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:230
+#: /home/eddy/Doc/FLI/fli_control/main.c:232
 #, c-format
 msgid   "Wheel '%s', domain %s"
-msgstr  "ëĎĚĹÓĎ '%s', ÄĎÍĹÎ %s"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:244
+#: /home/eddy/Doc/FLI/fli_control/main.c:247
 #, c-format
 msgid   "Wheel position should be from 0 to %ld"
-msgstr  "îĎÍĹŇ ĐĎÚÉĂÉÉ ËĎĚĹÓÁ: ĎÔ 0 ÄĎ %ld"
+msgstr  ""
 
 #. / "îÅÐÒÁ×ÉÌØÎÙÊ ÁÒÇÕÍÅÎÔ \"%s\" ÐÁÒÁÍÅÔÒÁ \"%s\""
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:490
+#: /home/eddy/Doc/FLI/fli_control/parseargs.c:490
 #, c-format
 msgid   "Wrong argument \"%s\" of parameter \"%s\""
-msgstr  "îĹĐŇÁ×ÉĚŘÎŮĘ ÁŇÇŐÍĹÎÔ \"%s\" ĐÁŇÁÍĹÔŇÁ \"%s\""
+msgstr  ""
 
 #. amount of pcount and/or scount wrong
 #. / "îÅÐÒÁ×ÉÌØÎÙÊ ÆÏÒÍÁÔ ÓÔÒÏËÉ ÐÏÍÏÝÉ"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:56
+#: /home/eddy/Doc/FLI/fli_control/parseargs.c:56
 msgid   "Wrong helpstring!"
-msgstr  "îĹĐŇÁ×ÉĚŘÎŮĘ ĆĎŇÍÁÔ ÓÔŇĎËÉ ĐĎÍĎÝÉ!"
+msgstr  ""
 
 #. / "îÅÐÒÁ×ÉÌØÎÙÊ ÐÁÒÁÍÅÔÒ: %s"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:480
+#: /home/eddy/Doc/FLI/fli_control/parseargs.c:480
 #, c-format
 msgid   "Wrong parameter: %s"
-msgstr  "îĹĐŇÁ×ÉĚŘÎŮĘ ĐÁŇÁÍĹÔŇ: %s"
+msgstr  ""
 
 #. îÅÌØÚÑ ÏÄÎÏ×ÒÅÍÅÎÎÏ ÕËÁÚÙ×ÁÔØ ÏÔÎÏÓÉÔÅÌØÎÕÀ É ÁÂÓÏÌÀÔÎÕÀ ÐÏÚÉÃÉÀ
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:168
+#: /home/eddy/Doc/FLI/fli_control/main.c:171
 msgid   "You can't use both relative and absolute position"
-msgstr  "îĹĚŘÚŃ ĎÄÎĎ×ŇĹÍĹÎÎĎ ŐËÁÚŮ×ÁÔŘ ĎÔÎĎÓÉÔĹĚŘÎŐŔ É ÁÂÓĎĚŔÔÎŐŔ ĐĎÚÉĂÉŔ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:70
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:85
+msgid   "add records to header from given file[s]"
+msgstr  ""
+
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:70
 msgid   "close shutter"
-msgstr  "ÚÁËŇŮÔŘ ÚÁÔ×ĎŇ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:98
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:99
 msgid   "configure I/O port pins to given value (decimal number, pin1 is LSB, "
         "1 == output, 0 == input)"
-msgstr  "ÎÁÓÔŇĎÉÔŘ ĐÉÎŮ ĐĎŇÔÁ I/O (ÄĹÓŃÔÉŢÎĎĹ ÚÎÁŢĹÎÉĹ, ĐÉÎ 1 - ÍĚÁÄŰÉĘ, 1 == "
+msgstr  ""
-        "×ŮČĎÄ, 0 == ×ČĎÄ)"
 
 #. ÄÁÔÁ/×ÒÅÍÑ
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:418
+#: /home/eddy/Doc/FLI/fli_control/main.c:437
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:482
+#: /home/eddy/Doc/FLI/fli_control/main.c:501
 msgid   "date/time"
-msgstr  "ÄÁÔÁ/×ŇĹÍŃ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:76
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:76
 msgid   "fast (8MHz) readout mode"
 msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:93
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:94
 msgid   "frame X0 coordinate (-1 - all with overscan)"
-msgstr  "X0 ËĎĎŇÄÉÎÁÔÁ ĆŇĹĘÍÁ (-1 - ×ÍĹÓÔĹ Ó Ď×ĹŇÓËÁÎĎÍ)"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:95
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:96
 msgid   "frame X1 coordinate (-1 - all with overscan)"
-msgstr  "X1 ËĎĎŇÄÉÎÁÔÁ ĆŇĹĘÍÁ (-1 - ×ÍĹÓÔĹ Ó Ď×ĹŇÓËÁÎĎÍ)"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:94
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:95
 msgid   "frame Y0 coordinate (-1 - all with overscan)"
-msgstr  "Y0 ËĎĎŇÄÉÎÁÔÁ ĆŇĹĘÍÁ (-1 - ×ÍĹÓÔĹ Ó Ď×ĹŇÓËÁÎĎÍ)"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:96
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:97
 msgid   "frame Y1 coordinate (-1 - all with overscan)"
-msgstr  "Y1 ËĎĎŇÄÉÎÁÔÁ ĆŇĹĘÍÁ (-1 - ×ÍĹÓÔĹ Ó Ď×ĹŇÓËÁÎĎÍ)"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:73
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:73
 msgid   "get value of I/O port pins"
-msgstr  "ĐĎĚŐŢÉÔŘ ÚÎÁŢĹÎÉĹ ĐÉÎĎ× ĐĎŇÔÁ I/O"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:88
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:89
 msgid   "horizontal binning to N pixels"
-msgstr  "ÇĎŇÉÚĎÎÔÁĚŘÎŮĘ ÂÉÎÎÉÎÇ ÎÁ N ĐÉËÓĹĚĹĘ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:81
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:81
 msgid   "instrument name"
-msgstr  "ÎÁÚ×ÁÎÉĹ ÉÎÓÔŇŐÍĹÎÔÁ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:91
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:92
 msgid   "make pause for N seconds between expositions"
-msgstr  "ĐÁŐÚÁ ÎÁ N ÓĹËŐÎÄ ÍĹÖÄŐ ÜËÓĐĎÚÉĂÉŃÍÉ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:90
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:91
 msgid   "make series of N frames"
-msgstr  "ĐĎÓĚĹÄĎ×ÁÔĹĚŘÎĎÓÔŘ N ËÁÄŇĎ×"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:99
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:100
 msgid   "move focuser to absolute position"
-msgstr  "ĐĹŇĹÍĹÓÔÉÔŘ ĆĎËŐÓĹŇ × ÁÂÓĎĚŔÔÎŐŔ ĐĎÚÉĂÉŔ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:100
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:101
 msgid   "move focuser to relative position"
-msgstr  "ĐĹŇĹÍĹÓÔÉÔŘ ĆĎËŐÓĹŇ × ÁÂÓĎĚŔÔÎŐŔ ĐĎÚÉĂÉŔ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:74
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:74
 msgid   "move stepper motor asynchronous"
-msgstr  "Ä×ÉÇÁÔŘ ŰÁÇĎ×ŮĘ ÁÓÉÎČŇĎÎÎĎ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:68
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:68
 msgid   "not open shutter, when exposing (\"dark frames\")"
-msgstr  "ÓßĹÍËÁ ÔĹÍÎĎ×ŮČ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:82
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:82
 msgid   "object name"
-msgstr  "ÎÁÚ×ÁÎÉĹ ĎÂßĹËÔÁ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:80
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:80
 msgid   "object type (neon, object, flat etc)"
-msgstr  "ÔÉĐ ĎÂßĹËÔÁ (neon, object, flat É Ô.Đ.)"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:83
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:83
 msgid   "observers' names"
-msgstr  "ÉÍĹÎÁ ÎÁÂĚŔÄÁÔĹĚĹĘ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:84
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:84
 msgid   "observing program name"
-msgstr  "ÎÁÚ×ÁÎÉĹ ĐŇĎÇŇÁÍÍŮ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:69
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:69
 msgid   "open shutter"
-msgstr  "ĎÔËŇŮÔŘ ÚÁÔ×ĎŇ"
+msgstr  ""
 
 #. {"",  NO_ARGS,    NULL,   '',    arg_int,  APTR(&G.),    N_("")},
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:79
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:79
 msgid   "program author"
-msgstr  "Á×ÔĎŇ ĐŇĎÇŇÁÍÍŮ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:66
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:66
 msgid   "rewrite output file if exists"
-msgstr  "ĐĹŇĹÚÁĐÉÓÁÔŘ ×ŮČĎÄÎĎĘ ĆÁĘĚ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:72
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:72
 msgid   "run exposition on HIGH @ pin5 I/O port"
-msgstr  "ÚÁĐŐÓË ÜËÓĐĎÚÉĂÉÉ ĐŇÉ ×ŮÓĎËĎÍ ÓÉÇÎÁĚĹ ÎÁ ĐÉÎĹ5 ĐĎŇÔÁ I/O"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:71
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:71
 msgid   "run exposition on LOW @ pin5 I/O port"
-msgstr  "ÚÁĐŐÓË ÜËÓĐĎÚÉĂÉÉ ĐŇÉ ÎÉÚËĎÍ ÓÉÇÎÁĚĹ ÎÁ ĐÉÎĹ5 ĐĎŇÔÁ I/O"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:75
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:75
 msgid   "run in 8-bit mode"
 msgstr  ""
 
 #. {"",  NEED_ARG,   NULL,   '',    arg_int,   APTR(&G.),    N_("")},
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:105
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:106
 msgid   "set CCD temperature to given value (degr C)"
-msgstr  "ŐÓÔÁÎĎ×ÉÔŘ ÔĹÍĐĹŇÁÔŐŇŐ đúó (ÇŇÁÄŐÓŮ ă)"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:97
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:98
 msgid   "set I/O port pins to given value (decimal number, pin1 is LSB)"
-msgstr  "ŐÓÔÁÎĎ×ÉÔŘ ĐĎŇÔ I/O × ÚÁÄÁÎÎĎĹ ÚÎÁŢĹÎÉĹ (ÄĹÓŃÔÉŢÎĎĹ ŢÉÓĚĎ, ĐÉÎ1 - "
+msgstr  ""
-        "ÍĚÁÄŰÉĘ)"
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:92
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:93
 msgid   "set exposure time to given value (ms)"
-msgstr  "ŐÓÔÁÎĎ×ÉÔŘ ×ŇĹÍŃ ÜËÓĐĎÚÉĂÉÉ (ÍÓ)"
+msgstr  ""
 
 #. {"wheel-get",NO_ARGS,   NULL,   0,      arg_none,   APTR(&G.getwheel),  N_("get current wheel position")},
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:102
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:103
 msgid   "set wheel position"
-msgstr  "ŐÓÔÁÎĎ×ÉÔŘ ĐĎĚĎÖĹÎÉĹ ËĎĚĹÓÁ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:65
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:65
 msgid   "show this help"
-msgstr  "ĎÔĎÂŇÁÚÉÔŘ ÜÔŐ ÓĐŇÁ×ËŐ"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:67
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:67
 msgid   "verbose level (each -v increase it)"
-msgstr  "ŐŇĎ×ĹÎŘ ÓĎĎÂÝĹÎÉĘ (ËÁÖÄŮĘ -v ĐĎ×ŮŰÁĹÔ)"
+msgstr  ""
 
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:89
+#: /home/eddy/Doc/FLI/fli_control/cmdlnopts.c:90
 msgid   "vertical binning to N pixels"
-msgstr  "×ĹŇÔÉËÁĚŘÎŮĘ ÂÉÎÎÉÎÇ ÎÁ N ĐÉËÓĹĚĹĘ"
+msgstr  ""
 
 #. "ÏÖÉÄÁÎÉÅ ×ÎÅÛÎÅÇÏ ÔÒÉÇÇÅÒÁ"
-#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:425
+#: /home/eddy/Doc/FLI/fli_control/main.c:444
 #, c-format
 msgid   "wait for external trigger...\n"
-msgstr  "ĎÖÉÄÁÎÉĹ ×ÎĹŰÎĹÇĎ ÔŇÉÇÇĹŇÁ...\n"
+msgstr  ""

fli_control/main.c

@@ -48,7 +48,7 @@
 #define FLIUSB_FOCUSER_ID 0x06
 #endif
 
-long fli_err;
+static long fli_err;
 #define TRYFUNC(f, ...)             \
 do{ if((fli_err = f(__VA_ARGS__)))  \
         WARNX(#f "() failed");      \
@@ -61,27 +61,30 @@ int writepng(char *filename, int width, int height, void *data);
 #define BUFF_SIZ 4096
 
 #define TMBUFSIZ 40
-char tm_buf[TMBUFSIZ];  // buffer for string with time value
+static char tm_buf[TMBUFSIZ];  // buffer for string with time value
 
-glob_pars *G = NULL; // default parameters see in cmdlnopts.c
+static glob_pars *G = NULL; // default parameters see in cmdlnopts.c
 
-uint16_t max = 0, min = 65535; // max/min values for given image
+static uint16_t max = 0, min = 65535; // max/min values for given image
-double avr, std; // stat values
+static double avr, std; // stat values
-char *camera = NULL, viewfield[80];
+static char *camera = NULL, viewfield[80];
-double pixX, pixY; // pixel size in um
+static double pixX, pixY; // pixel size in um
 
-void print_stat(u_int16_t *img, long size);
+static void print_stat(u_int16_t *img, long size);
 
-size_t curtime(char *s_time){ // current date/time
+static size_t curtime(char *s_time){ // current date/time
     time_t tm = time(NULL);
     return strftime(s_time, TMBUFSIZ, "%d/%m/%Y,%H:%M:%S", localtime(&tm));
 }
 
-fliframe_t frametype = FLI_FRAME_TYPE_NORMAL;
+static fliframe_t frametype = FLI_FRAME_TYPE_NORMAL;
-double t_ext, t_int;    // external & CCD temperatures @exp. end
+static double t_ext, t_int;    // external & CCD temperatures @exp. end
-time_t expStartsAt;     // exposition start time (time_t)
+static time_t expStartsAt;     // exposition start time (time_t)
 
-int check_filename(char *buff, char *outfile, char *ext){
+static long filterpos = -1;    // filter position
+static long focuserpos = -1;   // focuser position
+
+static int check_filename(char *buff, char *outfile, char *ext){
     struct stat filestat;
     int num;
     for(num = 1; num < 10000; num++){
@@ -98,7 +101,7 @@ void signals(int signo){
 }
 
 extern const char *__progname;
-void info(const char *fmt, ...){
+static void info(const char *fmt, ...){
     va_list ar;
     if(!verbose) return;
     printf("%s: ", __progname);
@@ -201,13 +204,12 @@ int main(int argc, char **argv){
                 if(G->async) TRYFUNC(FLIStepMotorAsync, dev, steps);
                 else TRYFUNC(FLIStepMotor, dev, steps);
             }
-            TRYFUNC(FLIGetStepperPosition, dev, &ltmp);
-            if(!fli_err){
-                green("FOCPOS=%ld\n", ltmp);
-                curpos = ltmp;
-            }
         }while(0);
-        ;
+        TRYFUNC(FLIGetStepperPosition, dev, &focuserpos);
+        if(!fli_err){
+            green("FOCPOS=%ld\n", focuserpos);
+            curpos = focuserpos;
+        }else DBG("Error getting fpos: %ld", fli_err);
         TRYFUNC(FLIClose, dev);
     }
     if(!nfocs) WARNX(_("No focusers found"));
@@ -229,6 +231,7 @@ int main(int argc, char **argv){
         }
         info(_("Wheel '%s', domain %s"), cam[i].name, cam[i].dname);
         green("WHEELTOTALPOS=%ld\n", ltmp);
+        int wheelmaxpos = (int)ltmp - 1;
         TRYFUNC(FLIGetModel, dev, buff, BUFF_SIZ);
         // íÏÄÅÌØ:\t\t%s
         if(!fli_err) info(_("Model:\t\t%s"), buff);
@@ -264,16 +267,32 @@ int main(int argc, char **argv){
         ++nwheels;
         if(G->setwheel > -1){
             ltmp = G->setwheel;
+            if(ltmp > wheelmaxpos){
+                WARNX(_("Position is too big (max %d)"), wheelmaxpos);
+                goto closewheeldev;
+            }
             TRYFUNC(FLISetFilterPos, dev, ltmp);
             if(!fli_err) info(_("Arrive to position"));
-            long curpos = -1;
-        // this function returns -1 every connection!!!
-            TRYFUNC(FLIGetFilterPos, dev, &curpos);
-            if(!fli_err){
-                green("WHEELPOS=%ld\n", curpos);
-            }else goto closewheeldev;
         }
-        ;
+        // this function returns -1 every connection without SETpos!!!
+        TRYFUNC(FLIGetFilterPos, dev, &filterpos);
+        if(!fli_err && filterpos > -1){
+            green("WHEELPOS=%ld\n", filterpos);
+        }else{
+            filterpos = -1;
+        // so try to check current position by steps
+            TRYFUNC(FLIGetStepperPosition, dev, &ltmp);
+            if(ltmp < 0) ltmp = -ltmp;
+            DBG("steps: %ld", ltmp);
+            if(!fli_err){
+                int pos = (ltmp - WHEEL_POS0STPS+WHEEL_STEPPOS/2)/WHEEL_STEPPOS;
+                DBG("pos = %d", pos);
+                if(pos > -1 && pos <= wheelmaxpos){
+                    filterpos = pos;
+                    green("WHEELPOS=%ld\n", filterpos);
+                }
+            }
+        }
 closewheeldev:
         TRYFUNC(FLIClose, dev);
     }
@@ -497,7 +516,7 @@ int main(int argc, char **argv){
     return 0;
 }
 
-int findcams(flidomain_t domain, cam_t **cam){
+static int findcams(flidomain_t domain, cam_t **cam){
     char **tmplist;
     int numcams = 0;
     TRYFUNC(FLIList, domain, &tmplist);
@@ -544,7 +563,7 @@ int findcams(flidomain_t domain, cam_t **cam){
 }
 
 #ifdef USERAW
-int writeraw(char *filename, int width, int height, void *data){
+static int writeraw(char *filename, int width, int height, void *data){
     int fd, size, err;
     if ((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC,
         S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH )) == -1){
@@ -562,12 +581,38 @@ int writeraw(char *filename, int width, int height, void *data){
 }
 #endif // USERAW
 
+/**
+ * @brief addrec - add FITS records from file
+ * @param f (i)        - FITS filename
+ * @param filename (i) - name of file
+ */
+static void addrec(fitsfile *f, char *filename){
+    FILE *fp = fopen(filename, "r");
+    if(!fp) return;
+    char buf[2*FLEN_CARD];
+    while(fgets(buf, 2*FLEN_CARD, fp)){
+        DBG("check record _%s_", buf);
+        int keytype, status = 0;
+        char newcard[FLEN_CARD], keyname[FLEN_CARD];
+        fits_parse_template(buf, newcard, &keytype, &status);
+        if(status){
+            fits_report_error(stderr, status);
+            continue;
+        }
+        DBG("reformatted to _%s_", newcard);
+        strncpy(keyname, newcard, FLEN_CARD);
+        char *eq = strchr(keyname, '='); if(eq) *eq = 0;
+        eq = strchr(keyname, ' '); if(eq) *eq = 0;
+        DBG("keyname: %s", keyname);
+        fits_update_card(f, keyname, newcard, &status);
+    }
+}
 
-int writefits(char *filename, int width, int height, void *data){
+static int writefits(char *filename, int width, int height, void *data){
     long naxes[2] = {width, height}, startTime;
     double tmp = 0.0;
     struct tm *tm_starttime;
-    char buf[80];
+    char buf[FLEN_CARD];
     time_t savetime = time(NULL);
     fitsfile *fp;
     TRYFITS(fits_create_file, &fp, filename);
@@ -596,7 +641,7 @@ int writefits(char *filename, int width, int height, void *data){
     if(G->Y0) WRITEKEY(fp, TINT, "Y0", &G->Y0, "Subframe upper border");
     if(G->exptime < 2.*DBL_EPSILON) sprintf(buf, "bias");
     else if(frametype == FLI_FRAME_TYPE_DARK) sprintf(buf, "dark");
-    else if(G->objtype) strncpy(buf, G->objtype, 80);
+    else if(G->objtype) strncpy(buf, G->objtype, FLEN_CARD-1);
     else sprintf(buf, "object");
     // IMAGETYP / object, flat, dark, bias, scan, eta, neon, push
     WRITEKEY(fp, TSTRING, "IMAGETYP", buf, "Image type");
@@ -616,15 +661,20 @@ int writefits(char *filename, int width, int height, void *data){
     tmp = (G->temperature + t_int) / 2. + 273.15;
     // CAMTEMP / Camera temperature (K)
     WRITEKEY(fp, TDOUBLE, "CAMTEMP", &tmp, "Camera temperature (K)");
-    tmp = (double)G->exptime / 1000.;
+    // WHEEL & FOCUSER positions:
+    tmp = (double)focuserpos / FOCSCALE;
+    WRITEKEY(fp, TDOUBLE, "FOCUS", &tmp, "Current focuser position, mm");
+    if(filterpos > -1)
+        WRITEKEY(fp, TINT, "FILTER", &filterpos, "Current filter number");
     // EXPTIME / actual exposition time (sec)
-    WRITEKEY(fp, TDOUBLE, "EXPTIME", &tmp, "actual exposition time (sec)");
+    tmp = (double)G->exptime / 1000.;
+    WRITEKEY(fp, TDOUBLE, "EXPTIME", &tmp, "Actual exposition time (sec)");
     // DATE / Creation date (YYYY-MM-DDThh:mm:ss, UTC)
     strftime(buf, 80, "%Y-%m-%dT%H:%M:%S", gmtime(&savetime));
     WRITEKEY(fp, TSTRING, "DATE", buf, "Creation date (YYYY-MM-DDThh:mm:ss, UTC)");
     startTime = (long)expStartsAt;
     tm_starttime = localtime(&expStartsAt);
-    strftime(buf, 80, "exposition starts at %d/%m/%Y, %H:%M:%S (local)", tm_starttime);
+    strftime(buf, 80, "Exposition start time (UNIX)", tm_starttime);
     WRITEKEY(fp, TLONG, "UNIXTIME", &startTime, buf);
     strftime(buf, 80, "%Y/%m/%d", tm_starttime);
     // DATE-OBS / DATE (YYYY/MM/DD) OF OBS.
@@ -653,13 +703,19 @@ int writefits(char *filename, int width, int height, void *data){
     if(G->author){
         WRITEKEY(fp, TSTRING, "AUTHOR", G->author, "Author of the program");
     }
+    if(G->addhdr){ // add records from files
+        char **nxtfile = G->addhdr;
+        while(*nxtfile){
+            addrec(fp, *nxtfile++);
+        }
+    }
     TRYFITS(fits_write_img, fp, TUSHORT, 1, width * height, data);
     TRYFITS(fits_close_file, fp);
     return 0;
 }
 
 #ifdef USEPNG
-int writepng(char *filename, int width, int height, void *data){
+static int writepng(char *filename, int width, int height, void *data){
     int err;
     FILE *fp = NULL;
     png_structp pngptr = NULL;
@@ -696,7 +752,7 @@ int writepng(char *filename, int width, int height, void *data){
 }
 #endif /* USEPNG */
 
-void print_stat(u_int16_t *img, long size){
+static void print_stat(u_int16_t *img, long size){
     long i, Noverld = 0L;
     double pv, sum=0., sum2=0., sz = (double)size;
     u_int16_t *ptr = img, val;

fli_control/main.h

@@ -29,22 +29,29 @@
 
 #ifdef USEPNG
 #include <png.h>
+static int writepng(char *filename, int width, int height, void *data);
 #endif /* USEPNG */
 
 #include <libfli.h>
 
 #define LIBVERSIZ 1024
 
+// wheel position in steps = WHEEL_POS0STPS + WHEEL_STEPPOS*N
+#define WHEEL_POS0STPS  (239)
+#define WHEEL_STEPPOS   (48)
+// 1mm == FOCSCALE steps of focuser
+#define FOCSCALE        (10000.)
+
 typedef struct{
     flidomain_t domain;
     char *dname;
     char *name;
 }cam_t;
 
-int findcams(flidomain_t domain, cam_t **cam);
+static int findcams(flidomain_t domain, cam_t **cam);
 
 #ifdef USERAW
-int writeraw(char *filename, int width, int height, void *data);
+static int writeraw(char *filename, int width, int height, void *data);
 #endif // USERAW
 
 #define TRYFITS(f, ...)                     \
@@ -59,7 +66,7 @@ do{ int status = 0;                             \
     fits_write_key(__VA_ARGS__, &status);       \
     if(status) fits_report_error(stderr, status);\
 }while(0)
-int writefits(char *filename, int width, int height, void *data);
+static int writefits(char *filename, int width, int height, void *data);
 
 
 #endif // __MAIN_H__