# HG changeset patch # User Zach Welch zach@mandolincreekfarm.com
Move radios into their own directory (#2351)
CHIRP now supports enough radios that the chirp/ directory has become cluttered. This creates unnecessary coupling when importing all of the radios. This patch moves all of the radios to their own directory and then chases down all of the stale import references.
There may be more work to do in order to finish this feature, but these changes do not cause any new regressions in the test suite. Further, the CLI and GUI both continue to work, so it's a good first step.
diff --git a/chirp/detect.py b/chirp/detect.py index eeefb32..7676b9f 100644 --- a/chirp/detect.py +++ b/chirp/detect.py @@ -15,8 +15,8 @@
import serial
-from chirp import errors, icf, directory, ic9x_ll -from chirp import kenwood_live, icomciv +from chirp import errors, directory +from radio import ic9x_ll, icf, kenwood_live, icomciv
def _icom_model_data_to_rclass(md): for _rtype, rclass in directory.DRV_TO_RADIO.items(): diff --git a/chirp/directory.py b/chirp/directory.py index 07308ee..ce7cf20 100644 --- a/chirp/directory.py +++ b/chirp/directory.py @@ -18,7 +18,7 @@ import os import tempfile import logging
-from chirp import icf +from radio import icf from chirp import chirp_common, util, rfinder, radioreference, errors
LOG = logging.getLogger(__name__) diff --git a/chirpc b/chirpc index 1a5ffdd..1d20548 100755 --- a/chirpc +++ b/chirpc @@ -21,9 +21,8 @@ import sys import argparse import logging
-from chirp import logger -from chirp import * -from chirp import chirp_common, errors, idrp, directory, util +from radio import * +from chirp import chirp_common, errors, directory, util, logger, version
LOG = logging.getLogger("chirpc") RADIOS = directory.DRV_TO_RADIO diff --git a/chirpui/mainapp.py b/chirpui/mainapp.py index 2d8e3e1..52e4d90 100644 --- a/chirpui/mainapp.py +++ b/chirpui/mainapp.py @@ -40,9 +40,9 @@ except ImportError,e: common.log_exception() common.show_error("\nThe Pyserial module is not installed!") from chirp import platform, generic_xml, generic_csv, directory, util -from chirp import ic9x, kenwood_live, idrp, vx7, vx5, vx6 +from radio import ic9x, kenwood_live, idrp, vx7, vx5, vx6 +from radio import icf, ic9x_icf from chirp import CHIRP_VERSION, chirp_common, detect, errors -from chirp import icf, ic9x_icf from chirpui import editorset, clone, miscwidgets, config, reporting, fips from chirpui import bandplans
diff --git a/chirpui/radiobrowser.py b/chirpui/radiobrowser.py index a11d810..724d262 100644 --- a/chirpui/radiobrowser.py +++ b/chirpui/radiobrowser.py @@ -318,7 +318,7 @@ class RadioBrowser(common.Editor): self._focused = False
if __name__ == "__main__": - from chirp import * + from radio import * from chirp import directory import sys
diff --git a/chirpw b/chirpw index 26d2369..2a44df8 100755 --- a/chirpw +++ b/chirpw @@ -120,7 +120,7 @@ else: # Python >=2.6, use normal gettext behavior lang.install()
-from chirp import * +from radio import * from chirpui import mainapp, config
parser = argparse.ArgumentParser() diff --git a/radio/__init__.py b/radio/__init__.py new file mode 100644 index 0000000..726217b --- /dev/null +++ b/radio/__init__.py @@ -0,0 +1,10 @@ +import os +import sys +from glob import glob + +module_dir = os.path.dirname(sys.modules["radio"].__file__) +__all__ = [] +for i in sorted(glob(os.path.join(module_dir, "*.py"))): + name = os.path.basename(i)[:-3] + if not name.startswith("__"): + __all__.append(name) diff --git a/chirp/alinco.py b/radio/alinco.py similarity index 100% rename from chirp/alinco.py rename to radio/alinco.py diff --git a/chirp/anytone.py b/radio/anytone.py similarity index 100% rename from chirp/anytone.py rename to radio/anytone.py diff --git a/chirp/ap510.py b/radio/ap510.py similarity index 100% rename from chirp/ap510.py rename to radio/ap510.py diff --git a/chirp/baofeng_uv3r.py b/radio/baofeng_uv3r.py similarity index 99% rename from chirp/baofeng_uv3r.py rename to radio/baofeng_uv3r.py index 0827885..c98ab37 100644 --- a/chirp/baofeng_uv3r.py +++ b/radio/baofeng_uv3r.py @@ -17,8 +17,8 @@
import time import os +from wouxun_common import do_download, do_upload from chirp import util, chirp_common, bitwise, errors, directory -from chirp.wouxun_common import do_download, do_upload from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueBoolean, RadioSettingValueList, \ RadioSettingValueInteger, RadioSettingValueString, \ diff --git a/chirp/bjuv55.py b/radio/bjuv55.py similarity index 99% rename from chirp/bjuv55.py rename to radio/bjuv55.py index 9fb7e5a..2aaa8b0 100644 --- a/chirp/bjuv55.py +++ b/radio/bjuv55.py @@ -19,6 +19,7 @@ import struct import time import os
+from radio import uv5r from chirp import chirp_common, errors, util, directory, memmap from chirp import bitwise from chirp.settings import RadioSetting, RadioSettingGroup, \ @@ -26,7 +27,6 @@ from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueBoolean, RadioSettingValueString, \ RadioSettingValueFloat, InvalidValueError, RadioSettings from textwrap import dedent -from chirp import uv5r
BJUV55_MODEL = "\x50\xBB\xDD\x55\x63\x98\x4D"
diff --git a/chirp/ft1802.py b/radio/ft1802.py similarity index 99% rename from chirp/ft1802.py rename to radio/ft1802.py index 7b5945d..4d4e570 100644 --- a/chirp/ft1802.py +++ b/radio/ft1802.py @@ -23,7 +23,8 @@ # 4. Press the [D/MR(MW)] key ("--WAIT--" will appear on the LCD). # 5. In Chirp, choose Upload to Radio.
-from chirp import chirp_common, bitwise, directory, yaesu_clone +from radio import yaesu_clone +from chirp import chirp_common, bitwise, directory from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueBoolean, RadioSettings from textwrap import dedent diff --git a/chirp/ft1d.py b/radio/ft1d.py similarity index 99% rename from chirp/ft1d.py rename to radio/ft1d.py index db0259f..33a94ec 100644 --- a/chirp/ft1d.py +++ b/radio/ft1d.py @@ -19,8 +19,8 @@ import re import string import logging
-from chirp import chirp_common, yaesu_clone, directory -from chirp import bitwise +from radio import yaesu_clone +from chirp import chirp_common, directory, bitwise from chirp.settings import RadioSettingGroup, RadioSetting, RadioSettings from chirp.settings import RadioSettingValueInteger, RadioSettingValueString from chirp.settings import RadioSettingValueList, RadioSettingValueBoolean diff --git a/chirp/ft2800.py b/radio/ft2800.py similarity index 99% rename from chirp/ft2800.py rename to radio/ft2800.py index feac0ce..d091d7b 100644 --- a/chirp/ft2800.py +++ b/radio/ft2800.py @@ -18,7 +18,7 @@ import os import logging
from chirp import util, memmap, chirp_common, bitwise, directory, errors -from chirp.yaesu_clone import YaesuCloneModeRadio +from yaesu_clone import YaesuCloneModeRadio
LOG = logging.getLogger(__name__)
diff --git a/chirp/ft50.py b/radio/ft50.py similarity index 95% rename from chirp/ft50.py rename to radio/ft50.py index d101360..ff1a660 100644 --- a/chirp/ft50.py +++ b/radio/ft50.py @@ -13,7 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, yaesu_clone, ft50_ll, directory +from radio import yaesu_clone, ft50_ll +from chirp import chirp_common, directory
# Not working, don't register #@directory.register diff --git a/chirp/ft50_ll.py b/radio/ft50_ll.py similarity index 100% rename from chirp/ft50_ll.py rename to radio/ft50_ll.py diff --git a/chirp/ft60.py b/radio/ft60.py similarity index 99% rename from chirp/ft60.py rename to radio/ft60.py index 74799ef..8abe856 100644 --- a/chirp/ft60.py +++ b/radio/ft60.py @@ -14,8 +14,8 @@ # along with this program. If not, see http://www.gnu.org/licenses/.
import time, os, logging -from chirp import chirp_common, yaesu_clone, memmap, bitwise, directory -from chirp import errors +from radio import yaesu_clone +from chirp import chirp_common, memmap, bitwise, directory, errors from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueInteger, RadioSettingValueList, \ RadioSettingValueBoolean, RadioSettingValueString, \ diff --git a/chirp/ft7800.py b/radio/ft7800.py similarity index 99% rename from chirp/ft7800.py rename to radio/ft7800.py index 824bd6d..cc64456 100644 --- a/chirp/ft7800.py +++ b/radio/ft7800.py @@ -14,8 +14,8 @@ # along with this program. If not, see http://www.gnu.org/licenses/.
import time, logging -from chirp import chirp_common, yaesu_clone, memmap, directory -from chirp import bitwise, errors +from radio import yaesu_clone +from chirp import chirp_common, memmap, directory, bitwise, errors from textwrap import dedent from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueInteger, RadioSettingValueList, \ diff --git a/chirp/ft817.py b/radio/ft817.py similarity index 99% rename from chirp/ft817.py rename to radio/ft817.py index 319bc46..55d5a28 100644 --- a/chirp/ft817.py +++ b/radio/ft817.py @@ -16,8 +16,8 @@
"""FT817 - FT817ND - FT817ND/US management module"""
-from chirp import chirp_common, yaesu_clone, util, memmap, errors, directory -from chirp import bitwise +from radio import yaesu_clone +from chirp import chirp_common, util, memmap, errors, directory, bitwise from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueInteger, RadioSettingValueList, \ RadioSettingValueBoolean, RadioSettingValueString, \ diff --git a/chirp/ft857.py b/radio/ft857.py similarity index 99% rename from chirp/ft857.py rename to radio/ft857.py index ebe8e12..f1d2431 100644 --- a/chirp/ft857.py +++ b/radio/ft857.py @@ -16,7 +16,8 @@
"""FT857 - FT857/US management module"""
-from chirp import ft817, chirp_common, errors, directory +from radio import ft817 +from chirp import chirp_common, errors, directory from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueInteger, RadioSettingValueList, \ RadioSettingValueBoolean, RadioSettingValueString, \ diff --git a/chirp/ft90.py b/radio/ft90.py similarity index 99% rename from chirp/ft90.py rename to radio/ft90.py index b638d47..6611b09 100644 --- a/chirp/ft90.py +++ b/radio/ft90.py @@ -14,7 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, bitwise, memmap, directory, errors, util, yaesu_clone +from radio import yaesu_clone +from chirp import chirp_common, bitwise, memmap, directory, errors, util from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueInteger, RadioSettingValueList, \ RadioSettingValueBoolean, RadioSettingValueString, \ diff --git a/chirp/ftm350.py b/radio/ftm350.py similarity index 99% rename from chirp/ftm350.py rename to radio/ftm350.py index e3fcbfe..b9226ef 100644 --- a/chirp/ftm350.py +++ b/radio/ftm350.py @@ -18,8 +18,8 @@ import struct import os import logging
-from chirp import chirp_common, yaesu_clone, directory, errors, util -from chirp import bitwise, memmap +from radio import yaesu_clone +from chirp import chirp_common, directory, errors, util, bitwise, memmap from chirp.settings import RadioSettingGroup, RadioSetting, RadioSettings from chirp.settings import RadioSettingValueInteger, RadioSettingValueString
diff --git a/chirp/h777.py b/radio/h777.py similarity index 100% rename from chirp/h777.py rename to radio/h777.py diff --git a/chirp/ic208.py b/radio/ic208.py similarity index 98% rename from chirp/ic208.py rename to radio/ic208.py index f93300c..4f24bc8 100644 --- a/chirp/ic208.py +++ b/radio/ic208.py @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, icf, errors, directory -from chirp import bitwise +from radio import icf +from chirp import chirp_common, errors, directory, bitwise
MEM_FORMAT = """ struct memory { diff --git a/chirp/ic2100.py b/radio/ic2100.py similarity index 98% rename from chirp/ic2100.py rename to radio/ic2100.py index 0b2dda8..a1d5f9e 100644 --- a/chirp/ic2100.py +++ b/radio/ic2100.py @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, icf, util, directory -from chirp import bitwise, memmap +from radio import icf +from chirp import chirp_common, util, directory, bitwise, memmap from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueInteger, RadioSettingValueList, \ RadioSettingValueBoolean, RadioSettingValueString, \ diff --git a/chirp/ic2200.py b/radio/ic2200.py similarity index 99% rename from chirp/ic2200.py rename to radio/ic2200.py index d6b1fe2..8d2d133 100644 --- a/chirp/ic2200.py +++ b/radio/ic2200.py @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, icf, util, directory -from chirp import bitwise +from radio import icf +from chirp import chirp_common, util, directory, bitwise
MEM_FORMAT = """ struct { diff --git a/chirp/ic2720.py b/radio/ic2720.py similarity index 98% rename from chirp/ic2720.py rename to radio/ic2720.py index 24d499a..583cced 100644 --- a/chirp/ic2720.py +++ b/radio/ic2720.py @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, icf, directory -from chirp import bitwise +from radio import icf +from chirp import chirp_common, util, directory, bitwise
MEM_FORMAT = """ struct { diff --git a/chirp/ic2820.py b/radio/ic2820.py similarity index 99% rename from chirp/ic2820.py rename to radio/ic2820.py index 5f5827c..4d7d1e0 100644 --- a/chirp/ic2820.py +++ b/radio/ic2820.py @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, icf, util, directory -from chirp import bitwise +from radio import icf +from chirp import chirp_common, util, directory, bitwise
MEM_FORMAT = """ struct { diff --git a/chirp/ic9x.py b/radio/ic9x.py similarity index 99% rename from chirp/ic9x.py rename to radio/ic9x.py index 3d8c437..a692bfc 100644 --- a/chirp/ic9x.py +++ b/radio/ic9x.py @@ -16,7 +16,8 @@ import time import threading
-from chirp import chirp_common, errors, ic9x_ll, icf, util, directory +from radio import ic9x_ll, icf +from chirp import chirp_common, errors, util, directory from chirp import bitwise
IC9XA_SPECIAL = {} diff --git a/chirp/ic9x_icf.py b/radio/ic9x_icf.py similarity index 96% rename from chirp/ic9x_icf.py rename to radio/ic9x_icf.py index 9da75b5..658eb59 100644 --- a/chirp/ic9x_icf.py +++ b/radio/ic9x_icf.py @@ -13,7 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, icf, ic9x_icf_ll, util, directory, errors +from radio import icf, ic9x_icf_ll +from chirp import chirp_common, util, directory, errors
# Don't register as this module is used to load icf file from File-Open menu # see do_open in mainapp.py diff --git a/chirp/ic9x_icf_ll.py b/radio/ic9x_icf_ll.py similarity index 100% rename from chirp/ic9x_icf_ll.py rename to radio/ic9x_icf_ll.py diff --git a/chirp/ic9x_ll.py b/radio/ic9x_ll.py similarity index 100% rename from chirp/ic9x_ll.py rename to radio/ic9x_ll.py diff --git a/chirp/icf.py b/radio/icf.py similarity index 100% rename from chirp/icf.py rename to radio/icf.py diff --git a/chirp/icomciv.py b/radio/icomciv.py similarity index 99% rename from chirp/icomciv.py rename to radio/icomciv.py index 1d02553..3babf16 100644 --- a/chirp/icomciv.py +++ b/radio/icomciv.py @@ -1,6 +1,7 @@
import struct, logging -from chirp import chirp_common, icf, util, errors, bitwise, directory +from radio import icf +from chirp import chirp_common, util, errors, bitwise, directory from chirp.memmap import MemoryMap
LOG = logging.getLogger(__name__) diff --git a/chirp/icq7.py b/radio/icq7.py similarity index 99% rename from chirp/icq7.py rename to radio/icq7.py index 23333fb..73ee492 100644 --- a/chirp/icq7.py +++ b/radio/icq7.py @@ -14,8 +14,8 @@ # along with this program. If not, see http://www.gnu.org/licenses/.
import struct -from chirp import chirp_common, icf, directory -from chirp import bitwise +from radio import icf +from chirp import chirp_common, directory, bitwise from chirp.chirp_common import to_GHz, from_GHz from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueBoolean, RadioSettingValueList, \ diff --git a/chirp/ict70.py b/radio/ict70.py similarity index 98% rename from chirp/ict70.py rename to radio/ict70.py index d035e14..ca56fb7 100644 --- a/chirp/ict70.py +++ b/radio/ict70.py @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, icf, directory -from chirp import bitwise +from radio import icf +from chirp import chirp_common, directory, bitwise
MEM_FORMAT = """ struct { diff --git a/chirp/ict7h.py b/radio/ict7h.py similarity index 98% rename from chirp/ict7h.py rename to radio/ict7h.py index 768fb34..f833ba7 100644 --- a/chirp/ict7h.py +++ b/radio/ict7h.py @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, icf, directory -from chirp import bitwise +from radio import icf +from chirp import chirp_common, directory, bitwise
mem_format = """ struct { diff --git a/chirp/ict8.py b/radio/ict8.py similarity index 97% rename from chirp/ict8.py rename to radio/ict8.py index c77d8f3..548cae2 100644 --- a/chirp/ict8.py +++ b/radio/ict8.py @@ -13,7 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, icf, util, directory +from radio import icf +from chirp import chirp_common, util, directory from chirp import bitwise
mem_format = """ diff --git a/chirp/icw32.py b/radio/icw32.py similarity index 98% rename from chirp/icw32.py rename to radio/icw32.py index 2b028ad..ad45507 100644 --- a/chirp/icw32.py +++ b/radio/icw32.py @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, icf, util, directory -from chirp import bitwise +from radio import icf +from chirp import chirp_common, util, directory, bitwise
MEM_FORMAT = """ #seekto 0x%x; diff --git a/chirp/icx8x.py b/radio/icx8x.py similarity index 98% rename from chirp/icx8x.py rename to radio/icx8x.py index b9ea35c..88175aa 100644 --- a/chirp/icx8x.py +++ b/radio/icx8x.py @@ -13,7 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, icf, icx8x_ll, errors, directory +from radio import icf, icx8x_ll +from chirp import chirp_common, errors, directory
def _isuhf(pipe): try: diff --git a/chirp/icx8x_ll.py b/radio/icx8x_ll.py similarity index 100% rename from chirp/icx8x_ll.py rename to radio/icx8x_ll.py diff --git a/chirp/id31.py b/radio/id31.py similarity index 99% rename from chirp/id31.py rename to radio/id31.py index 128d79d..66e3d31 100644 --- a/chirp/id31.py +++ b/radio/id31.py @@ -13,7 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import directory, icf, bitwise, chirp_common +from radio import icf +from chirp import directory, bitwise, chirp_common
MEM_FORMAT = """ struct { diff --git a/chirp/id51.py b/radio/id51.py similarity index 97% rename from chirp/id51.py rename to radio/id51.py index 4b72c44..980ce97 100644 --- a/chirp/id51.py +++ b/radio/id51.py @@ -13,7 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import directory, bitwise, id31 +from radio import id31 +from chirp import directory, bitwise
MEM_FORMAT = """ struct { diff --git a/chirp/id800.py b/radio/id800.py similarity index 99% rename from chirp/id800.py rename to radio/id800.py index 56350de..4976793 100644 --- a/chirp/id800.py +++ b/radio/id800.py @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, icf, errors, directory -from chirp import bitwise +from radio import icf +from chirp import chirp_common, errors, directory, bitwise
MEM_FORMAT = """ #seekto 0x0020; diff --git a/chirp/id880.py b/radio/id880.py similarity index 99% rename from chirp/id880.py rename to radio/id880.py index b6c8b39..4b5c06d 100644 --- a/chirp/id880.py +++ b/radio/id880.py @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, icf, directory -from chirp import bitwise +from radio import icf +from chirp import chirp_common, directory, bitwise
MEM_FORMAT = """ struct { diff --git a/chirp/idrp.py b/radio/idrp.py similarity index 100% rename from chirp/idrp.py rename to radio/idrp.py diff --git a/chirp/kenwood_hmk.py b/radio/kenwood_hmk.py similarity index 100% rename from chirp/kenwood_hmk.py rename to radio/kenwood_hmk.py diff --git a/chirp/kenwood_itm.py b/radio/kenwood_itm.py similarity index 100% rename from chirp/kenwood_itm.py rename to radio/kenwood_itm.py diff --git a/chirp/kenwood_live.py b/radio/kenwood_live.py similarity index 100% rename from chirp/kenwood_live.py rename to radio/kenwood_live.py diff --git a/chirp/kguv8d.py b/radio/kguv8d.py similarity index 100% rename from chirp/kguv8d.py rename to radio/kguv8d.py diff --git a/chirp/kyd.py b/radio/kyd.py similarity index 100% rename from chirp/kyd.py rename to radio/kyd.py diff --git a/chirp/leixen.py b/radio/leixen.py similarity index 100% rename from chirp/leixen.py rename to radio/leixen.py diff --git a/chirp/puxing.py b/radio/puxing.py similarity index 99% rename from chirp/puxing.py rename to radio/puxing.py index f38b41e..fcd8966 100644 --- a/chirp/puxing.py +++ b/radio/puxing.py @@ -18,7 +18,7 @@ import time import os from chirp import util, chirp_common, bitwise, errors, directory -from chirp.wouxun_common import wipe_memory, do_download, do_upload +from radio.wouxun_common import wipe_memory, do_download, do_upload
def _puxing_prep(radio): radio.pipe.write("\x02PROGRA") diff --git a/chirp/th9800.py b/radio/th9800.py similarity index 99% rename from chirp/th9800.py rename to radio/th9800.py index d1a1b0b..1f1d498 100644 --- a/chirp/th9800.py +++ b/radio/th9800.py @@ -21,7 +21,7 @@ from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueInteger, RadioSettingValueList, \ RadioSettingValueBoolean, RadioSettingValueString, \ RadioSettingValueFloat, InvalidValueError, RadioSettings -from chirp_common import format_freq +from chirp.chirp_common import format_freq import os import time import logging diff --git a/chirp/th_uv3r.py b/radio/th_uv3r.py similarity index 99% rename from chirp/th_uv3r.py rename to radio/th_uv3r.py index 3b670fe..f692545 100644 --- a/chirp/th_uv3r.py +++ b/radio/th_uv3r.py @@ -17,7 +17,7 @@
import os from chirp import chirp_common, bitwise, errors, directory -from chirp.wouxun_common import do_download, do_upload +from radio.wouxun_common import do_download, do_upload
def tyt_uv3r_prep(radio): try: diff --git a/chirp/th_uv3r25.py b/radio/th_uv3r25.py similarity index 99% rename from chirp/th_uv3r25.py rename to radio/th_uv3r25.py index e9b4cbb..f509e11 100644 --- a/chirp/th_uv3r25.py +++ b/radio/th_uv3r25.py @@ -16,7 +16,7 @@ """TYT uv3r (2.5kHz) radio management module"""
from chirp import chirp_common, bitwise, directory -from chirp.wouxun_common import do_download, do_upload +from radio.wouxun_common import do_download, do_upload
from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueInteger, RadioSettingValueList, \ diff --git a/chirp/th_uvf8d.py b/radio/th_uvf8d.py similarity index 100% rename from chirp/th_uvf8d.py rename to radio/th_uvf8d.py diff --git a/chirp/thd72.py b/radio/thd72.py similarity index 100% rename from chirp/thd72.py rename to radio/thd72.py diff --git a/chirp/thuv1f.py b/radio/thuv1f.py similarity index 100% rename from chirp/thuv1f.py rename to radio/thuv1f.py diff --git a/chirp/tk8102.py b/radio/tk8102.py similarity index 100% rename from chirp/tk8102.py rename to radio/tk8102.py diff --git a/chirp/tmv71.py b/radio/tmv71.py similarity index 98% rename from chirp/tmv71.py rename to radio/tmv71.py index 59ef226..6be6db9 100644 --- a/chirp/tmv71.py +++ b/radio/tmv71.py @@ -14,7 +14,7 @@ # along with this program. If not, see http://www.gnu.org/licenses/.
from chirp import chirp_common, errors, util -from chirp import tmv71_ll +from radio import tmv71_ll
class TMV71ARadio(chirp_common.CloneModeRadio): BAUD_RATE = 9600 diff --git a/chirp/tmv71_ll.py b/radio/tmv71_ll.py similarity index 100% rename from chirp/tmv71_ll.py rename to radio/tmv71_ll.py diff --git a/chirp/uv5r.py b/radio/uv5r.py similarity index 100% rename from chirp/uv5r.py rename to radio/uv5r.py diff --git a/chirp/uvb5.py b/radio/uvb5.py similarity index 100% rename from chirp/uvb5.py rename to radio/uvb5.py diff --git a/chirp/vx170.py b/radio/vx170.py similarity index 96% rename from chirp/vx170.py rename to radio/vx170.py index eaa7dbc..aa24531 100644 --- a/chirp/vx170.py +++ b/radio/vx170.py @@ -13,11 +13,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, yaesu_clone, directory, memmap -from chirp import bitwise, errors +from radio import yaesu_clone, ft7800 +from chirp import chirp_common, directory, memmap, bitwise, errors from textwrap import dedent import time, os -from chirp import ft7800
MEM_FORMAT = """ #seekto 0x018A; diff --git a/chirp/vx2.py b/radio/vx2.py similarity index 99% rename from chirp/vx2.py rename to radio/vx2.py index 6c6b912..3f1bd36 100644 --- a/chirp/vx2.py +++ b/radio/vx2.py @@ -14,7 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, yaesu_clone, directory, bitwise +from radio import yaesu_clone +from chirp import chirp_common, directory, bitwise from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueInteger, RadioSettingValueList, \ RadioSettingValueBoolean, RadioSettingValueString, \ diff --git a/chirp/vx3.py b/radio/vx3.py similarity index 99% rename from chirp/vx3.py rename to radio/vx3.py index 0575a46..e671287 100644 --- a/chirp/vx3.py +++ b/radio/vx3.py @@ -14,8 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, yaesu_clone, directory -from chirp import bitwise +from radio import yaesu_clone +from chirp import chirp_common, directory, bitwise from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueInteger, RadioSettingValueList, \ RadioSettingValueBoolean, RadioSettingValueString, \ diff --git a/chirp/vx5.py b/radio/vx5.py similarity index 98% rename from chirp/vx5.py rename to radio/vx5.py index 65a5ba4..cfdb4ad 100644 --- a/chirp/vx5.py +++ b/radio/vx5.py @@ -14,8 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, yaesu_clone, directory, errors -from chirp import bitwise +from radio import yaesu_clone +from chirp import chirp_common, directory, errors, bitwise
MEM_FORMAT = """ #seekto 0x002A; diff --git a/chirp/vx510.py b/radio/vx510.py similarity index 98% rename from chirp/vx510.py rename to radio/vx510.py index 7f287a9..3f8ed66 100644 --- a/chirp/vx510.py +++ b/radio/vx510.py @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, yaesu_clone, directory -from chirp import bitwise +from radio import yaesu_clone +from chirp import chirp_common, directory, bitwise
# This driver is unfinished and therefore does not register itself with Chirp. # diff --git a/chirp/vx6.py b/radio/vx6.py similarity index 99% rename from chirp/vx6.py rename to radio/vx6.py index 0cdb115..f0af37d 100644 --- a/chirp/vx6.py +++ b/radio/vx6.py @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, yaesu_clone, directory -from chirp import bitwise +from radio import yaesu_clone +from chirp import chirp_common, directory, bitwise from textwrap import dedent
# flags.{even|odd}_pskip: These are actually "preferential *scan* channels". diff --git a/chirp/vx7.py b/radio/vx7.py similarity index 99% rename from chirp/vx7.py rename to radio/vx7.py index 5fff4b1..3ebb74d 100644 --- a/chirp/vx7.py +++ b/radio/vx7.py @@ -13,8 +13,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/.
-from chirp import chirp_common, yaesu_clone, directory -from chirp import bitwise +from radio import yaesu_clone +from chirp import chirp_common, directory, bitwise from textwrap import dedent
MEM_FORMAT = """ diff --git a/chirp/vx8.py b/radio/vx8.py similarity index 99% rename from chirp/vx8.py rename to radio/vx8.py index 45fff7a..b822868 100644 --- a/chirp/vx8.py +++ b/radio/vx8.py @@ -17,8 +17,8 @@ import os import re import logging
-from chirp import chirp_common, yaesu_clone, directory -from chirp import bitwise +from radio import yaesu_clone +from chirp import chirp_common, directory, bitwise from chirp.settings import RadioSettingGroup, RadioSetting, RadioSettings from chirp.settings import RadioSettingValueInteger, RadioSettingValueString from chirp.settings import RadioSettingValueList, RadioSettingValueBoolean diff --git a/chirp/vxa700.py b/radio/vxa700.py similarity index 100% rename from chirp/vxa700.py rename to radio/vxa700.py diff --git a/chirp/wouxun.py b/radio/wouxun.py similarity index 99% rename from chirp/wouxun.py rename to radio/wouxun.py index 4a3dd0b..2a73f0a 100644 --- a/chirp/wouxun.py +++ b/radio/wouxun.py @@ -23,7 +23,7 @@ from chirp.settings import RadioSetting, RadioSettingGroup, \ RadioSettingValueBoolean, RadioSettingValueList, \ RadioSettingValueInteger, RadioSettingValueString, \ RadioSettingValueFloat, RadioSettings -from chirp.wouxun_common import wipe_memory, do_download, do_upload +from wouxun_common import wipe_memory, do_download, do_upload from textwrap import dedent
LOG = logging.getLogger(__name__) diff --git a/chirp/wouxun_common.py b/radio/wouxun_common.py similarity index 100% rename from chirp/wouxun_common.py rename to radio/wouxun_common.py diff --git a/chirp/yaesu_clone.py b/radio/yaesu_clone.py similarity index 100% rename from chirp/yaesu_clone.py rename to radio/yaesu_clone.py diff --git a/tests/run_tests b/tests/run_tests index 26a632b..f5e442e 100755 --- a/tests/run_tests +++ b/tests/run_tests @@ -23,7 +23,7 @@ from serial import Serial sys.path.insert(0, "../")
from chirp import CHIRP_VERSION -from chirp import * +from radio import * from chirp import chirp_common, directory, generic_csv, import_logic, memmap, settings from chirp import errors