]> rtime.felk.cvut.cz Git - pes-rpp/rpp-test-sw.git/commitdiff
Merge branch 'master' of git@rtime.felk.cvut.cz:rpp-test-sw into personal/vajnamar...
authorMartin Vajnar <martin.vajnar@gmail.com>
Fri, 24 Jul 2015 11:06:26 +0000 (13:06 +0200)
committerMartin Vajnar <martin.vajnar@gmail.com>
Fri, 24 Jul 2015 11:06:26 +0000 (13:06 +0200)
rpp-lib
rpp-test-sw/commands/main.c

diff --git a/rpp-lib b/rpp-lib
index 75a705814555adb883bf30ed93908f960b64dbd1..038aadd53b522e5bf269131fb6cba29c22180398 160000 (submodule)
--- a/rpp-lib
+++ b/rpp-lib
@@ -1 +1 @@
-Subproject commit 75a705814555adb883bf30ed93908f960b64dbd1
+Subproject commit 038aadd53b522e5bf269131fb6cba29c22180398
index 6f693bc4d25dc0bdd5a052f3ec24bd1452247d0f..e64b83144a8f82e693c355f83819dd5b6905364a 100644 (file)
@@ -46,9 +46,7 @@
  */\r
 void main(void)\r
 {\r
-       rpp_adc_init();\r
-       rpp_gio_init(RPP_GIO_PORT_ALL);\r
-       rpp_sci_init();\r
+       rpp_init();\r
 \r
        // Speed up the SCI\r
        rpp_sci_setup(115200);\r