Merge branch 'fix(issue-4)'

sci-bots · Nov 17, 2017 · af4b861 · af4b861
2 parents 0c07878 + dcec5c0
commit af4b861
Show file tree

Hide file tree

Showing 4 changed files with 7,691 additions and 8 deletions.
diff --git a/.conda-recipe/meta.yaml b/.conda-recipe/meta.yaml
@@ -1,15 +1,17 @@
+{% if GIT_DESCRIBE_NUMBER > '0' %}
+{% set GIT_VERSION = GIT_DESCRIBE_TAG[1:] + '.post' + GIT_DESCRIBE_NUMBER %}
+{% else %}
+{% set GIT_VERSION = GIT_DESCRIBE_TAG[1:] %}
+{% endif %}
+
 # source will be downloaded prior to filling in jinja templates
 # Example assumes that this folder has setup.py in it
 source:
   git_url: ../
 
 package:
   name: teensy-minimal-rpc
-{% if GIT_DESCRIBE_NUMBER > '0' %}
-  version: {{ GIT_DESCRIBE_TAG[1:] }}.post{{ GIT_DESCRIBE_NUMBER }}
-{% else %}
-  version: {{ GIT_DESCRIBE_TAG[1:] }}.0
-{% endif %}
+  version: {{ GIT_VERSION }}
 
 requirements:
   build:

diff --git a/teensy_minimal_rpc/adc_sampler.py b/teensy_minimal_rpc/adc_sampler.py
@@ -35,10 +35,10 @@ def get_adc_configs(F_BUS=48e6, ADC_CLK=22e6):
     '''
     package_path = ph.path(__file__).realpath().parent
 
-    # Read serialized (HDF) table of all possible ADC configurations (not all
+    # Read serialized (CSV) table of all possible ADC configurations (not all
     # valid).
-    df_adc_configs = pd.read_hdf(package_path.joinpath('static', 'data',
-                                                       'adc_configs.h5'))
+    df_adc_configs = pd.read_csv(package_path.joinpath('static', 'data',
+                                                       'adc_configs.csv'))
 
     df_adc_configs = (df_adc_configs
                       .loc[(df_adc_configs['CFG2[ADACKEN]'] == 0) &