Revision 6:ae7b9f0a13f7, committed 2017-08-22

Comitter:

sonson

Date:

Tue Aug 22 08:50:17 2017 +0000

Parent:

5:09935c0aa297

Child:

7:6a352003742d

Commit message:

??????Grove????

Changed in this revision

--- a/EEAB-P1/Eeabp1.cpp	Tue Aug 22 02:44:55 2017 +0000
+++ b/EEAB-P1/Eeabp1.cpp	Tue Aug 22 08:50:17 2017 +0000
@@ -279,6 +279,22 @@
     return 0;
 }
 
+int Eeabp1::setGroveDio(EeabGrovePort port, EeabGroveSig sig , EeabGroveDio val)
+{
+    switch (port) {
+        case GROVE_CH1:
+                    (sig == GROVE_SIG1) ? *grv_p1s1do = val : *grv_p1s2do = val;
+            break;
+        case GROVE_CH2:
+                    (sig == GROVE_SIG1) ? *grv_p2s1do = val : *grv_p2s2do = val;
+            break;
+        default:
+            break;
+    }
+    return 0;
+}
+
+
 int Eeabp1::getGroveDio(EeabGrovePort port, EeabGroveSig sig)
 {
     switch (port) {

--- a/EEAB-P1/Eeabp1.h	Tue Aug 22 02:44:55 2017 +0000
+++ b/EEAB-P1/Eeabp1.h	Tue Aug 22 08:50:17 2017 +0000
@@ -51,6 +51,7 @@
     int setGrovePortType(EeabGrovePort port, EeabGrovePortType type);
     int setGroveDioDirection(EeabGrovePort port, EeabGroveDioDirection dir, Callback<void()> func = NULL);
     int setGroveDio(EeabGrovePort port, EeabGroveDio val);
+    int setGroveDio(EeabGrovePort port, EeabGroveSig sig , EeabGroveDio val);
     int getGroveDio(EeabGrovePort port, EeabGroveSig sig);
     float getGroveAnalog(EeabGrovePort port, EeabGroveSig sig);
     int enableTempHumidSensor(void);
@@ -101,4 +102,4 @@
     int chkSerialCharRes(char);
 };
 
-#endif /* !defined(EEAPP1_H) */
\ No newline at end of file
+#endif /* !defined(EEAPP1_H) */

--- a/main.cpp	Tue Aug 22 02:44:55 2017 +0000
+++ b/main.cpp	Tue Aug 22 08:50:17 2017 +0000
@@ -2,10 +2,12 @@
 #include "TinyGPS.h"
 #include "Eeabp1.h"
 
-//#define TEST_ANALOG
-//#define TEST_TEMP_HUMID
-//#define TEST_ACC
-
+#define TEST_ANALOG // WaterSensor(ハイインピ過ぎる),SoundSensor(動くが設計に問題有),MoistureSensor,LightSensor,MotionSensor
+//#define TEST_TEMP_HUMID //SHT31
+//#define TEST_ACC // ADXL345
+//#define TEST_DIGITAL_IN // Button,Switch
+//#define TEST_DIGITAL_OUT // Buzzer,LED
+//#define TEST_DIGITAL_IN_INTTERUPT
 
 //
 // 1Wire Support
@@ -200,7 +202,6 @@
         }
 }
 
-
 #if defined(TEST_DIGITAL_IN_INTTERUPT)
 Eeabp1 *gp;
 bool led_on = true;
@@ -229,6 +230,7 @@
 
     board.setGrovePower(true);
 
+    /*
     // GPSデモ
     GpsPower(true); // バッテリー駆動の場合、GPS電源をこまめに切ることを推奨します
     while(true) 
@@ -245,6 +247,7 @@
         gpsTick ++;
     }
     }
+    */
 
 /*  
  // 1Wireデモ
@@ -302,12 +305,17 @@
         board.loop();
 #if defined(TEST_DIGITAL_OUT)
         if (on) {
-            board.setGroveDio(GROVE_CH1, GROVE_DIO_HIGH);
-            board.setGroveDio(GROVE_CH2, GROVE_DIO_LOW);
+            //board.setGroveDio(GROVE_CH1, GROVE_DIO_HIGH); // SIG1&2両方変更したい場合
+            board.setGroveDio(GROVE_CH1, GROVE_SIG1 , GROVE_DIO_HIGH);
+            board.setGroveDio(GROVE_CH1, GROVE_SIG2 , GROVE_DIO_LOW);
+            board.setGroveDio(GROVE_CH2, GROVE_SIG1 , GROVE_DIO_HIGH);
+            board.setGroveDio(GROVE_CH2, GROVE_SIG2 , GROVE_DIO_LOW);
         }
         else {
-            board.setGroveDio(GROVE_CH1, GROVE_DIO_LOW);
-            board.setGroveDio(GROVE_CH2, GROVE_DIO_HIGH);
+            board.setGroveDio(GROVE_CH1, GROVE_SIG1 , GROVE_DIO_LOW);
+            board.setGroveDio(GROVE_CH1, GROVE_SIG2 , GROVE_DIO_HIGH);
+            board.setGroveDio(GROVE_CH2, GROVE_SIG1 , GROVE_DIO_LOW);
+            board.setGroveDio(GROVE_CH2, GROVE_SIG2 , GROVE_DIO_HIGH);
         }
         on = !on;
 #endif /* defined(TEST_DIGITAL_OUT) */