diff --git a/CMakeLists.txt b/CMakeLists.txt index 53ea76d..4603054 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,6 +116,14 @@ find_package (Threads REQUIRED) find_package(CppUnit) find_package(Doxygen) +######################################################################## +# Find gr-satnogs external build dependencies +######################################################################## +find_package(Nova) +if(NOT NOVA_FOUND) + message(FATAL_ERROR "libnova required to compile satnogs") +endif() + # Search for GNU Radio and its components and versions. Add any # components required to the list of GR_REQUIRED_COMPONENTS (in all # caps such as FILTER or FFT) and change the version to the minimum @@ -140,7 +148,7 @@ endif(DOXYGEN_FOUND) # Include or not into the module blocks for debugging ######################################################################## if(NOT INCLUDE_DEBUG_BLOCKS) - set(INCLUDE_DEBUG_BLOCKS OFF CACHE BOOL + set(INCLUDE_DEBUG_BLOCKS ON CACHE BOOL "Disable blocks that are used for debugging purposes") endif() @@ -155,6 +163,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${CPPUNIT_INCLUDE_DIRS} ${GNURADIO_ALL_INCLUDE_DIRS} + ${NOVA_INCLUDE_DIRS} ) link_directories( diff --git a/apps/flowgraphs/fm_demod.grc b/apps/flowgraphs/fm_demod.grc index 64f1ccd..08a8194 100644 --- a/apps/flowgraphs/fm_demod.grc +++ b/apps/flowgraphs/fm_demod.grc @@ -2047,7 +2047,7 @@ we shift the LO a little further _coordinate - (24, 256) + (24, 264) _rotation @@ -2726,10 +2726,6 @@ we shift the LO a little further addr "127.0.0.1" - - port - rigctl_port - mtu 1500 @@ -2742,6 +2738,18 @@ we shift the LO a little further minoutbuf 0 + + mode + False + + + port + rigctl_port + + + interval + 1000 + analog_sig_source_x_0 diff --git a/apps/flowgraphs/satnogs_fm_demod.py b/apps/flowgraphs/satnogs_fm_demod.py index be266ed..42d51dc 100755 --- a/apps/flowgraphs/satnogs_fm_demod.py +++ b/apps/flowgraphs/satnogs_fm_demod.py @@ -5,7 +5,7 @@ # Title: FM Generic Demodulation # Author: Manolis Surligas (surligas@gmail.com) # Description: A generic FM demodulation block -# Generated: Mon Oct 17 19:24:53 2016 +# Generated: Fri Oct 21 22:22:13 2016 ################################################## from gnuradio import analog @@ -24,7 +24,7 @@ import time class satnogs_fm_demod(gr.top_block): - def __init__(self, doppler_correction_per_sec=1000, file_path="test.wav", lo_offset=100e3, rigctl_port=4532, rx_freq=100e6, rx_sdr_device="usrpb200"): + def __init__(self, doppler_correction_per_sec=1000, file_path='test.wav', lo_offset=100e3, rigctl_port=4532, rx_freq=100e6, rx_sdr_device='usrpb200'): gr.top_block.__init__(self, "FM Generic Demodulation") ################################################## @@ -53,7 +53,7 @@ class satnogs_fm_demod(gr.top_block): ################################################## # Blocks ################################################## - self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, 1500) + self.satnogs_tcp_rigctl_msg_source_0 = satnogs.tcp_rigctl_msg_source("127.0.0.1", rigctl_port, False, 1000, 1500) self.satnogs_doppler_correction_cc_0 = satnogs.doppler_correction_cc(rx_freq, samp_rate_rx, doppler_correction_per_sec) self.pfb_arb_resampler_xxx_0 = pfb.arb_resampler_fff( audio_samp_rate / (quadrature_rate * 1.0 / audio_decimation), @@ -199,7 +199,7 @@ def argument_parser(): "", "--doppler-correction-per-sec", dest="doppler_correction_per_sec", type="intx", default=1000, help="Set doppler_correction_per_sec [default=%default]") parser.add_option( - "", "--file-path", dest="file_path", type="string", default="test.wav", + "", "--file-path", dest="file_path", type="string", default='test.wav', help="Set file_path [default=%default]") parser.add_option( "", "--lo-offset", dest="lo_offset", type="eng_float", default=eng_notation.num_to_str(100e3), @@ -211,7 +211,7 @@ def argument_parser(): "", "--rx-freq", dest="rx_freq", type="eng_float", default=eng_notation.num_to_str(100e6), help="Set rx_freq [default=%default]") parser.add_option( - "", "--rx-sdr-device", dest="rx_sdr_device", type="string", default="usrpb200", + "", "--rx-sdr-device", dest="rx_sdr_device", type="string", default='usrpb200', help="Set rx_sdr_device [default=%default]") return parser diff --git a/cmake/Modules/FindNova.cmake b/cmake/Modules/FindNova.cmake new file mode 100644 index 0000000..ab45e18 --- /dev/null +++ b/cmake/Modules/FindNova.cmake @@ -0,0 +1,26 @@ +INCLUDE(FindPkgConfig) +PKG_CHECK_MODULES(PC_NOVA Nova) + +FIND_PATH( + NOVA_INCLUDE_DIRS + NAMES libnova/libnova.h + HINTS $ENV{NOVA_DIR}/include + ${PC_NOVA_INCLUDEDIR} + PATHS /usr/local/include + /usr/include +) + +FIND_LIBRARY( + NOVA_LIBRARIES + NAMES nova + HINTS $ENV{NOVA_DIR}/lib + ${PC_NOVA_LIBDIR} + PATHS /usr/local/lib + /usr/local/lib64 + /usr/lib + /usr/lib64 +) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(NOVA DEFAULT_MSG NOVA_LIBRARIES NOVA_INCLUDE_DIRS) +MARK_AS_ADVANCED(NOVA_LIBRARIES NOVA_INCLUDE_DIRS) \ No newline at end of file diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index a9f297a..a8f0ba5 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -21,6 +21,7 @@ list(APPEND debug_blocks satnogs_morse_debug_source.xml satnogs_debug_msg_source.xml satnogs_debug_msg_source_raw.xml + satnogs_leo_channel.xml ) list(APPEND enabled_blocks diff --git a/grc/satnogs_leo_channel.xml b/grc/satnogs_leo_channel.xml new file mode 100644 index 0000000..7df7ae5 --- /dev/null +++ b/grc/satnogs_leo_channel.xml @@ -0,0 +1,38 @@ + + + leo_channel + satnogs_leo_channel + [satnogs] + import satnogs + satnogs.leo_channel($freq, $freq_shifts_per_sec) + + + ... + ... + ... + + + + + in + + + + + + out + + + diff --git a/grc/satnogs_tcp_rigctl_msg_source.xml b/grc/satnogs_tcp_rigctl_msg_source.xml index 8e2d886..afee538 100644 --- a/grc/satnogs_tcp_rigctl_msg_source.xml +++ b/grc/satnogs_tcp_rigctl_msg_source.xml @@ -4,7 +4,7 @@ satnogs_tcp_rigctl_msg_source satnogs import satnogs - satnogs.tcp_rigctl_msg_source($addr, $port, $mtu) + satnogs.tcp_rigctl_msg_source($addr, $port, $mode, $interval, $mtu) IP Address @@ -14,11 +14,32 @@ - Listen port + Port port 16886 int + + + Mode + mode + enum + + + + + + Update interval (ms) + interval + 1000 + int + MTU diff --git a/include/satnogs/CMakeLists.txt b/include/satnogs/CMakeLists.txt index 5e29764..c91e88f 100644 --- a/include/satnogs/CMakeLists.txt +++ b/include/satnogs/CMakeLists.txt @@ -24,6 +24,7 @@ list(APPEND DEBUG_HEADER_FILES morse_debug_source.h debug_msg_source_raw.h debug_msg_source.h + leo_channel.h ) list(APPEND HEADER_FILES @@ -61,5 +62,5 @@ endif() install(FILES ${HEADER_FILES} - DESTINATION include/satnogs + DESTINATION include/satnogs ) \ No newline at end of file diff --git a/include/satnogs/leo_channel.h b/include/satnogs/leo_channel.h new file mode 100644 index 0000000..2d71ab5 --- /dev/null +++ b/include/satnogs/leo_channel.h @@ -0,0 +1,722 @@ +/* -*- c++ -*- */ +/* GNU GENERAL PUBLIC LICENSE + * Version 3, 29 June 2007 + * + * Copyright (C) 2007 Free Software Foundation, Inc. + * Everyone is permitted to copy and distribute verbatim copies + * of this license document, but changing it is not allowed. + * + * Preamble + * + * The GNU General Public License is a free, copyleft license for + * software and other kinds of works. + * + * The licenses for most software and other practical works are designed + * to take away your freedom to share and change the works. By contrast, + * the GNU General Public License is intended to guarantee your freedom to + * share and change all versions of a program--to make sure it remains free + * software for all its users. We, the Free Software Foundation, use the + * GNU General Public License for most of our software; it applies also to + * any other work released this way by its authors. You can apply it to + * your programs, too. + * + * When we speak of free software, we are referring to freedom, not + * price. Our General Public Licenses are designed to make sure that you + * have the freedom to distribute copies of free software (and charge for + * them if you wish), that you receive source code or can get it if you + * want it, that you can change the software or use pieces of it in new + * free programs, and that you know you can do these things. + * + * To protect your rights, we need to prevent others from denying you + * these rights or asking you to surrender the rights. Therefore, you have + * certain responsibilities if you distribute copies of the software, or if + * you modify it: responsibilities to respect the freedom of others. + * + * For example, if you distribute copies of such a program, whether + * gratis or for a fee, you must pass on to the recipients the same + * freedoms that you received. You must make sure that they, too, receive + * or can get the source code. And you must show them these terms so they + * know their rights. + * + * Developers that use the GNU GPL protect your rights with two steps: + * (1) assert copyright on the software, and (2) offer you this License + * giving you legal permission to copy, distribute and/or modify it. + * + * For the developers' and authors' protection, the GPL clearly explains + * that there is no warranty for this free software. For both users' and + * authors' sake, the GPL requires that modified versions be marked as + * changed, so that their problems will not be attributed erroneously to + * authors of previous versions. + * + * Some devices are designed to deny users access to install or run + * modified versions of the software inside them, although the manufacturer + * can do so. This is fundamentally incompatible with the aim of + * protecting users' freedom to change the software. The systematic + * pattern of such abuse occurs in the area of products for individuals to + * use, which is precisely where it is most unacceptable. Therefore, we + * have designed this version of the GPL to prohibit the practice for those + * products. If such problems arise substantially in other domains, we + * stand ready to extend this provision to those domains in future versions + * of the GPL, as needed to protect the freedom of users. + * + * Finally, every program is threatened constantly by software patents. + * States should not allow patents to restrict development and use of + * software on general-purpose computers, but in those that do, we wish to + * avoid the special danger that patents applied to a free program could + * make it effectively proprietary. To prevent this, the GPL assures that + * patents cannot be used to render the program non-free. + * + * The precise terms and conditions for copying, distribution and + * modification follow. + * + * TERMS AND CONDITIONS + * + * 0. Definitions. + * + * "This License" refers to version 3 of the GNU General Public License. + * + * "Copyright" also means copyright-like laws that apply to other kinds of + * works, such as semiconductor masks. + * + * "The Program" refers to any copyrightable work licensed under this + * License. Each licensee is addressed as "you". "Licensees" and + * "recipients" may be individuals or organizations. + * + * To "modify" a work means to copy from or adapt all or part of the work + * in a fashion requiring copyright permission, other than the making of an + * exact copy. The resulting work is called a "modified version" of the + * earlier work or a work "based on" the earlier work. + * + * A "covered work" means either the unmodified Program or a work based + * on the Program. + * + * To "propagate" a work means to do anything with it that, without + * permission, would make you directly or secondarily liable for + * infringement under applicable copyright law, except executing it on a + * computer or modifying a private copy. Propagation includes copying, + * distribution (with or without modification), making available to the + * public, and in some countries other activities as well. + * + * To "convey" a work means any kind of propagation that enables other + * parties to make or receive copies. Mere interaction with a user through + * a computer network, with no transfer of a copy, is not conveying. + * + * An interactive user interface displays "Appropriate Legal Notices" + * to the extent that it includes a convenient and prominently visible + * feature that (1) displays an appropriate copyright notice, and (2) + * tells the user that there is no warranty for the work (except to the + * extent that warranties are provided), that licensees may convey the + * work under this License, and how to view a copy of this License. If + * the interface presents a list of user commands or options, such as a + * menu, a prominent item in the list meets this criterion. + * + * 1. Source Code. + * + * The "source code" for a work means the preferred form of the work + * for making modifications to it. "Object code" means any non-source + * form of a work. + * + * A "Standard Interface" means an interface that either is an official + * standard defined by a recognized standards body, or, in the case of + * interfaces specified for a particular programming language, one that + * is widely used among developers working in that language. + * + * The "System Libraries" of an executable work include anything, other + * than the work as a whole, that (a) is included in the normal form of + * packaging a Major Component, but which is not part of that Major + * Component, and (b) serves only to enable use of the work with that + * Major Component, or to implement a Standard Interface for which an + * implementation is available to the public in source code form. A + * "Major Component", in this context, means a major essential component + * (kernel, window system, and so on) of the specific operating system + * (if any) on which the executable work runs, or a compiler used to + * produce the work, or an object code interpreter used to run it. + * + * The "Corresponding Source" for a work in object code form means all + * the source code needed to generate, install, and (for an executable + * work) run the object code and to modify the work, including scripts to + * control those activities. However, it does not include the work's + * System Libraries, or general-purpose tools or generally available free + * programs which are used unmodified in performing those activities but + * which are not part of the work. For example, Corresponding Source + * includes interface definition files associated with source files for + * the work, and the source code for shared libraries and dynamically + * linked subprograms that the work is specifically designed to require, + * such as by intimate data communication or control flow between those + * subprograms and other parts of the work. + * + * The Corresponding Source need not include anything that users + * can regenerate automatically from other parts of the Corresponding + * Source. + * + * The Corresponding Source for a work in source code form is that + * same work. + * + * 2. Basic Permissions. + * + * All rights granted under this License are granted for the term of + * copyright on the Program, and are irrevocable provided the stated + * conditions are met. This License explicitly affirms your unlimited + * permission to run the unmodified Program. The output from running a + * covered work is covered by this License only if the output, given its + * content, constitutes a covered work. This License acknowledges your + * rights of fair use or other equivalent, as provided by copyright law. + * + * You may make, run and propagate covered works that you do not + * convey, without conditions so long as your license otherwise remains + * in force. You may convey covered works to others for the sole purpose + * of having them make modifications exclusively for you, or provide you + * with facilities for running those works, provided that you comply with + * the terms of this License in conveying all material for which you do + * not control copyright. Those thus making or running the covered works + * for you must do so exclusively on your behalf, under your direction + * and control, on terms that prohibit them from making any copies of + * your copyrighted material outside their relationship with you. + * + * Conveying under any other circumstances is permitted solely under + * the conditions stated below. Sublicensing is not allowed; section 10 + * makes it unnecessary. + * + * 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + * + * No covered work shall be deemed part of an effective technological + * measure under any applicable law fulfilling obligations under article + * 11 of the WIPO copyright treaty adopted on 20 December 1996, or + * similar laws prohibiting or restricting circumvention of such + * measures. + * + * When you convey a covered work, you waive any legal power to forbid + * circumvention of technological measures to the extent such circumvention + * is effected by exercising rights under this License with respect to + * the covered work, and you disclaim any intention to limit operation or + * modification of the work as a means of enforcing, against the work's + * users, your or third parties' legal rights to forbid circumvention of + * technological measures. + * + * 4. Conveying Verbatim Copies. + * + * You may convey verbatim copies of the Program's source code as you + * receive it, in any medium, provided that you conspicuously and + * appropriately publish on each copy an appropriate copyright notice; + * keep intact all notices stating that this License and any + * non-permissive terms added in accord with section 7 apply to the code; + * keep intact all notices of the absence of any warranty; and give all + * recipients a copy of this License along with the Program. + * + * You may charge any price or no price for each copy that you convey, + * and you may offer support or warranty protection for a fee. + * + * 5. Conveying Modified Source Versions. + * + * You may convey a work based on the Program, or the modifications to + * produce it from the Program, in the form of source code under the + * terms of section 4, provided that you also meet all of these conditions: + * + * a) The work must carry prominent notices stating that you modified + * it, and giving a relevant date. + * + * b) The work must carry prominent notices stating that it is + * released under this License and any conditions added under section + * 7. This requirement modifies the requirement in section 4 to + * "keep intact all notices". + * + * c) You must license the entire work, as a whole, under this + * License to anyone who comes into possession of a copy. This + * License will therefore apply, along with any applicable section 7 + * additional terms, to the whole of the work, and all its parts, + * regardless of how they are packaged. This License gives no + * permission to license the work in any other way, but it does not + * invalidate such permission if you have separately received it. + * + * d) If the work has interactive user interfaces, each must display + * Appropriate Legal Notices; however, if the Program has interactive + * interfaces that do not display Appropriate Legal Notices, your + * work need not make them do so. + * + * A compilation of a covered work with other separate and independent + * works, which are not by their nature extensions of the covered work, + * and which are not combined with it such as to form a larger program, + * in or on a volume of a storage or distribution medium, is called an + * "aggregate" if the compilation and its resulting copyright are not + * used to limit the access or legal rights of the compilation's users + * beyond what the individual works permit. Inclusion of a covered work + * in an aggregate does not cause this License to apply to the other + * parts of the aggregate. + * + * 6. Conveying Non-Source Forms. + * + * You may convey a covered work in object code form under the terms + * of sections 4 and 5, provided that you also convey the + * machine-readable Corresponding Source under the terms of this License, + * in one of these ways: + * + * a) Convey the object code in, or embodied in, a physical product + * (including a physical distribution medium), accompanied by the + * Corresponding Source fixed on a durable physical medium + * customarily used for software interchange. + * + * b) Convey the object code in, or embodied in, a physical product + * (including a physical distribution medium), accompanied by a + * written offer, valid for at least three years and valid for as + * long as you offer spare parts or customer support for that product + * model, to give anyone who possesses the object code either (1) a + * copy of the Corresponding Source for all the software in the + * product that is covered by this License, on a durable physical + * medium customarily used for software interchange, for a price no + * more than your reasonable cost of physically performing this + * conveying of source, or (2) access to copy the + * Corresponding Source from a network server at no charge. + * + * c) Convey individual copies of the object code with a copy of the + * written offer to provide the Corresponding Source. This + * alternative is allowed only occasionally and noncommercially, and + * only if you received the object code with such an offer, in accord + * with subsection 6b. + * + * d) Convey the object code by offering access from a designated + * place (gratis or for a charge), and offer equivalent access to the + * Corresponding Source in the same way through the same place at no + * further charge. You need not require recipients to copy the + * Corresponding Source along with the object code. If the place to + * copy the object code is a network server, the Corresponding Source + * may be on a different server (operated by you or a third party) + * that supports equivalent copying facilities, provided you maintain + * clear directions next to the object code saying where to find the + * Corresponding Source. Regardless of what server hosts the + * Corresponding Source, you remain obligated to ensure that it is + * available for as long as needed to satisfy these requirements. + * + * e) Convey the object code using peer-to-peer transmission, provided + * you inform other peers where the object code and Corresponding + * Source of the work are being offered to the general public at no + * charge under subsection 6d. + * + * A separable portion of the object code, whose source code is excluded + * from the Corresponding Source as a System Library, need not be + * included in conveying the object code work. + * + * A "User Product" is either (1) a "consumer product", which means any + * tangible personal property which is normally used for personal, family, + * or household purposes, or (2) anything designed or sold for incorporation + * into a dwelling. In determining whether a product is a consumer product, + * doubtful cases shall be resolved in favor of coverage. For a particular + * product received by a particular user, "normally used" refers to a + * typical or common use of that class of product, regardless of the status + * of the particular user or of the way in which the particular user + * actually uses, or expects or is expected to use, the product. A product + * is a consumer product regardless of whether the product has substantial + * commercial, industrial or non-consumer uses, unless such uses represent + * the only significant mode of use of the product. + * + * "Installation Information" for a User Product means any methods, + * procedures, authorization keys, or other information required to install + * and execute modified versions of a covered work in that User Product from + * a modified version of its Corresponding Source. The information must + * suffice to ensure that the continued functioning of the modified object + * code is in no case prevented or interfered with solely because + * modification has been made. + * + * If you convey an object code work under this section in, or with, or + * specifically for use in, a User Product, and the conveying occurs as + * part of a transaction in which the right of possession and use of the + * User Product is transferred to the recipient in perpetuity or for a + * fixed term (regardless of how the transaction is characterized), the + * Corresponding Source conveyed under this section must be accompanied + * by the Installation Information. But this requirement does not apply + * if neither you nor any third party retains the ability to install + * modified object code on the User Product (for example, the work has + * been installed in ROM). + * + * The requirement to provide Installation Information does not include a + * requirement to continue to provide support service, warranty, or updates + * for a work that has been modified or installed by the recipient, or for + * the User Product in which it has been modified or installed. Access to a + * network may be denied when the modification itself materially and + * adversely affects the operation of the network or violates the rules and + * protocols for communication across the network. + * + * Corresponding Source conveyed, and Installation Information provided, + * in accord with this section must be in a format that is publicly + * documented (and with an implementation available to the public in + * source code form), and must require no special password or key for + * unpacking, reading or copying. + * + * 7. Additional Terms. + * + * "Additional permissions" are terms that supplement the terms of this + * License by making exceptions from one or more of its conditions. + * Additional permissions that are applicable to the entire Program shall + * be treated as though they were included in this License, to the extent + * that they are valid under applicable law. If additional permissions + * apply only to part of the Program, that part may be used separately + * under those permissions, but the entire Program remains governed by + * this License without regard to the additional permissions. + * + * When you convey a copy of a covered work, you may at your option + * remove any additional permissions from that copy, or from any part of + * it. (Additional permissions may be written to require their own + * removal in certain cases when you modify the work.) You may place + * additional permissions on material, added by you to a covered work, + * for which you have or can give appropriate copyright permission. + * + * Notwithstanding any other provision of this License, for material you + * add to a covered work, you may (if authorized by the copyright holders of + * that material) supplement the terms of this License with terms: + * + * a) Disclaiming warranty or limiting liability differently from the + * terms of sections 15 and 16 of this License; or + * + * b) Requiring preservation of specified reasonable legal notices or + * author attributions in that material or in the Appropriate Legal + * Notices displayed by works containing it; or + * + * c) Prohibiting misrepresentation of the origin of that material, or + * requiring that modified versions of such material be marked in + * reasonable ways as different from the original version; or + * + * d) Limiting the use for publicity purposes of names of licensors or + * authors of the material; or + * + * e) Declining to grant rights under trademark law for use of some + * trade names, trademarks, or service marks; or + * + * f) Requiring indemnification of licensors and authors of that + * material by anyone who conveys the material (or modified versions of + * it) with contractual assumptions of liability to the recipient, for + * any liability that these contractual assumptions directly impose on + * those licensors and authors. + * + * All other non-permissive additional terms are considered "further + * restrictions" within the meaning of section 10. If the Program as you + * received it, or any part of it, contains a notice stating that it is + * governed by this License along with a term that is a further + * restriction, you may remove that term. If a license document contains + * a further restriction but permits relicensing or conveying under this + * License, you may add to a covered work material governed by the terms + * of that license document, provided that the further restriction does + * not survive such relicensing or conveying. + * + * If you add terms to a covered work in accord with this section, you + * must place, in the relevant source files, a statement of the + * additional terms that apply to those files, or a notice indicating + * where to find the applicable terms. + * + * Additional terms, permissive or non-permissive, may be stated in the + * form of a separately written license, or stated as exceptions; + * the above requirements apply either way. + * + * 8. Termination. + * + * You may not propagate or modify a covered work except as expressly + * provided under this License. Any attempt otherwise to propagate or + * modify it is void, and will automatically terminate your rights under + * this License (including any patent licenses granted under the third + * paragraph of section 11). + * + * However, if you cease all violation of this License, then your + * license from a particular copyright holder is reinstated (a) + * provisionally, unless and until the copyright holder explicitly and + * finally terminates your license, and (b) permanently, if the copyright + * holder fails to notify you of the violation by some reasonable means + * prior to 60 days after the cessation. + * + * Moreover, your license from a particular copyright holder is + * reinstated permanently if the copyright holder notifies you of the + * violation by some reasonable means, this is the first time you have + * received notice of violation of this License (for any work) from that + * copyright holder, and you cure the violation prior to 30 days after + * your receipt of the notice. + * + * Termination of your rights under this section does not terminate the + * licenses of parties who have received copies or rights from you under + * this License. If your rights have been terminated and not permanently + * reinstated, you do not qualify to receive new licenses for the same + * material under section 10. + * + * 9. Acceptance Not Required for Having Copies. + * + * You are not required to accept this License in order to receive or + * run a copy of the Program. Ancillary propagation of a covered work + * occurring solely as a consequence of using peer-to-peer transmission + * to receive a copy likewise does not require acceptance. However, + * nothing other than this License grants you permission to propagate or + * modify any covered work. These actions infringe copyright if you do + * not accept this License. Therefore, by modifying or propagating a + * covered work, you indicate your acceptance of this License to do so. + * + * 10. Automatic Licensing of Downstream Recipients. + * + * Each time you convey a covered work, the recipient automatically + * receives a license from the original licensors, to run, modify and + * propagate that work, subject to this License. You are not responsible + * for enforcing compliance by third parties with this License. + * + * An "entity transaction" is a transaction transferring control of an + * organization, or substantially all assets of one, or subdividing an + * organization, or merging organizations. If propagation of a covered + * work results from an entity transaction, each party to that + * transaction who receives a copy of the work also receives whatever + * licenses to the work the party's predecessor in interest had or could + * give under the previous paragraph, plus a right to possession of the + * Corresponding Source of the work from the predecessor in interest, if + * the predecessor has it or can get it with reasonable efforts. + * + * You may not impose any further restrictions on the exercise of the + * rights granted or affirmed under this License. For example, you may + * not impose a license fee, royalty, or other charge for exercise of + * rights granted under this License, and you may not initiate litigation + * (including a cross-claim or counterclaim in a lawsuit) alleging that + * any patent claim is infringed by making, using, selling, offering for + * sale, or importing the Program or any portion of it. + * + * 11. Patents. + * + * A "contributor" is a copyright holder who authorizes use under this + * License of the Program or a work on which the Program is based. The + * work thus licensed is called the contributor's "contributor version". + * + * A contributor's "essential patent claims" are all patent claims + * owned or controlled by the contributor, whether already acquired or + * hereafter acquired, that would be infringed by some manner, permitted + * by this License, of making, using, or selling its contributor version, + * but do not include claims that would be infringed only as a + * consequence of further modification of the contributor version. For + * purposes of this definition, "control" includes the right to grant + * patent sublicenses in a manner consistent with the requirements of + * this License. + * + * Each contributor grants you a non-exclusive, worldwide, royalty-free + * patent license under the contributor's essential patent claims, to + * make, use, sell, offer for sale, import and otherwise run, modify and + * propagate the contents of its contributor version. + * + * In the following three paragraphs, a "patent license" is any express + * agreement or commitment, however denominated, not to enforce a patent + * (such as an express permission to practice a patent or covenant not to + * sue for patent infringement). To "grant" such a patent license to a + * party means to make such an agreement or commitment not to enforce a + * patent against the party. + * + * If you convey a covered work, knowingly relying on a patent license, + * and the Corresponding Source of the work is not available for anyone + * to copy, free of charge and under the terms of this License, through a + * publicly available network server or other readily accessible means, + * then you must either (1) cause the Corresponding Source to be so + * available, or (2) arrange to deprive yourself of the benefit of the + * patent license for this particular work, or (3) arrange, in a manner + * consistent with the requirements of this License, to extend the patent + * license to downstream recipients. "Knowingly relying" means you have + * actual knowledge that, but for the patent license, your conveying the + * covered work in a country, or your recipient's use of the covered work + * in a country, would infringe one or more identifiable patents in that + * country that you have reason to believe are valid. + * + * If, pursuant to or in connection with a single transaction or + * arrangement, you convey, or propagate by procuring conveyance of, a + * covered work, and grant a patent license to some of the parties + * receiving the covered work authorizing them to use, propagate, modify + * or convey a specific copy of the covered work, then the patent license + * you grant is automatically extended to all recipients of the covered + * work and works based on it. + * + * A patent license is "discriminatory" if it does not include within + * the scope of its coverage, prohibits the exercise of, or is + * conditioned on the non-exercise of one or more of the rights that are + * specifically granted under this License. You may not convey a covered + * work if you are a party to an arrangement with a third party that is + * in the business of distributing software, under which you make payment + * to the third party based on the extent of your activity of conveying + * the work, and under which the third party grants, to any of the + * parties who would receive the covered work from you, a discriminatory + * patent license (a) in connection with copies of the covered work + * conveyed by you (or copies made from those copies), or (b) primarily + * for and in connection with specific products or compilations that + * contain the covered work, unless you entered into that arrangement, + * or that patent license was granted, prior to 28 March 2007. + * + * Nothing in this License shall be construed as excluding or limiting + * any implied license or other defenses to infringement that may + * otherwise be available to you under applicable patent law. + * + * 12. No Surrender of Others' Freedom. + * + * If conditions are imposed on you (whether by court order, agreement or + * otherwise) that contradict the conditions of this License, they do not + * excuse you from the conditions of this License. If you cannot convey a + * covered work so as to satisfy simultaneously your obligations under this + * License and any other pertinent obligations, then as a consequence you may + * not convey it at all. For example, if you agree to terms that obligate you + * to collect a royalty for further conveying from those to whom you convey + * the Program, the only way you could satisfy both those terms and this + * License would be to refrain entirely from conveying the Program. + * + * 13. Use with the GNU Affero General Public License. + * + * Notwithstanding any other provision of this License, you have + * permission to link or combine any covered work with a work licensed + * under version 3 of the GNU Affero General Public License into a single + * combined work, and to convey the resulting work. The terms of this + * License will continue to apply to the part which is the covered work, + * but the special requirements of the GNU Affero General Public License, + * section 13, concerning interaction through a network will apply to the + * combination as such. + * + * 14. Revised Versions of this License. + * + * The Free Software Foundation may publish revised and/or new versions of + * the GNU General Public License from time to time. Such new versions will + * be similar in spirit to the present version, but may differ in detail to + * address new problems or concerns. + * + * Each version is given a distinguishing version number. If the + * Program specifies that a certain numbered version of the GNU General + * Public License "or any later version" applies to it, you have the + * option of following the terms and conditions either of that numbered + * version or of any later version published by the Free Software + * Foundation. If the Program does not specify a version number of the + * GNU General Public License, you may choose any version ever published + * by the Free Software Foundation. + * + * If the Program specifies that a proxy can decide which future + * versions of the GNU General Public License can be used, that proxy's + * public statement of acceptance of a version permanently authorizes you + * to choose that version for the Program. + * + * Later license versions may give you additional or different + * permissions. However, no additional obligations are imposed on any + * author or copyright holder as a result of your choosing to follow a + * later version. + * + * 15. Disclaimer of Warranty. + * + * THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY + * APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT + * HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY + * OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM + * IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF + * ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + * + * 16. Limitation of Liability. + * + * IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING + * WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS + * THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY + * GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE + * USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF + * DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD + * PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), + * EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGES. + * + * 17. Interpretation of Sections 15 and 16. + * + * If the disclaimer of warranty and limitation of liability provided + * above cannot be given local legal effect according to their terms, + * reviewing courts shall apply local law that most closely approximates + * an absolute waiver of all civil liability in connection with the + * Program, unless a warranty or assumption of liability accompanies a + * copy of the Program in return for a fee. + * + * END OF TERMS AND CONDITIONS + * + * How to Apply These Terms to Your New Programs + * + * If you develop a new program, and you want it to be of the greatest + * possible use to the public, the best way to achieve this is to make it + * free software which everyone can redistribute and change under these terms. + * + * To do so, attach the following notices to the program. It is safest + * to attach them to the start of each source file to most effectively + * state the exclusion of warranty; and each file should have at least + * the "copyright" line and a pointer to where the full notice is found. + * + * {one line to give the program's name and a brief idea of what it does.} + * Copyright (C) {year} {name of author} + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Also add information on how to contact you by electronic and paper mail. + * + * If the program does terminal interaction, make it output a short + * notice like this when it starts in an interactive mode: + * + * {project} Copyright (C) {year} {fullname} + * This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + * This is free software, and you are welcome to redistribute it + * under certain conditions; type `show c' for details. + * + * The hypothetical commands `show w' and `show c' should show the appropriate + * parts of the General Public License. Of course, your program's commands + * might be different; for a GUI interface, you would use an "about box". + * + * You should also get your employer (if you work as a programmer) or school, + * if any, to sign a "copyright disclaimer" for the program, if necessary. + * For more information on this, and how to apply and follow the GNU GPL, see + * . + * + * The GNU General Public License does not permit incorporating your program + * into proprietary programs. If your program is a subroutine library, you + * may consider it more useful to permit linking proprietary applications with + * the library. If this is what you want to do, use the GNU Lesser General + * Public License instead of this License. But first, please read + * . + */ + +#ifndef INCLUDED_SATNOGS_LEO_CHANNEL_H +#define INCLUDED_SATNOGS_LEO_CHANNEL_H + +#include +#include + +namespace gr +{ + namespace satnogs + { + + /*! + * \brief Channel model that emulates the signal of a LEO satellite. + * It adds the proper doppler shift and in the future will emulate also + * the signal fading based on the sattelite position. + * + * \ingroup satnogs + * + */ + class SATNOGS_API leo_channel : virtual public gr::sync_block + { + public: + typedef boost::shared_ptr sptr; + + /*! + * \brief Return a shared_ptr to a new instance of satnogs::leo_channel. + * + * To avoid accidental use of raw pointers, satnogs::leo_channel's + * constructor is in a private implementation + * class. satnogs::leo_channel::make is the public interface for + * creating new instances. + */ + static sptr + make (const double freq, const double samp_rate, + const double sat_altitude, + const double sat_inclination, + const size_t pass_duration_sec = 420, + const size_t freq_shifts_per_sec = 100); + }; + + } // namespace satnogs +} // namespace gr + +#endif /* INCLUDED_SATNOGS_LEO_CHANNEL_H */ + diff --git a/include/satnogs/tcp_rigctl_msg_source.h b/include/satnogs/tcp_rigctl_msg_source.h index 4aaa54f..481a164 100644 --- a/include/satnogs/tcp_rigctl_msg_source.h +++ b/include/satnogs/tcp_rigctl_msg_source.h @@ -44,13 +44,19 @@ namespace gr /** * Rigctl TCP command accepter + * * @param addr the address of the interface to listen at - * @param port the TCP port to listen for TCP connections + * @param port the TCP port to listen or connect + * @param serve_mode If set to yes this block, act as a rigctl server. + * Otherwise as a rigctl client + * @param interval_ms The interval in milliseconds at which the client + * request the frequency from the rigctl * @param mtu the maximum MTU * @return */ static sptr - make (const std::string& addr, uint16_t port, size_t mtu = 1500); + make (const std::string& addr, uint16_t port, bool server_mode, + size_t interval_ms = 1000, size_t mtu = 1500); }; } // namespace satnogs diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index f46e70e..46201a5 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -29,6 +29,7 @@ list(APPEND satnogs_debug_sources morse_debug_source_impl.cc debug_msg_source_impl.cc debug_msg_source_raw_impl.cc + leo_channel_impl.cc ) list(APPEND satnogs_sources @@ -67,7 +68,8 @@ add_library(gnuradio-satnogs SHARED ${satnogs_sources}) target_link_libraries(gnuradio-satnogs ${Boost_LIBRARIES} ${GNURADIO_ALL_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT}) + ${CMAKE_THREAD_LIBS_INIT} + ${NOVA_LIBRARIES}) set_target_properties(gnuradio-satnogs PROPERTIES DEFINE_SYMBOL "gnuradio_satnogs_EXPORTS") diff --git a/lib/leo_channel_impl.cc b/lib/leo_channel_impl.cc new file mode 100644 index 0000000..e60f8fb --- /dev/null +++ b/lib/leo_channel_impl.cc @@ -0,0 +1,79 @@ +/* -*- c++ -*- */ +/* + * gr-satnogs: SatNOGS GNU Radio Out-Of-Tree Module + * + * Copyright (C) 2016, Libre Space Foundation + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include "leo_channel_impl.h" + +namespace gr +{ + namespace satnogs + { + + leo_channel::sptr + leo_channel::make (const double freq, const double samp_rate, + const double sat_altitude, const double sat_inclination, + const size_t pass_duration_sec, + const size_t freq_shifts_per_sec) + { + return gnuradio::get_initial_sptr ( + new leo_channel_impl (freq, freq_shifts_per_sec)); + } + + /* + * The private constructor + */ + leo_channel_impl::leo_channel_impl (const double freq, + const size_t freq_shifts_per_sec) : + gr::sync_block ("leo_channel", + gr::io_signature::make (1, 1, sizeof(gr_complex)), + gr::io_signature::make (1, 1, sizeof(gr_complex))), + d_freq (freq), + d_shifts_per_sec (freq_shifts_per_sec) + { + } + + /* + * Our virtual destructor. + */ + leo_channel_impl::~leo_channel_impl () + { + } + + int + leo_channel_impl::work (int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items) + { + const gr_complex *in = (const gr_complex *) input_items[0]; + gr_complex *out = (gr_complex *) output_items[0]; + + // Do <+signal processing+> + + // Tell runtime system how many output items we produced. + return noutput_items; + } + + } /* namespace satnogs */ +} /* namespace gr */ + diff --git a/lib/leo_channel_impl.h b/lib/leo_channel_impl.h new file mode 100644 index 0000000..b19e78b --- /dev/null +++ b/lib/leo_channel_impl.h @@ -0,0 +1,52 @@ +/* -*- c++ -*- */ +/* + * gr-satnogs: SatNOGS GNU Radio Out-Of-Tree Module + * + * Copyright (C) 2016, Libre Space Foundation + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef INCLUDED_SATNOGS_LEO_CHANNEL_IMPL_H +#define INCLUDED_SATNOGS_LEO_CHANNEL_IMPL_H + +#include +#include + +namespace gr +{ + namespace satnogs + { + + class leo_channel_impl : public leo_channel + { + private: + const double d_freq; + const size_t d_shifts_per_sec; + + public: + leo_channel_impl (const double freq, const size_t freq_shifts_per_sec); + ~leo_channel_impl (); + + // Where all the action really happens + int + work (int noutput_items, gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items); + }; + + } // namespace satnogs +} // namespace gr + +#endif /* INCLUDED_SATNOGS_LEO_CHANNEL_IMPL_H */ + diff --git a/lib/tcp_rigctl_msg_source_impl.cc b/lib/tcp_rigctl_msg_source_impl.cc index 8a10b35..6368741 100644 --- a/lib/tcp_rigctl_msg_source_impl.cc +++ b/lib/tcp_rigctl_msg_source_impl.cc @@ -38,7 +38,6 @@ #include #include - namespace gr { namespace satnogs @@ -46,50 +45,163 @@ namespace gr tcp_rigctl_msg_source::sptr tcp_rigctl_msg_source::make (const std::string& addr, uint16_t port, - size_t mtu) + bool server_mode, size_t interval_ms, + size_t mtu) { return gnuradio::get_initial_sptr ( - new tcp_rigctl_msg_source_impl (addr, port, mtu)); + new tcp_rigctl_msg_source_impl (addr, port, server_mode, interval_ms, + mtu)); } /* * The private constructor */ tcp_rigctl_msg_source_impl::tcp_rigctl_msg_source_impl ( - const std::string& addr, uint16_t port, size_t mtu) : - gr::block ("tcp_rigctl_msg_source", - gr::io_signature::make (0, 0, 0), - gr::io_signature::make (0, 0, 0)), - d_iface_addr (addr), - d_port (port), - d_mtu (mtu), - d_running (true) + const std::string& addr, uint16_t port, bool server_mode, + size_t interval_ms, size_t mtu) : + gr::block ("tcp_rigctl_msg_source", + gr::io_signature::make (0, 0, 0), + gr::io_signature::make (0, 0, 0)), + d_ip_addr (addr), + d_port (port), + d_is_server (server_mode), + d_interval_ms(interval_ms), + d_mtu (mtu), + d_running (true) { message_port_register_out (pmt::mp ("freq")); - boost::shared_ptr ( - new boost::thread ( - boost::bind (&tcp_rigctl_msg_source_impl::tcp_msg_accepter, - this))); + if(d_is_server) { + boost::shared_ptr ( + new boost::thread ( + boost::bind (&tcp_rigctl_msg_source_impl::rigctl_server, this))); + } + else{ + boost::shared_ptr ( + new boost::thread ( + boost::bind (&tcp_rigctl_msg_source_impl::rigctl_client, this))); + } } static inline void - send_freq(int sock, uint64_t freq) + send_freq (int sock, uint64_t freq) { static char buf[512]; - snprintf(buf, 512, "%llu\n", freq); - send(sock, buf, strnlen(buf, 512), 0); + snprintf (buf, 512, "%llu\n", freq); + send (sock, buf, strnlen (buf, 512), 0); } static inline void - send_report_code(int sock, int code) + send_report_code (int sock, int code) { static char buf[512]; - snprintf(buf, 512, "RPRT %d\n", code); - send(sock, buf, strnlen(buf, 512), 0); + snprintf (buf, 512, "RPRT %d\n", code); + send (sock, buf, strnlen (buf, 512), 0); + } + + static inline void + request_freq_msg (int sock) + { + static const char *cmd = "f\n"; + send (sock, cmd, strnlen(cmd, 2), 0); + } + + static inline void + send_quit(int sock) + { + static const char *cmd = "q\n"; + send (sock, cmd, strnlen(cmd, 2), 0); } void - tcp_rigctl_msg_source_impl::tcp_msg_accepter () + tcp_rigctl_msg_source_impl::rigctl_client () + { + int sock; + struct sockaddr_in sin; + ssize_t ret; + uint8_t *buf; + double freq = 0.0; + int optval = 1; + struct timeval timeout; + timeout.tv_sec = 2; + timeout.tv_usec = 0; + + if ((sock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) { + perror ("opening UDP socket"); + exit (EXIT_FAILURE); + } + + memset (&sin, 0, sizeof(struct sockaddr_in)); + sin.sin_family = AF_INET; + sin.sin_port = htons (d_port); + sin.sin_addr.s_addr = INADDR_ANY; + + if (inet_aton (d_ip_addr.c_str (), &(sin.sin_addr)) == 0) { + LOG_ERROR("Wrong IP address"); + close (sock); + exit (EXIT_FAILURE); + } + + if (connect(sock, (struct sockaddr *)&sin, sizeof(struct sockaddr_in)) != 0) { + LOG_ERROR("Could not connect at rigctl server %s", d_ip_addr.c_str()); + close (sock); + exit (EXIT_FAILURE); + } + + /* + * Apply the TCP_NODELAY option at the socket for a packet based + * behavior. + */ + if (setsockopt (sock, IPPROTO_TCP, TCP_NODELAY, &optval, sizeof(int)) + < 0) { + perror ("TCP setsockopt TCP_NODELAY"); + shutdown(sock, SHUT_RDWR); + close(sock); + exit (EXIT_FAILURE); + } + + /* Set a reasonable timeout at the response from the server */ + if (setsockopt (sock, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout)) + < 0) { + perror ("TCP setsockopt SO_RCVTIMEO"); + shutdown (sock, SHUT_RDWR); + close (sock); + exit (EXIT_FAILURE); + } + + /* All good until now. Allocate buffer memory and proceed */ + buf = new uint8_t[d_mtu]; + sleep(2); + while (d_running) { + /* Request frequency from rigctl */ + request_freq_msg (sock); + ret = recv (sock, buf, d_mtu, 0); + if (ret > 0) { + freq = get_freq_from_buf (buf); + /* + * If the frequency is different than 0, then the parsed value + * is valid and an appropriate message can be generated + * + * NOTE: Comparison for equality in floats is a bit tricky. + * But here the get_freq_from_buf() will assign a 0.0 explicitly + * if something goes wrong. For this reason it is safe to compare + * the in-equality against 0.0. + */ + if (freq != 0.0 && !std::isnan(freq)) { + message_port_pub (pmt::mp ("freq"), pmt::from_double (freq)); + } + } + boost::this_thread::sleep(boost::posix_time::milliseconds(d_interval_ms)); + } + + send_quit(sock); + shutdown (sock, SHUT_RDWR); + close (sock); + delete[] buf; + exit (EXIT_SUCCESS); + } + + void + tcp_rigctl_msg_source_impl::rigctl_server () { int sock; int listen_sock; @@ -104,8 +216,8 @@ namespace gr int optval = 1; if ((listen_sock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) { - perror ("opening UDP socket"); - exit (EXIT_FAILURE); + perror ("opening UDP socket"); + exit (EXIT_FAILURE); } memset (&client_addr, 0, sizeof(struct sockaddr)); @@ -114,84 +226,88 @@ namespace gr sin.sin_port = htons (d_port); sin.sin_addr.s_addr = INADDR_ANY; - if (inet_aton (d_iface_addr.c_str (), &(sin.sin_addr)) == 0) { - LOG_ERROR("Wrong IP address"); - close (listen_sock); - exit (EXIT_FAILURE); + if (inet_aton (d_ip_addr.c_str (), &(sin.sin_addr)) == 0) { + LOG_ERROR("Wrong IP address"); + close (listen_sock); + exit (EXIT_FAILURE); } if (bind (listen_sock, (struct sockaddr *) &sin, - sizeof(struct sockaddr_in)) == -1) { - perror ("TCP bind"); - close (listen_sock); - exit (EXIT_FAILURE); + sizeof(struct sockaddr_in)) == -1) { + perror ("TCP bind"); + close (listen_sock); + exit (EXIT_FAILURE); } if (listen (listen_sock, 1000) == -1) { - perror ("TCP listen"); - close (listen_sock); - exit (EXIT_FAILURE); + perror ("TCP listen"); + close (listen_sock); + exit (EXIT_FAILURE); } /* All good until now. Allocate buffer memory and proceed */ buf = new uint8_t[d_mtu]; while (d_running) { - sock = accept (listen_sock, &client_addr, &client_addr_len); - if (sock <= 0) { - perror ("TCP accept"); - exit (EXIT_FAILURE); - } + sock = accept (listen_sock, &client_addr, &client_addr_len); + if (sock <= 0) { + perror ("TCP accept"); + exit (EXIT_FAILURE); + } - /* Apply the TCP_NODELAY option at the accepted socket */ - if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &optval, sizeof(int)) < 0){ - perror ("TCP setsockopt"); - exit (EXIT_FAILURE); - } + /* Apply the TCP_NODELAY option at the accepted socket */ + if (setsockopt (sock, IPPROTO_TCP, TCP_NODELAY, &optval, sizeof(int)) + < 0) { + perror ("TCP setsockopt"); + shutdown(sock, SHUT_RDWR); + close(sock); + exit (EXIT_FAILURE); + } - while ((ret = recv (sock, buf, d_mtu, 0)) > 0 && d_running) { - switch (buf[0]) - { - case 'F': - freq = get_freq_from_buf (buf + 2); - /* - * If the frequency is different than 0, then the parsed value - * is valid and an appropriate message can be generated - * - * NOTE: Comparison for equality in floats is a bit tricky. - * But here the get_freq_from_buf() will assign a 0.0 explicitly - * if something goes wrong. For this reason it is safe to compare - * the in-equality against 0.0. - */ - if (freq != 0.0) { - reported_freq = freq; - message_port_pub (pmt::mp ("freq"), pmt::from_double (freq)); - error_code = 0; - } - else{ - error_code = -11; - } - /* Send the report code */ - send_report_code(sock, error_code); - break; - case 'f': - send_freq(sock, reported_freq); - break; - /* Terminate the connection and exit */ - case 'q': - send_report_code(sock, 0); - d_running = false; - break; - default: - LOG_WARN("Unsupported rigctl command"); - send_report_code(sock, -11); - } - } - shutdown (sock, SHUT_RDWR); - close (sock); + while ((ret = recv (sock, buf, d_mtu, 0)) > 0 && d_running) { + switch (buf[0]) + { + case 'F': + freq = get_freq_from_buf (buf + 2); + /* + * If the frequency is different than 0, then the parsed value + * is valid and an appropriate message can be generated + * + * NOTE: Comparison for equality in floats is a bit tricky. + * But here the get_freq_from_buf() will assign a 0.0 explicitly + * if something goes wrong. For this reason it is safe to compare + * the in-equality against 0.0. + */ + if (freq != 0.0) { + reported_freq = freq; + message_port_pub (pmt::mp ("freq"), pmt::from_double (freq)); + error_code = 0; + } + else { + error_code = -11; + } + /* Send the report code */ + send_report_code (sock, error_code); + break; + case 'f': + send_freq (sock, reported_freq); + break; + /* Terminate the connection and exit */ + case 'q': + send_report_code (sock, 0); + d_running = false; + break; + default: + LOG_WARN("Unsupported rigctl command"); + send_report_code (sock, -11); + } + } + shutdown (sock, SHUT_RDWR); + close (sock); } + shutdown (listen_sock, SHUT_RDWR); close (listen_sock); - delete [] buf; + delete[] buf; exit (EXIT_SUCCESS); } @@ -210,14 +326,14 @@ namespace gr /* Check for various possible errors */ if ((errno == ERANGE && (f == LONG_MAX || f == LONG_MIN)) - || (errno != 0 && f == 0)) { - LOG_WARN("Invalid rigctl command"); - f = 0; + || (errno != 0 && f == 0)) { + LOG_WARN("Invalid rigctl command"); + f = 0; } if ((char *) buf == end) { - LOG_WARN("Invalid rigctl command"); - f = 0; + LOG_WARN("Invalid rigctl command"); + f = 0; } return (double) f; diff --git a/lib/tcp_rigctl_msg_source_impl.h b/lib/tcp_rigctl_msg_source_impl.h index 3c7b50b..63b4e45 100644 --- a/lib/tcp_rigctl_msg_source_impl.h +++ b/lib/tcp_rigctl_msg_source_impl.h @@ -31,20 +31,26 @@ namespace gr class tcp_rigctl_msg_source_impl : public tcp_rigctl_msg_source { private: - const std::string d_iface_addr; + const std::string d_ip_addr; const uint16_t d_port; + const bool d_is_server; + const size_t d_interval_ms; const size_t d_mtu; bool d_running; boost::shared_ptr d_thread; void - tcp_msg_accepter(); + rigctl_server(); + + void + rigctl_client(); double get_freq_from_buf(const uint8_t *buf); public: tcp_rigctl_msg_source_impl (const std::string& addr, uint16_t port, + bool server_mode, size_t interval_ms, size_t mtu); ~tcp_rigctl_msg_source_impl (); }; diff --git a/swig/satnogs_debug_swig.i b/swig/satnogs_debug_swig.i index bfd32f8..d68a11c 100644 --- a/swig/satnogs_debug_swig.i +++ b/swig/satnogs_debug_swig.i @@ -10,6 +10,7 @@ #include "satnogs/morse_debug_source.h" #include "satnogs/debug_msg_source.h" #include "satnogs/debug_msg_source_raw.h" +#include "satnogs/leo_channel.h" %} %include "satnogs/morse_debug_source.h" @@ -21,3 +22,6 @@ GR_SWIG_BLOCK_MAGIC2(satnogs, debug_msg_source); %include "satnogs/debug_msg_source_raw.h" GR_SWIG_BLOCK_MAGIC2(satnogs, debug_msg_source_raw); +%include "satnogs/leo_channel.h" +GR_SWIG_BLOCK_MAGIC2(satnogs, leo_channel); +