Merge pull request #6 from ghostintranslation/develop

Latest Motherboard
ghostintranslation · May 2, 2021 · 637380c · 637380c
2 parents 0dd5871 + 64a2168
commit 637380c
Show file tree

Hide file tree

Showing 4 changed files with 217 additions and 206 deletions.
diff --git a/DS909/DS909.h b/DS909/DS909.h
@@ -1,7 +1,7 @@
 #ifndef DS909_h
 #define DS909_h
 
-#include "Motherboard9.h"
+#include "Motherboard.h"
 #include "BassDrum.h"
 #include "Snare.h"
 #include "Clap.h"
@@ -19,7 +19,7 @@ class DS909{
     DS909();
 
     // Motherboard
-    Motherboard9 *device;
+    Motherboard *device;
 
     // Bass Drum
     BassDrum *bassDrum;
@@ -94,8 +94,6 @@ inline DS909::DS909(){
   this->hihat = new Hihat();
   this->cymbal = new Cymbal();
 
-  this->device = Motherboard9::getInstance();
-
   this->mixer1 = new AudioMixer4();
   this->mixer1->gain(0, 1 );
   this->mixer1->gain(1, 1 );
@@ -145,7 +143,7 @@ inline DS909 *DS909::getInstance()    {
  * Init
  */
 inline void DS909::init(){
-  device->init(
+  this->device = Motherboard::init(
     "DS909",
     {
       Potentiometer, Potentiometer, Potentiometer,
@@ -164,6 +162,7 @@ inline void DS909::init(){
   this->device->setHandlePotentiometerChange(6, onRMChange);
   this->device->setHandlePotentiometerChange(7, onHHChange);
   this->device->setHandlePotentiometerChange(8, onCYChange);
+
   // MIDI callbacks
   this->device->setHandleMidiNoteOn(onMidiNoteOn);
   this->device->setHandleMidiControlChange(0, 0, "BD", onMidiBDChange);

diff --git a/DS909/DS909.ino b/DS909/DS909.ino
@@ -4,7 +4,7 @@
 \_|| |\_/__) |    _|_| |    | | \| || |__)|__| | | _|_\_/| |
 
 DS909
-v1.1.0
+v1.2.0
 
 Support my work:
 https://www.paypal.com/paypalme/ghostintranslation
@@ -44,10 +44,11 @@ void setup() {
   audioBoard.enable();
   audioBoard.volume(0.5);
 
-  // Starting sequence
+  // Ready!
   Serial.println("Ready!");
 }
 
 void loop() {
+  // DS909 update
   ds909->update();
 }