C

diff --git a/capacitivetouch.h b/capacitivetouch.h
index 6cd456d20b513c258dec278ef2c2eb6a2688e0ef..0ca954e7b18f66c3ad930daf1b29fc33f65a6068 100644 (file)
--- a/capacitivetouch.h
+++ b/capacitivetouch.h
@@ -1,11 +1,9 @@
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <decl.h>
+
+BEGIN_DECL
 
 void init_capacitive_touch();
 
-#ifdef __cplusplus
-}
-#endif
+END_DECL

diff --git a/forcefader.cpp b/forcefader.cpp
index 5fdf57f5da4c04a7b661e5179dccf60efef9cd09..2144cc92869efafff2336a05b63a7d86c8aad86e 100644 (file)
--- a/forcefader.cpp
+++ b/forcefader.cpp
@@ -22,7 +22,8 @@ pin_t faderpos_pin;
 
 timer_channel_t forceloop_timer = { .timer = timer_1, .channel = 1 };
 
-ForceModel *fm = NULL;
+SpringModel sm(0.05, 5);
+ForceModel *fm = &sm;
 
 void updateForce()
 {
@@ -35,9 +36,9 @@ void updateForce()
 
 int main()
 {
-  //fm = new SpringModel(0.05, 5);
+  fm = new SpringModel(0.05, 5);
   //fm = new BowModel(0.01, 5);
-  fm = new PluckModel(0.05, 0.02, 5);
+  //fm = new PluckModel(0.05, 0.02, 5);
 
   faderpos_pin = make_pin(gpio_port_a, 0);    //ADC1   CH0
 

diff --git a/forcemotor.h b/forcemotor.h
index 7e03f6522741b2d571bba427815ca6860b59b737..67ae73136dcd89891c87eb09d09e38610568ef3b 100644 (file)
--- a/forcemotor.h
+++ b/forcemotor.h
@@ -1,12 +1,10 @@
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <decl.h>
+
+BEGIN_DECL
 
 void init_force_motor();
 void set_force(float force);
 
-#ifdef __cplusplus
-}
-#endif
+END_DECL