Merge pull request #23 from telegraphic/master

Refactor of tengbe.py code

MANIFEST.in

@@ -1 +1,3 @@
 recursive-include ./ *.h
+include casperfpga/tengbe_mmap.txt
+include casperfpga/tengbe_mmap_legacy.txt

setup.py

@@ -8,7 +8,7 @@
 URL = 'https://github.com/casper-astro/casperfpga'
 EMAIL = 'apatel@ska.ac.za'
 AUTHOR = 'Paul Prozesky'
-VERSION = '0.1.2' # Need to adopt the __version__.py format
+VERSION = '0.1.3' # Need to adopt the __version__.py format
 
 
 here = os.path.abspath(os.path.dirname(__file__))
@@ -37,6 +37,8 @@
     # extra_link_args=['-static'],
 )
 
+data_files = ['tengbe_mmap.txt', 'tengbe_mmap_legacy.txt']
+
 
 setuptools.setup(
     name=NAME,
@@ -59,6 +61,7 @@
     ],
     packages=['casperfpga', 'casperfpga.progska'],
     package_dir={'casperfpga': 'src', 'casperfpga.progska': 'progska'},
+    package_data={'casperfpga': data_files},
     scripts=glob.glob('scripts/*'),
     setup_requires=['katversion'],
     use_katversion=False,

src/casperfpga.py

@@ -15,6 +15,7 @@
 import hmc
 import katadc
 import skarabadc
+import snapadc
 
 from attribute_container import AttributeContainer
 from utils import parse_fpg, get_hostname, get_kwarg, get_git_info_from_fpg
@@ -45,6 +46,7 @@
     'xps:katadc':                   {'class': katadc.KatAdc,        'container': 'adcs'},
     'xps:skarab_adc4x3g_14':        {'class': skarabadc.SkarabAdc,  'container': 'adcs'},
     'xps:skarab_adc4x3g_14_byp':    {'class': skarabadc.SkarabAdc,  'container': 'adcs'},
+    'xps:snap_adc':                 {'class': snapadc.SnapAdc,      'container': 'adcs'}
 }
 
 # other devices - blocks that aren't memory devices nor ADCs, but about which we'd
@@ -770,8 +772,8 @@ def get_system_information(self, filename=None, fpg_info=None,
         self._create_memory_devices(device_dict, memorymap_dict,
                                     legacy_reg_map=legacy_reg_map,
                                     initialise=initialise_objects)
-        self._create_casper_adc_devices(device_dict, initialise=initialise_objects)
         self._create_other_devices(device_dict, initialise=initialise_objects)
+        self._create_casper_adc_devices(device_dict, initialise=initialise_objects)
         self.transport.memory_devices = self.memory_devices
         self.transport.post_get_system_information()