Revision 1:f8107f2b2b99, committed 2017-01-16

Comitter:

owenbrotherwood

Date:

Mon Jan 16 11:39:14 2017 +0000

Parent:

0:026bd8011ba6

Child:

2:b65d70daef8d

Commit message:

wip with errors on init enable and registerDump

Changed in this revision

--- a/main.cpp	Mon Jan 16 08:47:27 2017 +0000
+++ b/main.cpp	Mon Jan 16 11:39:14 2017 +0000
@@ -1,44 +1,19 @@
-/*
-The MIT License (MIT)
-
-Copyright (c) 2016 British Broadcasting Corporation.
-This software is provided by Lancaster University by arrangement with the BBC.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-*/
-
 #include "MicroBit.h"
 #include "MicroBitMpr121.h"
 
 MicroBit uBit;
+MicroBitMpr121 mpr121();
 
 int main()
-{
-    // Initialise the micro:bit runtime.
+{    
     uBit.init();
 
-    // Insert your code here!
+    mpr121.init();
+    mpr121.enable();
+    mpr121.registerDump();    
+
     uBit.display.scroll("HELLO WORLD! :)");
 
-    // If main exits, there may still be other fibers running or registered event handlers etc.
-    // Simply release this fiber, which will mean we enter the scheduler. Worse case, we then
-    // sit in the idle task forever, in a power efficient sleep.
     release_fiber();
 }
 

--- a/microbitmpr121.lib	Mon Jan 16 08:47:27 2017 +0000
+++ b/microbitmpr121.lib	Mon Jan 16 11:39:14 2017 +0000
@@ -1,1 +1,1 @@
-https://developer.mbed.org/users/owenbrotherwood/code/microbitmpr121/#fb4572fc4901
+https://developer.mbed.org/users/owenbrotherwood/code/microbitmpr121/#f6fed00a3ff2