Auto stash before merge of "master" and "origin/master"

achlysproject · Aug 14, 2018 · 6cae23f · 6cae23f
1 parent 762d6f4
commit 6cae23f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/config/sys.config b/config/sys.config
@@ -90,8 +90,8 @@
             % {gpio1, pmod_amp2},
             % {uart, pmod_maxsonar},
             % {spi1, pmod_gyro},
-            {spi1, pmod_nav}
-            % {spi2, pmod_als}
+            {spi1, pmod_nav},
+            {spi2, pmod_als}
         ]}
     ]}
 ].
diff --git a/src/node_generic_tasks_functions.erl b/src/node_generic_tasks_functions.erl
@@ -8,6 +8,7 @@ nav_sensor(Comp, Register) ->
   % logger:log(info, "Value = ~p ~n", pmod_nav:read(alt, [press_out])),
   logger:log(notice, "Value = ~p ~n", pmod_nav:read(Comp, [Register])).
 
+
 meteorological_statistics(SampleCount, SampleInterval, Trigger) ->
     % Must check if module is available
     {pmod_nav, Pid, _Ref} = node_util:get_nav(),