Diff: microbit_switch_if_3sw.h

Revision:

3:d8fd4efb63cc

Parent:

2:8e2e6c6658be

diff -r 8e2e6c6658be -r d8fd4efb63cc microbit_switch_if_3sw.h
--- a/microbit_switch_if_3sw.h	Sat Jun 08 04:40:57 2019 +0000
+++ b/microbit_switch_if_3sw.h	Tue Jun 11 18:08:53 2019 +0000
@@ -13,6 +13,28 @@
 #include "HIDDeviceInformationService.h"
 
 //----------------------
+//  GROVE JoyStick
+//----------------------
+#define JOY_ERR_THRE     0.4      // JoyStick 異常入力の閾値
+#define JOY_LOW_THRE     0.35     // JoyStick 入力値の低い側の閾値
+#define JOY_HIGH_THRE    0.65     // JoyStick 入力値の高い側の閾値
+#define JOY_CENTER_THRE  0.90     // JoyStick の押しスイッチの閾値
+#define EMA_ALPHA        0.22222  // N=8  2/(N+1)
+enum JOY_STATUS {
+    JOY_NEUTRAL = -1,
+    JOY_CENTER_PRESS ,   // 中央
+    JOY_YHIGH_PRESS,    // 左
+    JOY_YLOW_PRESS,     // 右
+    JOY_XHIGH_PRESS,    // 上
+    JOY_XLOW_PRESS,     // 下
+};
+
+float JoyX1[4]={ 1, 0,-1, 0};
+float JoyX2[4]={ 0, 1, 0,-1};
+float JoyY1[4]={ 0,-1, 0, 1};
+float JoyY2[4]={ 1, 0,-1, 0};
+
+//----------------------
 //  Keybord
 //----------------------
 #define MODIFY_CTRL     0x100
@@ -53,14 +75,11 @@
 //----------------------
 //  Setting
 //----------------------
-#define NUM_GROUP1         7
-#define NUM_G1MEMBER       3
-
 #define NUM_GROUP_3SW      7
 #define NUM_3SW_MEMBER     3
 #define NUM_GROUP_JOY      5
 #define NUM_JOY_MEMBER     5
-#define NUM_DEVICE         3
+#define NUM_JOY_DIREC      4
 
 const int keyCodeGroup_AB[3] = {   // Button A, Button B, Button A&B
    'a', 
@@ -210,8 +229,8 @@
 		DISP_NO_MESSAGE, 
 		DISP_BLE_CONNECTED,
 		DISP_BLE_PAIRING_SUCCESS,
-		DISP_BLE_PAIRING_FAILED};
-
+		DISP_BLE_PAIRING_FAILED
+};
 
 //----------------------
 //  Input Buffer
@@ -222,12 +241,7 @@
 
 #define  BUTTON_NAME_A                 1     // A
 #define  BUTTON_NAME_B                 2     // B
-#define  BUTTON_NAME_P0                3     // P0
-#define  BUTTON_NAME_P1                4     // P1
-#define  BUTTON_NAME_P2                5     // P2
-
+#define  BUTTON_NAME_P0                4     // P0
+#define  BUTTON_NAME_P1                8     // P1
+#define  BUTTON_NAME_P2               16     // P2
 
-
-
- 
-