From 57bfc0a6f1dcb6379ba090c6b1f8c80e560fbfa1 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Tue, 5 Jul 2016 12:43:33 +0200
Subject: [PATCH 01/56] load dependencies from calliope-mini

---
 module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.json b/module.json
index 49c0876..1c244f7 100644
--- a/module.json
+++ b/module.json
@@ -4,7 +4,7 @@
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "lancaster-university/microbit-dal"
+    "microbit-dal": "calliope-mini/microbit-dal"
   },
   "extraIncludes": [
     "inc"

From 68e821e45e1ed1345bb1286def0ae19a71d96fd3 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Tue, 5 Jul 2016 12:57:26 +0200
Subject: [PATCH 02/56] use correct branch

---
 module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.json b/module.json
index 1c244f7..69fbc3a 100644
--- a/module.json
+++ b/module.json
@@ -4,7 +4,7 @@
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal"
+    "microbit-dal": "calliope-mini/microbit-dal/tree/calliope"
   },
   "extraIncludes": [
     "inc"

From 8eff2518e1648a3df9aa390f694eb41efab7fde3 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Tue, 5 Jul 2016 13:00:53 +0200
Subject: [PATCH 03/56] correct branch setting in module.json

---
 module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.json b/module.json
index 69fbc3a..b6bfbef 100644
--- a/module.json
+++ b/module.json
@@ -4,7 +4,7 @@
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal/tree/calliope"
+    "microbit-dal": "calliope-mini/microbit-dal#calliope"
   },
   "extraIncludes": [
     "inc"

From 021e027e65569acc6fd4f0c0f337b6e587e385af Mon Sep 17 00:00:00 2001
From: Joerg Wedeck <joerg@wedeck.de>
Date: Mon, 8 Aug 2016 22:05:04 +0200
Subject: [PATCH 04/56] an bmx055 angepasst

---
 inc/MicroBit.h      | 2 +-
 source/MicroBit.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/inc/MicroBit.h b/inc/MicroBit.h
index c69e74f..7061758 100644
--- a/inc/MicroBit.h
+++ b/inc/MicroBit.h
@@ -49,7 +49,7 @@ DEALINGS IN THE SOFTWARE.
 #include "MicroBitPin.h"
 #include "MicroBitCompass.h"
 #include "MicroBitCompassCalibrator.h"
-#include "MicroBitAccelerometer.h"
+#include "MicroBitAccelerometer-bmx.h"
 #include "MicroBitThermometer.h"
 #include "MicroBitLightSensor.h"
 #include "MicroBitMultiButton.h"
diff --git a/source/MicroBit.cpp b/source/MicroBit.cpp
index 45fece1..0af7893 100644
--- a/source/MicroBit.cpp
+++ b/source/MicroBit.cpp
@@ -62,7 +62,7 @@ MicroBit::MicroBit() :
     serial(USBTX, USBRX),
 	resetButton(MICROBIT_PIN_BUTTON_RESET),
     storage(),
-    i2c(I2C_SDA0, I2C_SCL0),
+    i2c(p20, p19),
     messageBus(),
     display(),
     buttonA(MICROBIT_PIN_BUTTON_A, MICROBIT_ID_BUTTON_A),
@@ -79,8 +79,8 @@ MicroBit::MicroBit() :
        MICROBIT_ID_IO_P12,MICROBIT_ID_IO_P13,MICROBIT_ID_IO_P14,
        MICROBIT_ID_IO_P15,MICROBIT_ID_IO_P16,MICROBIT_ID_IO_P19,
        MICROBIT_ID_IO_P20),
-    bleManager(storage),
-    radio(),
+   bleManager(storage),
+  radio(),
     ble(NULL)
 {
     // Clear our status

From 7612d38130f18a967bb4a7aedb0485e848562c4f Mon Sep 17 00:00:00 2001
From: gfsommer <sommer@delta-systems.de>
Date: Fri, 26 Aug 2016 18:03:58 +0200
Subject: [PATCH 05/56] Update MicroBit.h

---
 inc/MicroBit.h | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/inc/MicroBit.h b/inc/MicroBit.h
index 7061758..0bfcf72 100644
--- a/inc/MicroBit.h
+++ b/inc/MicroBit.h
@@ -4,6 +4,10 @@ The MIT License (MIT)
 Copyright (c) 2016 British Broadcasting Corporation.
 This software is provided by Lancaster University by arrangement with the BBC.
 
+Modifications Copyright (c) 2016 Calliope GbR
+Modifications are provided by DELTA Systems (Georg Sommer) - Thomas Kern 
+und Björn Eberhardt GbR by arrangement with Calliope GbR. 
+
 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
@@ -49,7 +53,7 @@ DEALINGS IN THE SOFTWARE.
 #include "MicroBitPin.h"
 #include "MicroBitCompass.h"
 #include "MicroBitCompassCalibrator.h"
-#include "MicroBitAccelerometer-bmx.h"
+#include "MicroBitAccelerometer.h"
 #include "MicroBitThermometer.h"
 #include "MicroBitLightSensor.h"
 #include "MicroBitMultiButton.h"
@@ -66,6 +70,9 @@ DEALINGS IN THE SOFTWARE.
 #include "MicroBitRadio.h"
 #include "MicroBitStorage.h"
 
+#include "CalliopeRGB.h"
+#include "CalliopeSoundMotor.h"
+
 // MicroBit::flags values
 #define MICROBIT_INITIALIZED                    0x01
 
@@ -91,19 +98,19 @@ class MicroBit
     uint8_t                     status;
 
     public:
-
+	
     // Serial Interface
     MicroBitSerial              serial;
 
 	// Reset Button
 	InterruptIn     		    resetButton;
-
+	
     // Persistent key value store
     MicroBitStorage             storage;
-
+	
     // I2C Interface
-    MicroBitI2C                 i2c;
-
+    //MicroBitI2C                 i2c;
+	
     // Device level Message Bus abstraction
     MicroBitMessageBus          messageBus;
 
@@ -112,19 +119,23 @@ class MicroBit
     MicroBitButton              buttonA;
     MicroBitButton              buttonB;
     MicroBitMultiButton         buttonAB;
-    MicroBitAccelerometer       accelerometer;
-    MicroBitCompass             compass;
-    MicroBitCompassCalibrator   compassCalibrator;
+    //MicroBitAccelerometer       accelerometer;
+    //MicroBitCompass             compass;
+    //MicroBitCompassCalibrator   compassCalibrator;
     MicroBitThermometer         thermometer;
-
+    
     //An object of available IO pins on the device
     MicroBitIO                  io;
-
+	
     // Bluetooth related member variables.
 	MicroBitBLEManager		    bleManager;
     MicroBitRadio               radio;
     BLEDevice                   *ble;
-
+	
+	//Calliope MINI specific devices
+	CalliopeRGB 				rgb;
+	CalliopeSoundMotor 			soundmotor;
+	
     /**
       * Constructor.
       *
@@ -185,7 +196,7 @@ class MicroBit
       * Delay execution for the given amount of time.
       *
       * If the scheduler is running, this will deschedule the current fiber and perform
-      * a power efficient, concurrent sleep operation.
+      * a power efficent, concurrent sleep operation.
       *
       * If the scheduler is disabled or we're running in an interrupt context, this
       * will revert to a busy wait.
@@ -235,7 +246,7 @@ class MicroBit
       * than the hardware random number generator built int the processor, which takes
       * a long time and uses a lot of energy.
       *
-      * KIDS: You shouldn't use this is the real world to generate cryptographic keys though...
+      * KIDS: You shouldn't use this is the real world to generte cryptographic keys though...
       * have a think why not. :-)
       *
       * @param max the upper range to generate a number for. This number cannot be negative.
@@ -425,7 +436,6 @@ inline void MicroBit::reset()
         // Wait a little while for the connection to drop.
         wait_ms(100);
     }
-
     microbit_reset();
 }
 
@@ -433,7 +443,7 @@ inline void MicroBit::reset()
   * Delay execution for the given amount of time.
   *
   * If the scheduler is running, this will deschedule the current fiber and perform
-  * a power efficient, concurrent sleep operation.
+  * a power efficent, concurrent sleep operation.
   *
   * If the scheduler is disabled or we're running in an interrupt context, this
   * will revert to a busy wait.
@@ -465,7 +475,7 @@ inline void MicroBit::sleep(uint32_t milliseconds)
   * than the hardware random number generator built int the processor, which takes
   * a long time and uses a lot of energy.
   *
-  * KIDS: You shouldn't use this is the real world to generate cryptographic keys though...
+  * KIDS: You shouldn't use this is the real world to generte cryptographic keys though...
   * have a think why not. :-)
   *
   * @param max the upper range to generate a number for. This number cannot be negative.

From eb4ff49d749c54a6664e010fa7e2a7218e5d6309 Mon Sep 17 00:00:00 2001
From: gfsommer <sommer@delta-systems.de>
Date: Fri, 26 Aug 2016 18:04:30 +0200
Subject: [PATCH 06/56] Update MicroBit.cpp

---
 source/MicroBit.cpp | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/source/MicroBit.cpp b/source/MicroBit.cpp
index 0af7893..57332f4 100644
--- a/source/MicroBit.cpp
+++ b/source/MicroBit.cpp
@@ -4,6 +4,10 @@ The MIT License (MIT)
 Copyright (c) 2016 British Broadcasting Corporation.
 This software is provided by Lancaster University by arrangement with the BBC.
 
+Modifications Copyright (c) 2016 Calliope GbR
+Modifications are provided by DELTA Systems (Georg Sommer) - Thomas Kern
+und Björn Eberhardt GbR by arrangement with Calliope GbR. 
+
 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
@@ -59,29 +63,32 @@ RawSerial* SERIAL_DEBUG = NULL;
   * that represent various device drivers used to control aspects of the micro:bit.
   */
 MicroBit::MicroBit() :
+    
     serial(USBTX, USBRX),
 	resetButton(MICROBIT_PIN_BUTTON_RESET),
     storage(),
-    i2c(p20, p19),
+    //i2c(I2C_SDA0, I2C_SCL0),
     messageBus(),
     display(),
     buttonA(MICROBIT_PIN_BUTTON_A, MICROBIT_ID_BUTTON_A),
     buttonB(MICROBIT_PIN_BUTTON_B, MICROBIT_ID_BUTTON_B),
     buttonAB(MICROBIT_ID_BUTTON_A,MICROBIT_ID_BUTTON_B, MICROBIT_ID_BUTTON_AB),
-    accelerometer(i2c),
-    compass(i2c, accelerometer, storage),
-    compassCalibrator(compass, accelerometer, display),
+    //accelerometer(i2c),
+    //compass(i2c, accelerometer, storage),
+    //compassCalibrator(compass, accelerometer, display),
     thermometer(storage),
     io(MICROBIT_ID_IO_P0,MICROBIT_ID_IO_P1,MICROBIT_ID_IO_P2,
        MICROBIT_ID_IO_P3,MICROBIT_ID_IO_P4,MICROBIT_ID_IO_P5,
-       MICROBIT_ID_IO_P6,MICROBIT_ID_IO_P7,MICROBIT_ID_IO_P8,
-       MICROBIT_ID_IO_P9,MICROBIT_ID_IO_P10,MICROBIT_ID_IO_P11,
-       MICROBIT_ID_IO_P12,MICROBIT_ID_IO_P13,MICROBIT_ID_IO_P14,
-       MICROBIT_ID_IO_P15,MICROBIT_ID_IO_P16,MICROBIT_ID_IO_P19,
-       MICROBIT_ID_IO_P20),
-   bleManager(storage),
-  radio(),
-    ble(NULL)
+       MICROBIT_ID_IO_P6,MICROBIT_ID_IO_P7,MICROBIT_ID_IO_P9,
+       MICROBIT_ID_IO_P10,MICROBIT_ID_IO_P11,MICROBIT_ID_IO_P19,
+       MICROBIT_ID_IO_P20,CALLIOPE_ID_IO_P0,CALLIOPE_ID_IO_P7,
+       CALLIOPE_ID_IO_P8,CALLIOPE_ID_IO_P9,CALLIOPE_ID_IO_P13,
+       CALLIOPE_ID_IO_P14,CALLIOPE_ID_IO_P15),
+    bleManager(storage),
+    radio(),
+    ble(NULL),
+    rgb(),
+    soundmotor()
 {
     // Clear our status
     status = 0;
@@ -203,21 +210,20 @@ void MicroBit::onListenerRegisteredEvent(MicroBitEvent evt)
             // A listener has been registered for the compass.
             // The compass uses lazy instantiation, we just need to read the data once to start it running.
             // Touch the compass through the heading() function to ensure it is calibrated. if it isn't this will launch any associated calibration algorithms.
-            compass.heading();
-
+            //compass.heading();
             break;
 
         case MICROBIT_ID_ACCELEROMETER:
         case MICROBIT_ID_GESTURE:
             // A listener has been registered for the accelerometer.
             // The accelerometer uses lazy instantiation, we just need to read the data once to start it running.
-            accelerometer.updateSample();
+            //accelerometer.updateSample();
             break;
 
         case MICROBIT_ID_THERMOMETER:
             // A listener has been registered for the thermometer.
             // The thermometer uses lazy instantiation, we just need to read the data once to start it running.
-            thermometer.updateSample();
+            //thermometer.updateSample();
             break;
     }
 }

From 5f4547f0193c647c5251b186b21e3a41c091d9b6 Mon Sep 17 00:00:00 2001
From: Joerg Wedeck <joerg@wedeck.de>
Date: Thu, 15 Sep 2016 22:37:20 +0200
Subject: [PATCH 07/56] change dependency to use calliope microbit-dal

---
 module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.json b/module.json
index b6bfbef..b981314 100644
--- a/module.json
+++ b/module.json
@@ -4,7 +4,7 @@
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#calliope"
+    "microbit-dal": "calliope-mini/microbit-dal#joerg-merge1"
   },
   "extraIncludes": [
     "inc"

From e6214ce84f79cd0b3d5b105e46849c5fdf2eb04f Mon Sep 17 00:00:00 2001
From: Joerg Wedeck <joerg@wedeck.de>
Date: Sun, 18 Sep 2016 09:09:37 +0200
Subject: [PATCH 08/56] change dependencies to calliope branch

---
 module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.json b/module.json
index b981314..b6bfbef 100644
--- a/module.json
+++ b/module.json
@@ -4,7 +4,7 @@
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#joerg-merge1"
+    "microbit-dal": "calliope-mini/microbit-dal#calliope"
   },
   "extraIncludes": [
     "inc"

From f7a8d3cdfc935c4fac6b6517d7ccb7d1928fded7 Mon Sep 17 00:00:00 2001
From: Joerg Wedeck <joerg@wedeck.de>
Date: Sun, 18 Sep 2016 09:57:20 +0200
Subject: [PATCH 09/56] uncommented acceleraore, compass and i2c

---
 inc/MicroBit.h      | 8 ++++----
 source/MicroBit.cpp | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/inc/MicroBit.h b/inc/MicroBit.h
index 0bfcf72..517ba39 100644
--- a/inc/MicroBit.h
+++ b/inc/MicroBit.h
@@ -109,7 +109,7 @@ class MicroBit
     MicroBitStorage             storage;
 	
     // I2C Interface
-    //MicroBitI2C                 i2c;
+    MicroBitI2C                 i2c;
 	
     // Device level Message Bus abstraction
     MicroBitMessageBus          messageBus;
@@ -119,9 +119,9 @@ class MicroBit
     MicroBitButton              buttonA;
     MicroBitButton              buttonB;
     MicroBitMultiButton         buttonAB;
-    //MicroBitAccelerometer       accelerometer;
-    //MicroBitCompass             compass;
-    //MicroBitCompassCalibrator   compassCalibrator;
+    MicroBitAccelerometer       accelerometer;
+    MicroBitCompass             compass;
+    MicroBitCompassCalibrator   compassCalibrator;
     MicroBitThermometer         thermometer;
     
     //An object of available IO pins on the device
diff --git a/source/MicroBit.cpp b/source/MicroBit.cpp
index 57332f4..7614461 100644
--- a/source/MicroBit.cpp
+++ b/source/MicroBit.cpp
@@ -67,15 +67,16 @@ MicroBit::MicroBit() :
     serial(USBTX, USBRX),
 	resetButton(MICROBIT_PIN_BUTTON_RESET),
     storage(),
+    i2c(p20, p19),
     //i2c(I2C_SDA0, I2C_SCL0),
     messageBus(),
     display(),
     buttonA(MICROBIT_PIN_BUTTON_A, MICROBIT_ID_BUTTON_A),
     buttonB(MICROBIT_PIN_BUTTON_B, MICROBIT_ID_BUTTON_B),
     buttonAB(MICROBIT_ID_BUTTON_A,MICROBIT_ID_BUTTON_B, MICROBIT_ID_BUTTON_AB),
-    //accelerometer(i2c),
-    //compass(i2c, accelerometer, storage),
-    //compassCalibrator(compass, accelerometer, display),
+    accelerometer(i2c),
+    compass(i2c, accelerometer, storage),
+    compassCalibrator(compass, accelerometer, display),
     thermometer(storage),
     io(MICROBIT_ID_IO_P0,MICROBIT_ID_IO_P1,MICROBIT_ID_IO_P2,
        MICROBIT_ID_IO_P3,MICROBIT_ID_IO_P4,MICROBIT_ID_IO_P5,

From bf2c2c8b62485bb75a85514c50779f02c6a080ab Mon Sep 17 00:00:00 2001
From: Joerg Wedeck <joerg@wedeck.de>
Date: Sun, 18 Sep 2016 10:35:12 +0200
Subject: [PATCH 10/56] changed dependencies

---
 module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.json b/module.json
index b6bfbef..55b7ecd 100644
--- a/module.json
+++ b/module.json
@@ -4,7 +4,7 @@
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#calliope"
+    "microbit-dal": "calliope-mini/microbit-dal#integrated-20160918"
   },
   "extraIncludes": [
     "inc"

From 3a036f7502b1392c001b7d58067cf645af8675ad Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Thu, 22 Sep 2016 12:54:18 +0200
Subject: [PATCH 11/56] enable accel, i2c

---
 source/MicroBit.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/source/MicroBit.cpp b/source/MicroBit.cpp
index 7614461..6c8635e 100644
--- a/source/MicroBit.cpp
+++ b/source/MicroBit.cpp
@@ -211,20 +211,21 @@ void MicroBit::onListenerRegisteredEvent(MicroBitEvent evt)
             // A listener has been registered for the compass.
             // The compass uses lazy instantiation, we just need to read the data once to start it running.
             // Touch the compass through the heading() function to ensure it is calibrated. if it isn't this will launch any associated calibration algorithms.
-            //compass.heading();
+            compass.heading();
+
             break;
 
         case MICROBIT_ID_ACCELEROMETER:
         case MICROBIT_ID_GESTURE:
             // A listener has been registered for the accelerometer.
             // The accelerometer uses lazy instantiation, we just need to read the data once to start it running.
-            //accelerometer.updateSample();
+            accelerometer.updateSample();
             break;
 
         case MICROBIT_ID_THERMOMETER:
             // A listener has been registered for the thermometer.
             // The thermometer uses lazy instantiation, we just need to read the data once to start it running.
-            //thermometer.updateSample();
+            thermometer.updateSample();
             break;
     }
 }

From 281bd86a47f1017f0b4afd617b39e98e4006deb7 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Thu, 22 Sep 2016 17:29:36 +0200
Subject: [PATCH 12/56] use calliope branch

---
 module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.json b/module.json
index 55b7ecd..b6bfbef 100644
--- a/module.json
+++ b/module.json
@@ -4,7 +4,7 @@
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#integrated-20160918"
+    "microbit-dal": "calliope-mini/microbit-dal#calliope"
   },
   "extraIncludes": [
     "inc"

From 4733bb8e033031cf868b63e3ed8fb0a7254b878d Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Wed, 28 Sep 2016 19:27:29 +0200
Subject: [PATCH 13/56] add tagged pre-release for dal

---
 module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.json b/module.json
index b6bfbef..e542c00 100644
--- a/module.json
+++ b/module.json
@@ -4,7 +4,7 @@
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#calliope"
+    "microbit-dal": "calliope-mini/microbit-dal#20160928-calliope-0.2"
   },
   "extraIncludes": [
     "inc"

From 09d00571f7f0b7e950e5d02c906949d3701f703d Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Wed, 28 Sep 2016 20:16:01 +0200
Subject: [PATCH 14/56] fix tag

---
 module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.json b/module.json
index e542c00..25c1d18 100644
--- a/module.json
+++ b/module.json
@@ -4,7 +4,7 @@
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#20160928-calliope-0.2"
+    "microbit-dal": "calliope-mini/microbit-dal#v0.2.0-calliope"
   },
   "extraIncludes": [
     "inc"

From 3472ab6cd616df6392fb67fa2fc7ef15200777f3 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Fri, 7 Oct 2016 14:17:53 +0200
Subject: [PATCH 15/56] add IDEA files to ignore list

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 1fc6e85..04cbac4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 build
 yotta_modules
 yotta_targets/*
+.idea
+*.iml

From 5931f5ae45d9dcae48d4283a08e68c3678d6f141 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Fri, 7 Oct 2016 14:18:10 +0200
Subject: [PATCH 16/56] use v0.2.1-calliope

---
 module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.json b/module.json
index 25c1d18..bab7e33 100644
--- a/module.json
+++ b/module.json
@@ -4,7 +4,7 @@
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v0.2.0-calliope"
+    "microbit-dal": "calliope-mini/microbit-dal#v0.2.1-calliope"
   },
   "extraIncludes": [
     "inc"

From 76e4af5a3cdf6dd49561c2054caa96806ae6564d Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Sat, 8 Oct 2016 15:15:01 +0200
Subject: [PATCH 17/56] fix initialization of Accelerometer (delayed in
 uBit.init()), enable DAL debugging

---
 source/MicroBit.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/MicroBit.cpp b/source/MicroBit.cpp
index 6c8635e..cbebd33 100644
--- a/source/MicroBit.cpp
+++ b/source/MicroBit.cpp
@@ -119,6 +119,9 @@ void MicroBit::init()
     if (status & MICROBIT_INITIALIZED)
         return;
 
+    // configure the accelerometer
+    accelerometer.configure();
+
 #if CONFIG_ENABLED(MICROBIT_HEAP_ALLOCATOR)
     // Bring up a nested heap allocator.
     microbit_create_nested_heap(MICROBIT_NESTED_HEAP_SIZE);

From ebbfc138f4c8dda7fc428cb315f039489f5154ea Mon Sep 17 00:00:00 2001
From: thinkberg <leo@thinkberg.com>
Date: Tue, 11 Oct 2016 13:17:32 +0200
Subject: [PATCH 18/56] fix accelerometer x/y bug, use correct header file

---
 inc/MicroBit.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/MicroBit.h b/inc/MicroBit.h
index 517ba39..de2e34c 100644
--- a/inc/MicroBit.h
+++ b/inc/MicroBit.h
@@ -53,7 +53,7 @@ DEALINGS IN THE SOFTWARE.
 #include "MicroBitPin.h"
 #include "MicroBitCompass.h"
 #include "MicroBitCompassCalibrator.h"
-#include "MicroBitAccelerometer.h"
+#include "MicroBitAccelerometer-bmx.h"
 #include "MicroBitThermometer.h"
 #include "MicroBitLightSensor.h"
 #include "MicroBitMultiButton.h"

From 9c35819a10b694c72e09f3a0eb2c3717321e1ef5 Mon Sep 17 00:00:00 2001
From: thinkberg <leo@thinkberg.com>
Date: Tue, 11 Oct 2016 13:28:17 +0200
Subject: [PATCH 19/56] change dependency

---
 module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.json b/module.json
index bab7e33..791bb9b 100644
--- a/module.json
+++ b/module.json
@@ -4,7 +4,7 @@
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v0.2.1-calliope"
+    "microbit-dal": "calliope-mini/microbit-dal#v0.2.2-calliope"
   },
   "extraIncludes": [
     "inc"

From edc0f3461d7e53ac2c0dadcf85799b49175b8248 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Wed, 12 Oct 2016 17:57:52 +0200
Subject: [PATCH 20/56] bump version

---
 module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.json b/module.json
index 791bb9b..c55832f 100644
--- a/module.json
+++ b/module.json
@@ -4,7 +4,7 @@
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v0.2.2-calliope"
+    "microbit-dal": "calliope-mini/microbit-dal#v0.2.3-calliope"
   },
   "extraIncludes": [
     "inc"

From b78d2d170eaf1c8ad27347226ec232b656650aa8 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Wed, 12 Oct 2016 18:53:09 +0200
Subject: [PATCH 21/56] bump version

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index c55832f..7d0a5f6 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "2.0.0-rc4",
+  "version": "0.2.4-calliope",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v0.2.3-calliope"
+    "microbit-dal": "calliope-mini/microbit-dal#v0.2.4-calliope"
   },
   "extraIncludes": [
     "inc"

From 7f369ce6b9c3d093be9bf44132f0f5f4fcd02ce7 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Thu, 13 Oct 2016 16:24:29 +0200
Subject: [PATCH 22/56] version bump

---
 module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.json b/module.json
index 7d0a5f6..b959ad2 100644
--- a/module.json
+++ b/module.json
@@ -1,6 +1,6 @@
 {
   "name": "microbit",
-  "version": "0.2.4-calliope",
+  "version": "0.2.5-calliope",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {

From 3c0ce7ffa2c56cbec65a1bb62e28bd17b3ca0c05 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Thu, 13 Oct 2016 16:53:31 +0200
Subject: [PATCH 23/56] fix dependency

---
 module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.json b/module.json
index b959ad2..7e737c4 100644
--- a/module.json
+++ b/module.json
@@ -4,7 +4,7 @@
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v0.2.4-calliope"
+    "microbit-dal": "calliope-mini/microbit-dal#v0.2.5-calliope"
   },
   "extraIncludes": [
     "inc"

From dd859130ebe75beb18658e5cd4ecbcf31bb93c80 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Thu, 13 Oct 2016 16:56:55 +0200
Subject: [PATCH 24/56] bump version

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index 7e737c4..dbffdc3 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "0.2.5-calliope",
+  "version": "0.2.6-calliope",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v0.2.5-calliope"
+    "microbit-dal": "calliope-mini/microbit-dal#v0.2.6-calliope"
   },
   "extraIncludes": [
     "inc"

From 346f38a48495e9796bf6d7ad72d1ee3b50a9a050 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Tue, 18 Oct 2016 16:54:35 +0200
Subject: [PATCH 25/56] dependency update

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index dbffdc3..fde696c 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "0.2.6-calliope",
+  "version": "0.2.7-calliope",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v0.2.6-calliope"
+    "microbit-dal": "calliope-mini/microbit-dal#v0.2.7-calliope"
   },
   "extraIncludes": [
     "inc"

From a545916cc61e1ca623adad95d08d79ea5be77f22 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Wed, 19 Oct 2016 18:03:49 +0200
Subject: [PATCH 26/56] fixed touch pins

---
 module.json         | 4 ++--
 source/MicroBit.cpp | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/module.json b/module.json
index fde696c..8354af7 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "0.2.7-calliope",
+  "version": "0.2.9-calliope",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v0.2.7-calliope"
+    "microbit-dal": "calliope-mini/microbit-dal#v0.2.9-calliope"
   },
   "extraIncludes": [
     "inc"
diff --git a/source/MicroBit.cpp b/source/MicroBit.cpp
index cbebd33..eac3af5 100644
--- a/source/MicroBit.cpp
+++ b/source/MicroBit.cpp
@@ -67,7 +67,7 @@ MicroBit::MicroBit() :
     serial(USBTX, USBRX),
 	resetButton(MICROBIT_PIN_BUTTON_RESET),
     storage(),
-    i2c(p20, p19),
+    i2c(I2C_SDA0, I2C_SCL0),
     //i2c(I2C_SDA0, I2C_SCL0),
     messageBus(),
     display(),
@@ -82,9 +82,10 @@ MicroBit::MicroBit() :
        MICROBIT_ID_IO_P3,MICROBIT_ID_IO_P4,MICROBIT_ID_IO_P5,
        MICROBIT_ID_IO_P6,MICROBIT_ID_IO_P7,MICROBIT_ID_IO_P9,
        MICROBIT_ID_IO_P10,MICROBIT_ID_IO_P11,MICROBIT_ID_IO_P19,
-       MICROBIT_ID_IO_P20,CALLIOPE_ID_IO_P0,CALLIOPE_ID_IO_P7,
-       CALLIOPE_ID_IO_P8,CALLIOPE_ID_IO_P9,CALLIOPE_ID_IO_P13,
-       CALLIOPE_ID_IO_P14,CALLIOPE_ID_IO_P15),
+       MICROBIT_ID_IO_P20,
+       CALLIOPE_ID_IO_P3, CALLIOPE_ID_IO_P7, CALLIOPE_ID_IO_P8,
+       CALLIOPE_ID_IO_P9, CALLIOPE_ID_IO_P13, CALLIOPE_ID_IO_P14,
+       CALLIOPE_ID_IO_P15, CALLIOPE_ID_IO_P22),
     bleManager(storage),
     radio(),
     ble(NULL),

From 58da1fca9caa6cd9f210e6804b3019fd501efd68 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Sun, 30 Oct 2016 17:25:08 +0100
Subject: [PATCH 27/56] fix pins for calliope rev 0.3

---
 source/MicroBit.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/MicroBit.cpp b/source/MicroBit.cpp
index eac3af5..afb09ff 100644
--- a/source/MicroBit.cpp
+++ b/source/MicroBit.cpp
@@ -85,7 +85,8 @@ MicroBit::MicroBit() :
        MICROBIT_ID_IO_P20,
        CALLIOPE_ID_IO_P3, CALLIOPE_ID_IO_P7, CALLIOPE_ID_IO_P8,
        CALLIOPE_ID_IO_P9, CALLIOPE_ID_IO_P13, CALLIOPE_ID_IO_P14,
-       CALLIOPE_ID_IO_P15, CALLIOPE_ID_IO_P22),
+       CALLIOPE_ID_IO_P15, CALLIOPE_ID_IO_P22, CALLIOPE_ID_IO_P28,
+       CALLIOPE_ID_IO_P29, CALLIOPE_ID_IO_P30),
     bleManager(storage),
     radio(),
     ble(NULL),

From 2a6cd728b5699972d6ef705111e6fb35eefdb301 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Wed, 9 Nov 2016 12:02:50 +0100
Subject: [PATCH 28/56] version bump, fixes for rev 0.3 board

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index 8354af7..9c0ddac 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "0.2.9-calliope",
+  "version": "0.3.0-calliope",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v0.2.9-calliope"
+    "microbit-dal": "calliope-mini/microbit-dal#v0.3.0-calliope"
   },
   "extraIncludes": [
     "inc"

From 3ddb22e6605acad60559c7803db481a61e5888b1 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Thu, 10 Nov 2016 12:33:17 +0100
Subject: [PATCH 29/56] bumped version to 1.0.0

---
 .yotta.json | 3 ++-
 module.json | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.yotta.json b/.yotta.json
index 49df555..d760253 100644
--- a/.yotta.json
+++ b/.yotta.json
@@ -1,5 +1,6 @@
 {
   "build": {
-    "target": "bbc-microbit-classic-gcc,*"
+    "target": "bbc-microbit-classic-gcc,*",
+    "targetSetExplicitly": true
   }
 }
diff --git a/module.json b/module.json
index 9c0ddac..ef65d91 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "0.3.0-calliope",
+  "version": "1.0.0-calliope",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v0.3.0-calliope"
+    "microbit-dal": "calliope-mini/microbit-dal#v1.0.0-calliope"
   },
   "extraIncludes": [
     "inc"

From 5d7ba722b40b6691239a1bc3e0e29572e4b03d9a Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Thu, 10 Nov 2016 20:47:24 +0100
Subject: [PATCH 30/56] bumped version for pxt fix

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index ef65d91..0e411f0 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "1.0.0-calliope",
+  "version": "1.0.1-calliope",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v1.0.0-calliope"
+    "microbit-dal": "calliope-mini/microbit-dal#v1.0.1-calliope"
   },
   "extraIncludes": [
     "inc"

From 8eac957a3f79ef7021c72b9fe48e00064d35404b Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Fri, 11 Nov 2016 16:57:31 +0100
Subject: [PATCH 31/56] bump version for motor driver fix

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index 0e411f0..28a54a7 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "1.0.1-calliope",
+  "version": "1.0.2-calliope",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v1.0.1-calliope"
+    "microbit-dal": "calliope-mini/microbit-dal#v1.0.2-calliope"
   },
   "extraIncludes": [
     "inc"

From 470d19de6bb0849fb7c9681908a245a0feac8d1f Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Fri, 6 Jan 2017 07:54:15 +0100
Subject: [PATCH 32/56] fix and test for the UART RX resistor issue on rev 0.3

---
 source/MicroBit.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/MicroBit.cpp b/source/MicroBit.cpp
index afb09ff..a20a26b 100644
--- a/source/MicroBit.cpp
+++ b/source/MicroBit.cpp
@@ -27,6 +27,7 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 
+#include <pinmap.h>
 #include "MicroBitConfig.h"
 /*
  * The underlying Nordic libraries that support BLE do not compile cleanly with the stringent GCC settings we employ
@@ -99,6 +100,9 @@ MicroBit::MicroBit() :
     // Bring up soft reset functionality as soon as possible.
     resetButton.mode(PullUp);
     resetButton.fall(this, &MicroBit::reset);
+
+    // TODO (only rev 0.3) fixes USBRX pullup -> pullnone to counteract wrong resistor
+    pin_mode(USBRX, PullNone);
 }
 
 /**

From bee26f0642814876ec8ce1eb70f89b0865a98a66 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Sun, 29 Jan 2017 21:33:56 +0100
Subject: [PATCH 33/56] make pin naming compatible to Microbit, update all
 demos and codes

---
 source/MicroBit.cpp | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/source/MicroBit.cpp b/source/MicroBit.cpp
index a20a26b..fd04c1e 100644
--- a/source/MicroBit.cpp
+++ b/source/MicroBit.cpp
@@ -4,10 +4,6 @@ The MIT License (MIT)
 Copyright (c) 2016 British Broadcasting Corporation.
 This software is provided by Lancaster University by arrangement with the BBC.
 
-Modifications Copyright (c) 2016 Calliope GbR
-Modifications are provided by DELTA Systems (Georg Sommer) - Thomas Kern
-und Björn Eberhardt GbR by arrangement with Calliope GbR. 
-
 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
@@ -25,6 +21,11 @@ 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.
+
+====================
+Modifications Copyright (c) 2016 Calliope GbR
+Modifications are provided by DELTA Systems (Georg Sommer) - Thomas Kern
+und Björn Eberhardt GbR by arrangement with Calliope GbR.
 */
 
 #include <pinmap.h>
@@ -64,12 +65,10 @@ RawSerial* SERIAL_DEBUG = NULL;
   * that represent various device drivers used to control aspects of the micro:bit.
   */
 MicroBit::MicroBit() :
-    
     serial(USBTX, USBRX),
 	resetButton(MICROBIT_PIN_BUTTON_RESET),
     storage(),
     i2c(I2C_SDA0, I2C_SCL0),
-    //i2c(I2C_SDA0, I2C_SCL0),
     messageBus(),
     display(),
     buttonA(MICROBIT_PIN_BUTTON_A, MICROBIT_ID_BUTTON_A),
@@ -81,13 +80,16 @@ MicroBit::MicroBit() :
     thermometer(storage),
     io(MICROBIT_ID_IO_P0,MICROBIT_ID_IO_P1,MICROBIT_ID_IO_P2,
        MICROBIT_ID_IO_P3,MICROBIT_ID_IO_P4,MICROBIT_ID_IO_P5,
-       MICROBIT_ID_IO_P6,MICROBIT_ID_IO_P7,MICROBIT_ID_IO_P9,
-       MICROBIT_ID_IO_P10,MICROBIT_ID_IO_P11,MICROBIT_ID_IO_P19,
-       MICROBIT_ID_IO_P20,
-       CALLIOPE_ID_IO_P3, CALLIOPE_ID_IO_P7, CALLIOPE_ID_IO_P8,
-       CALLIOPE_ID_IO_P9, CALLIOPE_ID_IO_P13, CALLIOPE_ID_IO_P14,
-       CALLIOPE_ID_IO_P15, CALLIOPE_ID_IO_P22, CALLIOPE_ID_IO_P28,
-       CALLIOPE_ID_IO_P29, CALLIOPE_ID_IO_P30),
+       MICROBIT_ID_IO_P6,MICROBIT_ID_IO_P7,MICROBIT_ID_IO_P8,
+       MICROBIT_ID_IO_P9,MICROBIT_ID_IO_P10,MICROBIT_ID_IO_P11,
+       MICROBIT_ID_IO_P12,MICROBIT_ID_IO_P13,MICROBIT_ID_IO_P14,
+       MICROBIT_ID_IO_P15,MICROBIT_ID_IO_P16,MICROBIT_ID_IO_P19,
+       MICROBIT_ID_IO_P20
+#ifdef CALLIOPE_MINI
+       ,
+       MICROBIT_ID_IO_P21
+#endif
+    ),
     bleManager(storage),
     radio(),
     ble(NULL),

From 541a7db87fb23df3664cb42acb00fbc0c848063d Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Tue, 31 Jan 2017 20:42:36 +0100
Subject: [PATCH 34/56] fix version entry

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index 41785d7..2e59c27 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "2.0.0-rc7-calliope",
+  "version": "2.0.0-rc7-calliope-p1",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope"
+    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-p1"
   },
   "extraIncludes": [
     "inc"

From 13bc1076d68071c7659b4b31e8e9870950296e86 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Thu, 2 Feb 2017 15:29:13 +0100
Subject: [PATCH 35/56] update dal referenced version

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index 2e59c27..724ef07 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "2.0.0-rc7-calliope-p1",
+  "version": "2.0.0-rc7-calliope-p2",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-p1"
+    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-p2"
   },
   "extraIncludes": [
     "inc"

From 29c1b86ff10c3fc409d97e09dcef052676436004 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Fri, 3 Feb 2017 17:15:58 +0100
Subject: [PATCH 36/56] update dal

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index 724ef07..bedd80c 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "2.0.0-rc7-calliope-p2",
+  "version": "2.0.0-rc7-calliope-p3",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-p2"
+    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-p3"
   },
   "extraIncludes": [
     "inc"

From e43594c05586b2d75fd69688842dbc464904c1e3 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Sat, 4 Feb 2017 12:44:55 +0100
Subject: [PATCH 37/56] bump version

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index bedd80c..b781be8 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "2.0.0-rc7-calliope-p3",
+  "version": "2.0.0-rc7-calliope-p4",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-p3"
+    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-p4"
   },
   "extraIncludes": [
     "inc"

From 08ca3319e723b9a7ed477bb35bb1b29a2a091ae4 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Sat, 4 Feb 2017 13:04:09 +0100
Subject: [PATCH 38/56] update dal, bump version

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index b781be8..f33ee81 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "2.0.0-rc7-calliope-p4",
+  "version": "2.0.0-rc7-calliope-p5",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-p4"
+    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-p5"
   },
   "extraIncludes": [
     "inc"

From f5f13ebe1be9d70a39887d12861761451863f84b Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Sat, 4 Feb 2017 13:26:08 +0100
Subject: [PATCH 39/56] bump version

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index f33ee81..2bc1e86 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "2.0.0-rc7-calliope-p5",
+  "version": "2.0.0-rc7-calliope-p6",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-p5"
+    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-p6"
   },
   "extraIncludes": [
     "inc"

From a13bab332122c32d8aa4fcd2958050360c24f210 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Sun, 5 Feb 2017 15:30:01 +0100
Subject: [PATCH 40/56] bump version

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index 2bc1e86..e2a1935 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "2.0.0-rc7-calliope-p6",
+  "version": "2.0.0-rc7-calliope-p7",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-p6"
+    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-p7"
   },
   "extraIncludes": [
     "inc"

From 048d1ec1567c93b9a8d96a977f955b973a3004ce Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Sun, 5 Feb 2017 16:03:59 +0100
Subject: [PATCH 41/56] bump version, use TARGET_NRF51_CALLIOPE to distinguish
 build

---
 module.json         | 2 +-
 source/MicroBit.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index e2a1935..6d6aee6 100644
--- a/module.json
+++ b/module.json
@@ -1,6 +1,6 @@
 {
   "name": "microbit",
-  "version": "2.0.0-rc7-calliope-p7",
+  "version": "2.0.0-rc7-calliope-p8",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
diff --git a/source/MicroBit.cpp b/source/MicroBit.cpp
index fd04c1e..3174619 100644
--- a/source/MicroBit.cpp
+++ b/source/MicroBit.cpp
@@ -85,7 +85,7 @@ MicroBit::MicroBit() :
        MICROBIT_ID_IO_P12,MICROBIT_ID_IO_P13,MICROBIT_ID_IO_P14,
        MICROBIT_ID_IO_P15,MICROBIT_ID_IO_P16,MICROBIT_ID_IO_P19,
        MICROBIT_ID_IO_P20
-#ifdef CALLIOPE_MINI
+#ifdef TARGET_NRF51_CALLIOPE
        ,
        MICROBIT_ID_IO_P21
 #endif

From a42e3e0b503d1d8341bb27b90a77cd675fc0b71b Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Sun, 5 Feb 2017 16:04:30 +0100
Subject: [PATCH 42/56] fix dependency

---
 module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.json b/module.json
index 6d6aee6..6015c80 100644
--- a/module.json
+++ b/module.json
@@ -4,7 +4,7 @@
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-p7"
+    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-p8"
   },
   "extraIncludes": [
     "inc"

From 3f63086694f42c2935f9c1aa613de8a8783a23ce Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Sun, 5 Feb 2017 16:06:20 +0100
Subject: [PATCH 43/56] update dependency on calliope target

---
 .yotta.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yotta.json b/.yotta.json
index d760253..097b7ea 100644
--- a/.yotta.json
+++ b/.yotta.json
@@ -1,6 +1,6 @@
 {
   "build": {
-    "target": "bbc-microbit-classic-gcc,*",
+    "target": "calliope-mini-classic-gcc,*",
     "targetSetExplicitly": true
   }
 }

From 021fa6beb282c46ed841a75e4e082b4c29a4dca3 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Mon, 6 Feb 2017 22:00:20 +0100
Subject: [PATCH 44/56] bump version

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index 6015c80..bfc4a1a 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "2.0.0-rc7-calliope-p8",
+  "version": "2.0.0-rc7-calliope-p9",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-p8"
+    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-p9"
   },
   "extraIncludes": [
     "inc"

From b8e89d9adecc47558633e894c1d38f24ecc5bf7e Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Sat, 18 Feb 2017 16:12:03 +0100
Subject: [PATCH 45/56] comment on branches

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index d886374..4343252 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,8 @@
+> This is a fork of the original microbit adapted for the [Calliope](http://calliope.cc) board.
+> The master branch tracks the latest changes (board rev. 1.0+), for code covering the 2016 board (rev 0.3 and lower)
+> see the [calliope-mini-2016 branch](/calliope-mini/microbit/tree/calliope-mini-2016).
+
+
 # microbit
 
 A collection of the commonly used components of the micro:bit runtime with a

From 379438a5a393fff38cce9ebf9066ad1cb55632bd Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Sat, 18 Feb 2017 16:13:52 +0100
Subject: [PATCH 46/56] fix link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4343252..d30589d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 > This is a fork of the original microbit adapted for the [Calliope](http://calliope.cc) board.
 > The master branch tracks the latest changes (board rev. 1.0+), for code covering the 2016 board (rev 0.3 and lower)
-> see the [calliope-mini-2016 branch](/calliope-mini/microbit/tree/calliope-mini-2016).
+> see the [calliope-mini-2016 branch](tree/calliope-mini-2016).
 
 
 # microbit

From 07e1efcc5a2f6e6dfb91144d1093fb4da35eff7e Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Sat, 18 Feb 2017 16:16:28 +0100
Subject: [PATCH 47/56] fix link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d30589d..e29c812 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 > This is a fork of the original microbit adapted for the [Calliope](http://calliope.cc) board.
 > The master branch tracks the latest changes (board rev. 1.0+), for code covering the 2016 board (rev 0.3 and lower)
-> see the [calliope-mini-2016 branch](tree/calliope-mini-2016).
+> see the [calliope-mini-2016 branch](../../tree/calliope-mini-2016).
 
 
 # microbit

From 778943195e6e2c0bd9cdcd731bd672b9c55eb7f4 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Sat, 18 Feb 2017 16:49:15 +0100
Subject: [PATCH 48/56] update to use rev 1.0 mbed-classic

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index bfc4a1a..40c52e6 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "2.0.0-rc7-calliope-p9",
+  "version": "2.0.0-rc7-calliope-1.0.0",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-p9"
+    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-1.0.0"
   },
   "extraIncludes": [
     "inc"

From 1e1ad2d10aabf7d916e6a4468b922b92d28dd4a2 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Sat, 18 Feb 2017 16:58:28 +0100
Subject: [PATCH 49/56] pullUp issue for rx/tx is fixed

---
 source/MicroBit.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/source/MicroBit.cpp b/source/MicroBit.cpp
index 3174619..86cdef3 100644
--- a/source/MicroBit.cpp
+++ b/source/MicroBit.cpp
@@ -102,9 +102,6 @@ MicroBit::MicroBit() :
     // Bring up soft reset functionality as soon as possible.
     resetButton.mode(PullUp);
     resetButton.fall(this, &MicroBit::reset);
-
-    // TODO (only rev 0.3) fixes USBRX pullup -> pullnone to counteract wrong resistor
-    pin_mode(USBRX, PullNone);
 }
 
 /**

From b3924436689bc3bb2b81c1761417251a3702731f Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Sun, 19 Feb 2017 16:30:21 +0100
Subject: [PATCH 50/56] bump version for brightness fix

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index 40c52e6..e1d0bdb 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "2.0.0-rc7-calliope-1.0.0",
+  "version": "2.0.0-rc7-calliope-1.0.1",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-1.0.0"
+    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-1.0.1"
   },
   "extraIncludes": [
     "inc"

From fa68cfe012a646aa30dc7621280650aca19be041 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Thu, 9 Mar 2017 10:37:16 +0100
Subject: [PATCH 51/56] bump version

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index e1d0bdb..a218108 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "2.0.0-rc7-calliope-1.0.1",
+  "version": "2.0.0-rc7-calliope-1.0.2",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-1.0.1"
+    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-1.0.2"
   },
   "extraIncludes": [
     "inc"

From c9e8063d52eeb2bba918285450ead452208f4c41 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Thu, 9 Mar 2017 10:43:16 +0100
Subject: [PATCH 52/56] fix version dependencies

---
 module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module.json b/module.json
index a218108..8a3a25a 100644
--- a/module.json
+++ b/module.json
@@ -4,7 +4,7 @@
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc7-calliope-1.0.2"
+    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc8-calliope-1.0.2"
   },
   "extraIncludes": [
     "inc"

From 0767a61e2bc83ace6a4afdee319eccffc028418a Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Thu, 27 Apr 2017 15:01:02 +0200
Subject: [PATCH 53/56] update to latest upstream, fix compass settings, fix
 compass calibration

---
 inc/MicroBit.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/MicroBit.h b/inc/MicroBit.h
index de2e34c..53f063b 100644
--- a/inc/MicroBit.h
+++ b/inc/MicroBit.h
@@ -52,6 +52,7 @@ DEALINGS IN THE SOFTWARE.
 #include "MicroBitButton.h"
 #include "MicroBitPin.h"
 #include "MicroBitCompass.h"
+#include "MicroBitCompass-bmx.h"
 #include "MicroBitCompassCalibrator.h"
 #include "MicroBitAccelerometer-bmx.h"
 #include "MicroBitThermometer.h"

From 4bb7d3c9903c555c6a3375191d0396d2419c80b3 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Tue, 1 Aug 2017 21:33:49 +0200
Subject: [PATCH 54/56] update version

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index 4a9aade..790519e 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "2.0.0-rc8-calliope-1.0.2",
+  "version": "2.0.0-rc8-calliope-1.0.3",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc8-calliope-1.0.2"
+    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc8-calliope-1.0.3"
   },
   "extraIncludes": [
     "inc"

From 0aa658b602f2a6cfb6c6ac4300f4b18eaafdc231 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Mon, 19 Feb 2018 14:57:07 +0100
Subject: [PATCH 55/56] bump version and update dependency

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index 790519e..135c384 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "2.0.0-rc8-calliope-1.0.3",
+  "version": "2.0.0-rc8-calliope-1.0.4",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc8-calliope-1.0.3"
+    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc8-calliope-1.0.4"
   },
   "extraIncludes": [
     "inc"

From 3db7ffdfbbe11e96dcb330297a871e54f42283f8 Mon Sep 17 00:00:00 2001
From: "Matthias L. Jugel" <leo@thinkberg.com>
Date: Tue, 17 Apr 2018 10:35:30 +0200
Subject: [PATCH 56/56] update dependency, bump to 1.0.5

---
 module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module.json b/module.json
index 135c384..6083eef 100644
--- a/module.json
+++ b/module.json
@@ -1,10 +1,10 @@
 {
   "name": "microbit",
-  "version": "2.0.0-rc8-calliope-1.0.4",
+  "version": "2.0.0-calliope-1.0.5",
   "description": "A simple to use collection of the most commonly used components in the micro:bit runtime",
   "license": "MIT",
   "dependencies": {
-    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-rc8-calliope-1.0.4"
+    "microbit-dal": "calliope-mini/microbit-dal#v2.0.0-calliope-1.0.5"
   },
   "extraIncludes": [
     "inc"