diff --git a/README b/README index 463e613..20f22c5 100644 --- a/README +++ b/README @@ -17,3 +17,15 @@ If you wish to save not only FITS, define: define * -DEBUG=1 for debug info + + +TODO: +get/set camera readout speed with +FLIGetCameraModeString +FLISetCameraMode + /* + * set speed index + * + * speed index = 0 => set mode = 1 (1MHz) + * speed index = 1 => set mode = 0 (8MHz) + */ diff --git a/extern/FLI_SDK_Documentation.pdf b/extern/FLI_SDK_Documentation.pdf new file mode 100644 index 0000000..9115078 Binary files /dev/null and b/extern/FLI_SDK_Documentation.pdf differ diff --git a/fli_control/CMakeLists.txt b/fli_control/CMakeLists.txt index b27dd11..32c1b77 100644 --- a/fli_control/CMakeLists.txt +++ b/fli_control/CMakeLists.txt @@ -1,19 +1,15 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 2.8) set(PROJ fli_control) +project(${PROJ}) set(MINOR_VERSION "0") set(MID_VERSION "1") set(MAJOR_VERSION "0") set(VERSION "${MAJOR_VERSION}.${MID_VERSION}.${MINOR_VERSION}") -project(${PROJ} VERSION ${PROJ_VERSION} LANGUAGES C CXX) +message("VER: ${VERSION}") # default flags -set(CMAKE_C_FLAGS_RELEASE "") -set(CMAKE_C_FLAGS_DEBUG "") -set(CMAKE_CXX_FLAGS_RELEASE "") -set(CMAKE_CXX_FLAGS_DEBUG "") -set(CMAKE_C_FLAGS "-O2 -std=gnu99") -set(CMAKE_CXX_FLAGS "-O2") +set(CFLAGS -O2 -std=gnu99) set(CMAKE_COLOR_MAKEFILE ON) @@ -23,25 +19,19 @@ aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} SOURCES) # cmake -DEBUG=1 -> debugging if(DEFINED EBUG) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra -Wall -Werror -W") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Wall -Werror -W") - set(CMAKE_BUILD_TYPE DEBUG) - add_definitions(-DEBUG) # -DATIK_DEBUG=1) + set(CFLAGS ${CFLAGS} -Wextra -Wall -Werror -W) + add_definitions(-DEBUG) endif() find_package(PkgConfig REQUIRED) -# find CFITSIO -SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}) -FIND_PACKAGE(CFITSIO REQUIRED) - -set(MODULES fli>=1.71) +set(MODULES cfitsio>=3.0 fli>=1.71) # additional modules on condition -if(DEFINED USE_PNG AND USE_PNG STREQUAL "yes") +if(DEFINED USEPNG) set(MODULES ${MODULES} libpng>=1.2) add_definitions(-DUSEPNG) endif() pkg_check_modules(${PROJ} REQUIRED ${MODULES}) -if(DEFINED USE_RAW AND USE_RAW STREQUAL "yes") +if(DEFINED USERAW) add_definitions(-DUSERAW) endif() @@ -70,8 +60,8 @@ set(RU_FILE ${LCPATH}/ru.po) # exe file add_executable(${PROJ} ${SOURCES} ${PO_FILE} ${MO_FILE}) -target_link_libraries(${PROJ} ${${PROJ}_LIBRARIES} ${CFITSIO_LIBRARIES}) -include_directories(${${PROJ}_INCLUDE_DIRS} ${CFITSIO_INCLUDE_DIR}) +target_link_libraries(${PROJ} ${${PROJ}_LIBRARIES}) +include_directories(${${PROJ}_INCLUDE_DIRS}) link_directories(${${PROJ}_LIBRARY_DIRS} ) add_definitions(${CFLAGS} -DLOCALEDIR=\"${LOCALEDIR}\" -DPACKAGE_VERSION=\"${VERSION}\" -DGETTEXT_PACKAGE=\"${PROJ}\" diff --git a/fli_control/README b/fli_control/README index 8cb8c6e..46743be 100644 --- a/fli_control/README +++ b/fli_control/README @@ -11,3 +11,46 @@ If you wish to save not only FITS, define (cmake -Dxxx=1): define * -DEBUG=1 for debug info + + +device VID PID +wheel CFW1-5 0x0f18 0x0007 +Atlas focuser 0x0f18 0x0007 + + + +Only focuser: +fli_control: Library version 'Software Development Library for Linux 1.104' +findcams (/home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c, line 478): No devices +No CCD found +findcams (/home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c, line 474): found: /dev/fliusb0 @ USB +fli_control: Model: Atlas Digital Focuser +fli_control: Focuser '/dev/fliusb0', domain USB +fli_control: HW revision: 0 +fli_control: SW revision: 32839 +Focuser temperature: 28.125000 +fli_control: Focuser position 105000 +fli_control: Focuser extent: 105000 +findcams (/home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c, line 474): found: /dev/fliusb0 @ USB +fli_control: Wheel '/dev/fliusb0', domain USB +fli_control: Model: Atlas Digital Focuser +fli_control: HW revision: 0 +fli_control: SW revision: 32839 +fli_control: Amount of positions: 0 +fli_control: Wheel position: 0 + + + +Only wheel: +fli_control: Library version 'Software Development Library for Linux 1.104' +findcams (/home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c, line 478): No devices +No CCD found +findcams (/home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c, line 474): found: /dev/fliusb0 @ USB +No focusers found +findcams (/home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c, line 474): found: /dev/fliusb0 @ USB +fli_control: Wheel '/dev/fliusb0', domain USB +fli_control: Model: CFW-1-5 +fli_control: HW revision: 0 +fli_control: SW revision: 32768 +fli_control: Amount of positions: 5 +fli_control: Wheel position: -1 diff --git a/fli_control/README-func b/fli_control/README-func new file mode 100644 index 0000000..070a173 --- /dev/null +++ b/fli_control/README-func @@ -0,0 +1,157 @@ +// переменные, типы + flidomain_t = METHOD | DEVICE; + // METHOD: FLIDOMAIN_PARALLEL_PORT, FLIDOMAIN_USB, FLIDOMAIN_SERIAL, FLIDOMAIN_INET; + // DEVICE: FLIDEVICE_CAMERA, FLIDEVICE_FILTERWHEEL, FLIDEVICE_FOCUSER. + + fliframe_t = FLI_FRAME_TYPE_NORMAL или FLI_FRAME_TYPE_DARK. + + flibitdepth_t = FLI_MODE_8BIT или FLI_MODE_16BIT. + + flishutter_t = FLI_SHUTTER_CLOSE, FLI_SHUTTER_OPEN, FLI_SHUTTER_EXTERNAL_TRIGGER, + FLI_SHUTTER_EXTERNAL_TRIGGER_LOW, and FLI_SHUTTER_EXTERNAL_TRIGGER HIGH. + + flibgflush_t = FLI_BGFLUSH_STOP and FLI_BGFLUSH_START. + + flichannel_t = FLI_TEMPERATURE_INTERNAL and FLI_TEMPERATURE_EXTERNAL. + + flidebug_t = FLIDEBUG_NONE, FLIDEBUG_INFO, FLIDEBUG_WARN, and FLIDEBUG_FAIL. + +// функции + + LIBFLIAPI FLICancelExposure(flidev_t dev); // отмена экспозиции + // return: 0 - успех, !0 - неудача + + LIBFLIAPI FLIClose(flidev_t dev); // закрыть устройство + + LIBFLIAPI FLIGetArrayArea(flidev_t dev, + long* ul_x, long* ul_y, long* lr_x, long* lr_y); // получить размер фрейма + // ul_x, ul_y - координаты верхнего левого угла + // lr_x, lr_y - к-ты правого нижнего угла + + LIBFLIAPI FLIFlushRow(flidev_t dev, long rows, long repeat); // сброс рядов + // rows - кол-во рядов для сброса, repeat - сколько раз подряд сбросить + + LIBFLIAPI FLIGetFWRevision(flidev_t dev, long* fwrev); // версия прошивки + LIBFLIAPI FLIGetHWRevision(flidev_t dev, long* hwrev); // версия железа + // fwrev - версия прошивки, hwrev - версия железа + + LIBFLIAPI FLIGetLibVersion(char* ver, size_t len); // версия библиотеки + // ver - буфер для версии, len - его длина + + LIBFLIAPI FLIGetModel(flidev_t dev, char* model, size_t len); // имя модели + // model - буфер, len - его длина + + LIBFLIAPI FLIGetPixelSize(flidev_t dev, + double* pixel x, double* pixel y); // размер пикселя в мкм + + LIBFLIAPI FLIGetVisibleArea(flidev_t dev, + long* ul_x, long* ul_y, long* lr_x, long* lr_y); // р-р видимой области + // к-ты аналогично FLIGetArrayArea + + LIBFLIAPI FLIOpen(flidev_t* dev, char* name, flidomain_t domain); // открыть + // name - имя ищ FLIList() + + LIBFLIAPI FLISetDebugLevel(char* host, flidebug_t level); // уровень отладки + // host игнорируется + + LIBFLIAPI FLISetExposureTime(flidev_t dev, long exptime); // время экспозиции + // exptime - в миллисекундах + + LIBFLIAPI FLISetHBin(flidev_t dev, long hbin); // гориз. биннинг + LIBFLIAPI FLISetVBin(flidev_t dev, long vbin); // верт. биннинг + // hbin = 1..16, vbin = 1..16 + + LIBFLIAPI FLISetFrameType(flidev_t dev, fliframe_t frametype); // темновой или обычный + + LIBFLIAPI FLISetImageArea(flidev_t dev, + long ul_x, long ul_y, long lr_x, long lr_y); // установить область к-т + // lr_x = ul_x+(lrx-ul_x)/hbin; + // lr_y = ul_y+(lry-ul_y)/vbin; + // lrx, lry - абс. координаты в желаемой области + + LIBFLIAPI FLIGetExposureStatus(flidev_t dev, long* timeleft); + // время до окончания экспозиции + + LIBFLIAPI FLISetTemperature(flidev_t dev, double temperature); // задать Т + // temperature - в градусах Цельсия, от -55 до +45 + + LIBFLIAPI FLIGetTemperature(flidev_t dev, double* temperature); // узнать Т + + LIBFLIAPI FLIGrabRow(flidev_t dev, void* buff, size_t width); // считать ряд + // buff - буфер, width - макс. ширина ряда (размер буфера) + // считывает очередной ряд с камеры + + LIBFLIAPI FLIExposeFrame(flidev_t dev); // начать накопление + + LIBFLIAPI FLISetBitDepth(flidev_t dev, flibitdepth_t bitdepth); // задать разрядность + + LIBFLIAPI FLISetNFlushes(flidev_t dev, long nflushes); // задать кол-во сбросов + // перед экспозицией + + LIBFLIAPI FLIReadIOPort(flidev_t dev, long* ioportset); // считать порт io + // ioportset - считанные данные + + LIBFLIAPI FLIWriteIOPort(flidev_t dev, long ioportset); // записать в io + + LIBFLIAPI FLIConfigureIOPort(flidev_t dev, long ioportset); // настройка + // функционал каждого контакта порта io зависит от значения ioportset + // 1 - выход, 0 - вход + + LIBFLIAPI FLILockDevice(flidev_t dev); // блокировка устройства + // для обеспечения монопольного доступа + LIBFLIAPI FLIUnlockDevice(flidev_t dev); + + LIBFLIAPI FLIControlShutter(flidev_t dev, flishutter_t shutter); // затвор + // FLI_SHUTTER_EXTERNAL_TRIGGER_LOW и FLI_SHUTTER_EXTERNAL_TRIGGER + // запускают экспозицию при наличии лог. нуля на io0 + // FLI_SHUTTER_EXTERNAL_TRIGGER_HIGH - запуск эксп. на лог1 на io0 + + LIBFLIAPI FLIControlBackgroundFlush(flidev_t dev, flibgflush_t bgflush); + // фоновый сброс + + LIBFLIAPI FLIList(flidomain_t domain, char*** names); + // список устройств из домена domain + LIBFLIAPI FLIFreeList(char** names); // очистить список names + + LIBFLIAPI FLISetFilterPos(flidev_t dev, long filter); + // установить фильтр в позицию filter + + LIBFLIAPI FLIGetFilterPos(flidev_t dev, long* filter); + // текущее положение фильтра + + LIBFLIAPI FLIGetStepsRemaining(flidev_t dev, long* steps); + // количество шагов, оставшихся до назначенной позиции + + LIBFLIAPI FLIGetFilterCount(flidev_t dev, long* filter); + // узнать кол-во фильтров + + LIBFLIAPI FLIStepMotorAsync(flidev_t dev, long steps); + LIBFLIAPI FLIStepMotor(flidev_t dev, long steps); + // передвинуть турель на заданное кол-во шагов + + LIBFLIAPI FLIGetStepperPosition(flidev_t dev, long* position); + // текущее положение ШД + +// функции для работы с фокусирующим устройством + LIBFLIAPI FLIHomeFocuser(flidev_t dev); + LIBFLIAPI FLIGetFocuserExtent(flidev_t dev, long* extent); + LIBFLIAPI FLIReadTemperature(flidev_t dev, flichannel_t channel, + double* temperature); + + LIBFLIAPI FLICreateList(flidomain_t domain); // создать список + LIBFLIAPI FLIDeleteList(void); // удалить список + LIBFLIAPI FLIListFirst(flidomain_t* domain, char* filename, + size_t fnlen, char* name, size_t namelen); // получить первое устройство из списка + // domain - домен устр-ва; + // filename - имя файла устр-ва; + // fnlen - длина буфера имени файла; + // name - название устр-ва; + // namelen - длина буфера названия + + LIBFLIAPI FLIListNext(flidomain_t* domain, char* filename, + size_t fnlen, char* name, size_t namelen); // получить следующее устр-во + + + + + diff --git a/fli_control/cmdlnopts.c b/fli_control/cmdlnopts.c index e543530..468185a 100644 --- a/fli_control/cmdlnopts.c +++ b/fli_control/cmdlnopts.c @@ -43,7 +43,6 @@ int rewrite_ifexists = 0, // rewrite existing files == 0 or 1 // DEFAULTS // default global parameters glob_pars const Gdefault = { - .outfile = "fli_out", .objtype = "object", .instrument = "direct imaging", .exptime = -1, @@ -73,7 +72,8 @@ myoption cmdlnopts[] = { {"shutter-on-high",NO_ARGS,&G.shtr_cmd,FLI_SHUTTER_EXTERNAL_EXPOSURE_CONTROL|FLI_SHUTTER_EXTERNAL_TRIGGER_HIGH,arg_none,NULL, N_("run exposition on HIGH @ pin5 I/O port")}, {"get-ioport",NO_ARGS, NULL, 'i', arg_int, APTR(&G.getio), N_("get value of I/O port pins")}, {"async", NO_ARGS, &G.async,1, arg_none, NULL, N_("move stepper motor asynchronous")}, - //{"fast", NO_ARGS, NULL, '8', arg_int, APTR(&G.fast), N_("run in 8-bit mode")}, + {"8bit", NO_ARGS, NULL, '8', arg_int, APTR(&G._8bit), N_("run in 8-bit mode")}, + {"fast", NO_ARGS, NULL, 'F', arg_int, APTR(&G.fast), N_("fast (8MHz) readout mode")}, //{"", NO_ARGS, NULL, '', arg_int, APTR(&G.), N_("")}, {"author", NEED_ARG, NULL, 'A', arg_string, APTR(&G.author), N_("program author")}, diff --git a/fli_control/cmdlnopts.h b/fli_control/cmdlnopts.h index 52697fe..f29d190 100644 --- a/fli_control/cmdlnopts.h +++ b/fli_control/cmdlnopts.h @@ -45,7 +45,8 @@ typedef struct{ int nflushes; // amount of flushes int pause_len; // pause (in seconds) between expositions int shtr_cmd; // shutter command (flishutter_t) - int fast; // 8bit mode + int _8bit; // 8bit mode + int fast; // fast (8MHz) readout mode int getio; // get value of ioport int setio; // set value of ioport int confio; // configure ioport diff --git a/fli_control/locale/ru/LC_MESSAGES/fli_control.mo b/fli_control/locale/ru/LC_MESSAGES/fli_control.mo index a6bd7e1..5e2a430 100644 Binary files a/fli_control/locale/ru/LC_MESSAGES/fli_control.mo and b/fli_control/locale/ru/LC_MESSAGES/fli_control.mo differ diff --git a/fli_control/locale/ru/messages.po b/fli_control/locale/ru/messages.po index 71a193c..996f0f4 100644 --- a/fli_control/locale/ru/messages.po +++ b/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: 2018-10-28 18:36+0300\n" +"POT-Creation-Date: 2019-07-01 10:51+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,405 +17,424 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:66 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:65 msgid "show this help" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:67 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:66 msgid "rewrite output file if exists" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:68 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:67 msgid "verbose level (each -v increase it)" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:69 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:68 msgid "not open shutter, when exposing (\"dark frames\")" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:70 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:69 msgid "open shutter" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:71 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:70 msgid "close shutter" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:72 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:71 msgid "run exposition on LOW @ pin5 I/O port" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:73 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:72 msgid "run exposition on HIGH @ pin5 I/O port" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:74 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:73 msgid "get value of I/O port pins" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:75 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:74 msgid "move stepper motor asynchronous" msgstr "" -#. {"fast", NO_ARGS, NULL, '8', arg_int, APTR(&G.fast), N_("run in 8-bit mode")}, +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/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 +msgid "fast (8MHz) readout mode" +msgstr "" + #. {"", NO_ARGS, NULL, '', arg_int, APTR(&G.), N_("")}, -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:79 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:79 msgid "program author" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:80 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:80 msgid "object type (neon, object, flat etc)" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:81 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:81 msgid "instrument name" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:82 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:82 msgid "object name" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:83 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:83 msgid "observers' names" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:84 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:84 msgid "observing program name" msgstr "" #. {"", NEED_ARG, NULL, '', arg_string, APTR(&G.), N_("")}, -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:87 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:87 msgid "N flushes before exposing" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:88 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:88 msgid "horizontal binning to N pixels" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:89 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:89 msgid "vertical binning to N pixels" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:90 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:90 msgid "make series of N frames" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:91 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:91 msgid "make pause for N seconds between expositions" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:92 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:92 msgid "set exposure time to given value (ms)" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:93 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:93 msgid "frame X0 coordinate (-1 - all with overscan)" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:94 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:94 msgid "frame Y0 coordinate (-1 - all with overscan)" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:95 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:95 msgid "frame X1 coordinate (-1 - all with overscan)" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:96 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:96 msgid "frame Y1 coordinate (-1 - all with overscan)" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:97 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:97 msgid "set I/O port pins to given value (decimal number, pin1 is LSB)" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:98 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:98 msgid "" "configure I/O port pins to given value (decimal number, pin1 is LSB, 1 == " "output, 0 == input)" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:99 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:99 msgid "move focuser to absolute position" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:100 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:100 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/C-files/mytakepic/fli_control/cmdlnopts.c:102 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:102 msgid "set wheel position" msgstr "" #. {"", NEED_ARG, NULL, '', arg_int, APTR(&G.), N_("")}, -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:105 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:105 msgid "set CCD temperature to given value (degr C)" msgstr "" #. Версия библиотеки '%s' -#: /home/eddy/C-files/mytakepic/fli_control/main.c:127 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:127 #, c-format msgid "Library version '%s'" msgstr "" #. Модель:\t\t%s -#: /home/eddy/C-files/mytakepic/fli_control/main.c:143 -#: /home/eddy/C-files/mytakepic/fli_control/main.c:234 -#: /home/eddy/C-files/mytakepic/fli_control/main.c:299 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:143 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:234 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:299 #, c-format msgid "Model:\t\t%s" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:146 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:146 #, c-format msgid "Focuser '%s', domain %s" msgstr "" #. Апп. версия: %ld -#: /home/eddy/C-files/mytakepic/fli_control/main.c:149 -#: /home/eddy/C-files/mytakepic/fli_control/main.c:237 -#: /home/eddy/C-files/mytakepic/fli_control/main.c:303 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:149 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:237 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:303 #, c-format msgid "HW revision: %ld" msgstr "" #. Прогр. версия: %ld -#: /home/eddy/C-files/mytakepic/fli_control/main.c:152 -#: /home/eddy/C-files/mytakepic/fli_control/main.c:240 -#: /home/eddy/C-files/mytakepic/fli_control/main.c:306 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:152 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:240 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:306 #, c-format msgid "SW revision: %ld" msgstr "" #. Нельзя одновременно указывать относительную и абсолютную позицию -#: /home/eddy/C-files/mytakepic/fli_control/main.c:168 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:168 msgid "You can't use both relative and absolute position" msgstr "" #. Ошибка определения позиции -#: /home/eddy/C-files/mytakepic/fli_control/main.c:173 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:173 msgid "Error in position detection" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:185 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:185 msgid "Already at position" msgstr "" #. Позиция не должна выходить за пределы 0...%ld -#: /home/eddy/C-files/mytakepic/fli_control/main.c:190 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:190 #, c-format msgid "Position should be in 0...%ld" msgstr "" #. Перемещение в нулевую позицию -#: /home/eddy/C-files/mytakepic/fli_control/main.c:195 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:195 msgid "Moving to home position" msgstr "" #. Перемещение на %ld шагов -#: /home/eddy/C-files/mytakepic/fli_control/main.c:200 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:200 #, c-format msgid "Moving for %ld steps" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:213 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:213 msgid "No focusers found" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:230 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:230 #, c-format msgid "Wheel '%s', domain %s" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:244 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:244 #, c-format msgid "Wheel position should be from 0 to %ld" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:268 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:268 msgid "Arrive to position" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:280 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:280 msgid "No wheels found" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:288 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:288 msgid "No CCD found" msgstr "" #. Камера '%s' из домена %s -#: /home/eddy/C-files/mytakepic/fli_control/main.c:294 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:294 #, c-format msgid "Camera '%s', domain %s" msgstr "" #. Размер пикселя: %g x %g -#: /home/eddy/C-files/mytakepic/fli_control/main.c:309 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:309 #, c-format msgid "Pixel size: %g x %g" msgstr "" #. Видимое поле: %s -#: /home/eddy/C-files/mytakepic/fli_control/main.c:313 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:313 #, c-format msgid "Field of view: %s" msgstr "" #. Поле изображения: (%ld, %ld)(%ld, %ld) -#: /home/eddy/C-files/mytakepic/fli_control/main.c:318 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:318 #, c-format msgid "Array field: (%ld, %ld)(%ld, %ld)" msgstr "" #. "Установка температуры ПЗС: %g градусов Цельсия\n" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:332 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:332 #, c-format msgid "Set CCD temperature to %g degr.C\n" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:358 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:358 #, c-format msgid "%s CCD shutter\n" msgstr "" #. "Попытка сконфигурировать порт I/O как %d\n" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:369 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:369 #, c-format msgid "Try to convfigure I/O port as %d\n" msgstr "" #. "Попытка записи %d в порт I/O\n" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:379 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:379 #, 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 +msgid "8 bit mode\n" +msgstr "" + +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:403 +msgid "Fast readout mode\n" +msgstr "" + +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:404 +msgid "Only show statistics\n" +msgstr "" + #. Захват кадра %d\n -#: /home/eddy/C-files/mytakepic/fli_control/main.c:393 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:410 #, c-format msgid "Capture frame %d\n" msgstr "" #. дата/время -#: /home/eddy/C-files/mytakepic/fli_control/main.c:401 -#: /home/eddy/C-files/mytakepic/fli_control/main.c:464 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:418 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:482 msgid "date/time" msgstr "" #. "ожидание внешнего триггера" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:408 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:425 #, c-format msgid "wait for external trigger...\n" msgstr "" #. %.3f секунд до окончания экспозиции\n -#: /home/eddy/C-files/mytakepic/fli_control/main.c:412 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:429 #, c-format msgid "%.3f seconds till exposition ends\n" msgstr "" #. Считывание изображения: -#: /home/eddy/C-files/mytakepic/fli_control/main.c:418 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:435 #, c-format msgid "Read image: " msgstr "" #. Не могу сохранить файл -#: /home/eddy/C-files/mytakepic/fli_control/main.c:436 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:454 msgid "Can't save file" msgstr "" #. Файл записан в '%s' -#: /home/eddy/C-files/mytakepic/fli_control/main.c:445 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:463 #, c-format msgid "File saved as '%s'" msgstr "" #. %d секунд до окончания паузы\n -#: /home/eddy/C-files/mytakepic/fli_control/main.c:459 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:477 #, c-format msgid "%d seconds till pause ends\n" msgstr "" #. Статистика по изображению:\n -#: /home/eddy/C-files/mytakepic/fli_control/main.c:696 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:714 #, c-format msgid "Image stat:\n" msgstr "" #. amount of pcount and/or scount wrong #. / "Неправильный формат строки помощи" -#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:56 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:56 msgid "Wrong helpstring!" msgstr "" #. / "Целое вне допустимого диапазона" -#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:86 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:86 msgid "Integer out of range" msgstr "" #. / "Неправильный параметр: %s" -#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:480 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:480 #, c-format msgid "Wrong parameter: %s" msgstr "" #. / "%s: необходим аргумент!" -#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:485 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:485 #, c-format msgid "%s: argument needed!" msgstr "" #. / "Неправильный аргумент \"%s\" параметра \"%s\"" -#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:490 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:490 #, c-format msgid "Wrong argument \"%s\" of parameter \"%s\"" msgstr "" -#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:173 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:173 msgid "No filename given!" msgstr "" #. / "Не могу открыть %s для чтения" -#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:178 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:178 #, c-format msgid "Can't open %s for reading" msgstr "" #. / "Не могу выполнить stat %s" -#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:183 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:183 #, c-format msgid "Can't stat %s" msgstr "" #. / "Ошибка mmap" -#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:190 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:190 msgid "Mmap error for input" msgstr "" #. / "Не могу закрыть mmap'нутый файл" -#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:195 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:195 msgid "Can't close mmap'ed file" msgstr "" #. / "Не могу munmap" -#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:205 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:205 msgid "Can't munmap" msgstr "" #. / "Не могу настроить консоль" -#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:231 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:231 msgid "Can't setup console" msgstr "" #. Get settings #. / "Не могу получить настройки" -#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:301 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:301 msgid "Can't get settings" msgstr "" #. / "Не могу установить настройки" -#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:312 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:312 msgid "Can't set settings" msgstr "" diff --git a/fli_control/locale/ru/ru.po b/fli_control/locale/ru/ru.po index 4b165cd..eb365bf 100644 --- a/fli_control/locale/ru/ru.po +++ b/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: 2018-10-28 18:36+0300\n" + "POT-Creation-Date: 2019-07-01 10:51+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,404 +17,424 @@ msgstr "Project-Id-Version: PACKAGE VERSION\n" "Content-Transfer-Encoding: 8bit\n" #. %.3f секунд до окончания экспозиции\n -#: /home/eddy/C-files/mytakepic/fli_control/main.c:412 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:429 #, c-format msgid "%.3f seconds till exposition ends\n" msgstr "%.3f секунд до окончания экспозиции\n" #. %d секунд до окончания паузы\n -#: /home/eddy/C-files/mytakepic/fli_control/main.c:459 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:477 #, c-format msgid "%d seconds till pause ends\n" msgstr "%d секунд до окончания паузы\n" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:358 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:358 #, c-format msgid "%s CCD shutter\n" msgstr "%s затвор ПЗС\n" #. / "%s: необходим аргумент!" -#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:485 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:485 #, c-format msgid "%s: argument needed!" msgstr "%s: необходим аргумент!" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:185 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:400 +msgid "8 bit mode\n" +msgstr "8-битный режим\n" + +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:185 msgid "Already at position" msgstr "Уже на позиции" #. Поле изображения: (%ld, %ld)(%ld, %ld) -#: /home/eddy/C-files/mytakepic/fli_control/main.c:318 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:318 #, c-format msgid "Array field: (%ld, %ld)(%ld, %ld)" msgstr "Поле изображения: (%ld, %ld)(%ld, %ld)" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:268 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:268 msgid "Arrive to position" msgstr "Прибыл на позицию" #. Камера '%s' из домена %s -#: /home/eddy/C-files/mytakepic/fli_control/main.c:294 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:294 #, c-format msgid "Camera '%s', domain %s" msgstr "Камера '%s' из домена %s" #. / "Не могу закрыть mmap'нутый файл" -#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:195 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:195 msgid "Can't close mmap'ed file" msgstr "Не могу закрыть mmap'нутый файл" #. Get settings #. / "Не могу получить настройки" -#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:301 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:301 msgid "Can't get settings" msgstr "Не могу получить настройки" #. / "Не могу munmap" -#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:205 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:205 msgid "Can't munmap" msgstr "Не могу munmap" #. / "Не могу открыть %s для чтения" -#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:178 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:178 #, c-format msgid "Can't open %s for reading" msgstr "Не могу открыть %s для чтения" #. Не могу сохранить файл -#: /home/eddy/C-files/mytakepic/fli_control/main.c:436 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:454 msgid "Can't save file" msgstr "Не могу сохранить файл" #. / "Не могу установить настройки" -#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:312 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:312 msgid "Can't set settings" msgstr "Не могу установить настройки" #. / "Не могу настроить консоль" -#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:231 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:231 msgid "Can't setup console" msgstr "Не могу настроить консоль" #. / "Не могу выполнить stat %s" -#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:183 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:183 #, c-format msgid "Can't stat %s" msgstr "Не могу выполнить stat %s" #. Захват кадра %d\n -#: /home/eddy/C-files/mytakepic/fli_control/main.c:393 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:410 #, c-format msgid "Capture frame %d\n" msgstr "Захват кадра %d\n" #. Ошибка определения позиции -#: /home/eddy/C-files/mytakepic/fli_control/main.c:173 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:173 msgid "Error in position detection" msgstr "Ошибка определения позиции" +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:403 +msgid "Fast readout mode\n" +msgstr "Режим быстрого считывания\n" + #. Видимое поле: %s -#: /home/eddy/C-files/mytakepic/fli_control/main.c:313 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:313 #, c-format msgid "Field of view: %s" msgstr "Видимое поле: %s" #. Файл записан в '%s' -#: /home/eddy/C-files/mytakepic/fli_control/main.c:445 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:463 #, c-format msgid "File saved as '%s'" msgstr "Файл записан в '%s'" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:146 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:146 #, c-format msgid "Focuser '%s', domain %s" msgstr "Фокусер '%s', домен %s" #. Апп. версия: %ld -#: /home/eddy/C-files/mytakepic/fli_control/main.c:149 -#: /home/eddy/C-files/mytakepic/fli_control/main.c:237 -#: /home/eddy/C-files/mytakepic/fli_control/main.c:303 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:149 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:237 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:303 #, c-format msgid "HW revision: %ld" msgstr "Апп. версия: %ld" #. Статистика по изображению:\n -#: /home/eddy/C-files/mytakepic/fli_control/main.c:696 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:714 #, c-format msgid "Image stat:\n" msgstr "Статистика по изображению:\n" #. / "Целое вне допустимого диапазона" -#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:86 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:86 msgid "Integer out of range" msgstr "Целое вне допустимого диапазона" #. Версия библиотеки '%s' -#: /home/eddy/C-files/mytakepic/fli_control/main.c:127 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:127 #, c-format msgid "Library version '%s'" msgstr "Версия библиотеки '%s'" #. / "Ошибка mmap" -#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:190 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:190 msgid "Mmap error for input" msgstr "Ошибка mmap" #. Модель:\t\t%s -#: /home/eddy/C-files/mytakepic/fli_control/main.c:143 -#: /home/eddy/C-files/mytakepic/fli_control/main.c:234 -#: /home/eddy/C-files/mytakepic/fli_control/main.c:299 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:143 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:234 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:299 #, c-format msgid "Model:\t\t%s" msgstr "Модель:\t\t%s" #. Перемещение на %ld шагов -#: /home/eddy/C-files/mytakepic/fli_control/main.c:200 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:200 #, c-format msgid "Moving for %ld steps" msgstr "Перемещение на %ld шагов" #. Перемещение в нулевую позицию -#: /home/eddy/C-files/mytakepic/fli_control/main.c:195 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:195 msgid "Moving to home position" msgstr "Перемещение в нулевую позицию" #. {"", NEED_ARG, NULL, '', arg_string, APTR(&G.), N_("")}, -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:87 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:87 msgid "N flushes before exposing" msgstr "N сбросов до экспозиции" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:288 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:288 msgid "No CCD found" msgstr "ПЗС не обнаружено" -#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:173 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:173 msgid "No filename given!" msgstr "Не задано имя файла!" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:213 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:213 msgid "No focusers found" msgstr "Не найден фокусер" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:280 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:280 msgid "No wheels found" msgstr "Не найдены турели" +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:404 +msgid "Only show statistics\n" +msgstr "Только отобразить статистику\n" + #. Размер пикселя: %g x %g -#: /home/eddy/C-files/mytakepic/fli_control/main.c:309 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:309 #, c-format msgid "Pixel size: %g x %g" msgstr "Размер пикселя: %g x %g" #. Позиция не должна выходить за пределы 0...%ld -#: /home/eddy/C-files/mytakepic/fli_control/main.c:190 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:190 #, c-format msgid "Position should be in 0...%ld" msgstr "Позиция не должна выходить за пределы 0...%ld" #. Считывание изображения: -#: /home/eddy/C-files/mytakepic/fli_control/main.c:418 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:435 #, c-format msgid "Read image: " msgstr "Считывание изображения:" #. Прогр. версия: %ld -#: /home/eddy/C-files/mytakepic/fli_control/main.c:152 -#: /home/eddy/C-files/mytakepic/fli_control/main.c:240 -#: /home/eddy/C-files/mytakepic/fli_control/main.c:306 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:152 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:240 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:306 #, c-format msgid "SW revision: %ld" msgstr "Прогр. версия: %ld" #. "Установка температуры ПЗС: %g градусов Цельсия\n" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:332 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:332 #, c-format msgid "Set CCD temperature to %g degr.C\n" msgstr "Установка температуры ПЗС: %g градусов Цельсия\n" #. "Попытка сконфигурировать порт I/O как %d\n" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:369 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:369 #, c-format msgid "Try to convfigure I/O port as %d\n" msgstr "Попытка сконфигурировать порт I/O как %d\n" #. "Попытка записи %d в порт I/O\n" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:379 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:379 #, c-format msgid "Try to write %d to I/O port\n" msgstr "Попытка записи %d в порт I/O\n" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:230 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:230 #, c-format msgid "Wheel '%s', domain %s" msgstr "Колесо '%s', домен %s" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:244 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:244 #, c-format msgid "Wheel position should be from 0 to %ld" msgstr "Номер позиции колеса: от 0 до %ld" #. / "Неправильный аргумент \"%s\" параметра \"%s\"" -#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:490 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:490 #, c-format msgid "Wrong argument \"%s\" of parameter \"%s\"" msgstr "Неправильный аргумент \"%s\" параметра \"%s\"" #. amount of pcount and/or scount wrong #. / "Неправильный формат строки помощи" -#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:56 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:56 msgid "Wrong helpstring!" msgstr "Неправильный формат строки помощи!" #. / "Неправильный параметр: %s" -#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:480 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:480 #, c-format msgid "Wrong parameter: %s" msgstr "Неправильный параметр: %s" #. Нельзя одновременно указывать относительную и абсолютную позицию -#: /home/eddy/C-files/mytakepic/fli_control/main.c:168 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:168 msgid "You can't use both relative and absolute position" msgstr "Нельзя одновременно указывать относительную и абсолютную позицию" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:71 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:70 msgid "close shutter" msgstr "закрыть затвор" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:98 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:98 msgid "configure I/O port pins to given value (decimal number, pin1 is LSB, " "1 == output, 0 == input)" -msgstr "настроить пины порта I/O (десятичное значение, пин 1 - младший, " - "1 == выход, 0 == вход)" +msgstr "настроить пины порта I/O (десятичное значение, пин 1 - младший, 1 == " + "выход, 0 == вход)" #. дата/время -#: /home/eddy/C-files/mytakepic/fli_control/main.c:401 -#: /home/eddy/C-files/mytakepic/fli_control/main.c:464 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:418 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:482 msgid "date/time" msgstr "дата/время" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:93 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:76 +msgid "fast (8MHz) readout mode" +msgstr "" + +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:93 msgid "frame X0 coordinate (-1 - all with overscan)" msgstr "X0 координата фрейма (-1 - вместе с оверсканом)" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:95 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:95 msgid "frame X1 coordinate (-1 - all with overscan)" msgstr "X1 координата фрейма (-1 - вместе с оверсканом)" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:94 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:94 msgid "frame Y0 coordinate (-1 - all with overscan)" msgstr "Y0 координата фрейма (-1 - вместе с оверсканом)" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:96 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:96 msgid "frame Y1 coordinate (-1 - all with overscan)" msgstr "Y1 координата фрейма (-1 - вместе с оверсканом)" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:74 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:73 msgid "get value of I/O port pins" msgstr "получить значение пинов порта I/O" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:88 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:88 msgid "horizontal binning to N pixels" msgstr "горизонтальный биннинг на N пикселей" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:81 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:81 msgid "instrument name" msgstr "название инструмента" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:91 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:91 msgid "make pause for N seconds between expositions" msgstr "пауза на N секунд между экспозициями" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:90 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:90 msgid "make series of N frames" msgstr "последовательность N кадров" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:99 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:99 msgid "move focuser to absolute position" msgstr "переместить фокусер в абсолютную позицию" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:100 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:100 msgid "move focuser to relative position" msgstr "переместить фокусер в абсолютную позицию" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:75 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:74 msgid "move stepper motor asynchronous" msgstr "двигать шаговый асинхронно" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:69 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:68 msgid "not open shutter, when exposing (\"dark frames\")" msgstr "съемка темновых" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:82 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:82 msgid "object name" msgstr "название объекта" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:80 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:80 msgid "object type (neon, object, flat etc)" msgstr "тип объекта (neon, object, flat и т.п.)" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:83 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:83 msgid "observers' names" msgstr "имена наблюдателей" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:84 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:84 msgid "observing program name" msgstr "название программы" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:70 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:69 msgid "open shutter" msgstr "открыть затвор" -#. {"fast", NO_ARGS, NULL, '8', arg_int, APTR(&G.fast), N_("run in 8-bit mode")}, #. {"", NO_ARGS, NULL, '', arg_int, APTR(&G.), N_("")}, -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:79 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:79 msgid "program author" msgstr "автор программы" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:67 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:66 msgid "rewrite output file if exists" msgstr "перезаписать выходной файл" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:73 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:72 msgid "run exposition on HIGH @ pin5 I/O port" msgstr "запуск экспозиции при высоком сигнале на пине5 порта I/O" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:72 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:71 msgid "run exposition on LOW @ pin5 I/O port" msgstr "запуск экспозиции при низком сигнале на пине5 порта I/O" +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:75 +msgid "run in 8-bit mode" +msgstr "" + #. {"", NEED_ARG, NULL, '', arg_int, APTR(&G.), N_("")}, -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:105 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:105 msgid "set CCD temperature to given value (degr C)" msgstr "установить температуру ПЗС (градусы Ц)" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:97 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:97 msgid "set I/O port pins to given value (decimal number, pin1 is LSB)" -msgstr "установить порт I/O в заданное значение (десятичное число, пин1 - младший)" +msgstr "установить порт I/O в заданное значение (десятичное число, пин1 - " + "младший)" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:92 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:92 msgid "set exposure time to given value (ms)" msgstr "установить время экспозиции (мс)" #. {"wheel-get",NO_ARGS, NULL, 0, arg_none, APTR(&G.getwheel), N_("get current wheel position")}, -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:102 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:102 msgid "set wheel position" msgstr "установить положение колеса" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:66 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:65 msgid "show this help" msgstr "отобразить эту справку" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:68 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:67 msgid "verbose level (each -v increase it)" msgstr "уровень сообщений (каждый -v повышает)" -#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:89 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:89 msgid "vertical binning to N pixels" msgstr "вертикальный биннинг на N пикселей" #. "ожидание внешнего триггера" -#: /home/eddy/C-files/mytakepic/fli_control/main.c:408 +#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:425 #, c-format msgid "wait for external trigger...\n" msgstr "ожидание внешнего триггера...\n" diff --git a/fli_control/main.c b/fli_control/main.c index ede9b7f..3d7805b 100644 --- a/fli_control/main.c +++ b/fli_control/main.c @@ -255,7 +255,7 @@ int main(int argc, char **argv){ if(!fli_err) printf("%ld\n", ltmp); usleep(50000); } - /* + TRYFUNC(FLIGetActiveWheel, dev, <mp); if(!fli_err) info(_("Wheel number: %ld"), ltmp); TRYFUNC(FLIGetStepperPosition, dev, <mp); @@ -381,10 +381,27 @@ int main(int argc, char **argv){ } if(G->exptime < DBL_EPSILON) continue; + /* + char str[256]; + flimode_t m = 0; + int ret; + while((ret = FLIGetCameraModeString (dev, m, str, 255)) == 0){ + str[255] = 0; + red("String %ld: %s", m, str); + m++; + }*/ +// TRYFUNC(FLIGetCameraModeString, dev, m, str, 255); + TRYFUNC(FLISetExposureTime, dev, G->exptime); if(G->dark) frametype = FLI_FRAME_TYPE_DARK; TRYFUNC(FLISetFrameType, dev, frametype); - //TRYFUNC(FLISetBitDepth, dev, G->fast ? FLI_MODE_8BIT : FLI_MODE_16BIT); + if(G->_8bit){ + TRYFUNC(FLISetBitDepth, dev, FLI_MODE_8BIT); + if(fli_err == 0) green(_("8 bit mode\n")); + } + TRYFUNC(FLISetCameraMode, dev, G->fast ? 0 : 1); + if(G->fast) green(_("Fast readout mode\n")); + if(!G->outfile) red(_("Only show statistics\n")); img = MALLOC(uint16_t, img_rows * row_width); for (j = 0; j < G->nframes; j ++){ TRYFUNC(FLIGetTemperature, dev, &G->temperature); // temperature @ exp. start @@ -431,6 +448,7 @@ int main(int argc, char **argv){ curtime(tm_buf); print_stat(img, row_width * img_rows); inline void WRITEIMG(int (*writefn)(char*,int,int,void*), char *ext){ + if(G->outfile == NULL) return; if(!check_filename(buff, G->outfile, ext) && !rewrite_ifexists) // Не могу сохранить файл WARNX(_("Can't save file")); @@ -661,7 +679,7 @@ int writepng(char *filename, int width, int height, void *data){ goto done; } png_init_io(pngptr, fp); - png_set_compression_level(pngptr, 6); + png_set_compression_level(pngptr, Z_BEST_COMPRESSION); png_set_IHDR(pngptr, infoptr, width, height, 16, PNG_COLOR_TYPE_GRAY, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);