Revision 1:3b10241770d7, committed 2019-06-05

Comitter:

asaewing

Date:

Wed Jun 05 07:54:09 2019 +0000

Parent:

0:833da29046f9

Commit message:

1.0

Changed in this revision

diff -r 833da29046f9 -r 3b10241770d7 DataStorage.cpp
--- a/DataStorage.cpp	Fri Dec 21 07:54:17 2018 +0000
+++ b/DataStorage.cpp	Wed Jun 05 07:54:09 2019 +0000
@@ -2,30 +2,32 @@
 
 bool DataStorage::isAccept = false;
 int DataStorage::noAcceptCount = 0;
+bool DataStorage::isNoConnectServer = true;
 
 int DataStorage::ipSelect = 1;
-char* DataStorage::ipChar = 0;
+char *DataStorage::ipChar = 0;
 std::string DataStorage::ipStr = "";
+bool DataStorage::isTestMode = false;
 
 std::string DataStorage::http_method = "";
 std::string DataStorage::api_command = "";
 std::string DataStorage::response = "";
 
-int DataStorage::WM_PWM[5][2] = {{0,0}, {0,0}, {0,0}, {0,0}, {0,0}};
+int DataStorage::WM_PWM[5][2] = {{0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}};
 
-DigitalOut  DataStorage::_W1_A(PC_6);
+DigitalOut DataStorage::_W1_A(PC_6);
 //DigitalOut  DataStorage::_W1_B(PD_8);
 //DigitalOut  DataStorage::_W1_A(PA_8);
-DigitalOut  DataStorage::_W1_B(PB_10);
+DigitalOut DataStorage::_W1_B(PB_10);
 //DigitalIn   DataStorage::_W1_Ai(PC_6);
 //DigitalIn   DataStorage::_W1_Bi(PD_8);
 
-DigitalOut  DataStorage::_W2_A(PA_12);
-DigitalOut  DataStorage::_W2_B(PA_11);
-DigitalOut  DataStorage::_W3_A(PB_12);
-DigitalOut  DataStorage::_W3_B(PB_11);
-DigitalOut  DataStorage::_W4_A(PB_2);
-DigitalOut  DataStorage::_W4_B(PB_15);
+DigitalOut DataStorage::_W2_A(PA_12);
+DigitalOut DataStorage::_W2_B(PA_11);
+DigitalOut DataStorage::_W3_A(PB_12);
+DigitalOut DataStorage::_W3_B(PB_11);
+DigitalOut DataStorage::_W4_A(PB_2);
+DigitalOut DataStorage::_W4_B(PB_15);
 
 PwmOut DataStorage::_WM_PWM_out01(PD_14);
 PwmOut DataStorage::_WM_PWM_out02(PD_15);
@@ -37,25 +39,73 @@
 PwmOut WM_PWM_out03 = new WM_PWM_out03(PE_12);
 PwmOut WM_PWM_out04 = new WM_PWM_out04(PE_14);*/
 
-DigitalOut* DataStorage::WM_Control_out[4][2] = {
-    {&DataStorage::_W1_A, &DataStorage::_W1_B}, 
-    {&DataStorage::_W2_A, &DataStorage::_W2_B}, 
-    {&DataStorage::_W3_A, &DataStorage::_W3_B}, 
+DigitalOut *DataStorage::WM_Control_out[4][2] = {
+    {&DataStorage::_W1_A, &DataStorage::_W1_B},
+    {&DataStorage::_W2_A, &DataStorage::_W2_B},
+    {&DataStorage::_W3_A, &DataStorage::_W3_B},
     {&DataStorage::_W4_A, &DataStorage::_W4_B}};
 
-PwmOut* DataStorage::WM_PWM_out[4] = {
-    &DataStorage::_WM_PWM_out01, 
-    &DataStorage::_WM_PWM_out02, 
-    &DataStorage::_WM_PWM_out03, 
+PwmOut *DataStorage::WM_PWM_out[4] = {
+    &DataStorage::_WM_PWM_out01,
+    &DataStorage::_WM_PWM_out02,
+    &DataStorage::_WM_PWM_out03,
     &DataStorage::_WM_PWM_out04};
 
-DataStorage::DataStorage() {
+DigitalIn DataStorage::isIR_1(PG_8);
+DigitalIn DataStorage::isIR_2(PF_11);
+DigitalIn DataStorage::isIR_3(PG_5);
+DigitalIn DataStorage::isIR_4(PG_6);
+DigitalIn DataStorage::isIR_5(PE_0);
+DigitalIn DataStorage::isIR_6(PF_15);
+
+DigitalIn *DataStorage::isIR[6] = {
+    &DataStorage::isIR_1,
+    &DataStorage::isIR_2,
+    &DataStorage::isIR_3,
+    &DataStorage::isIR_4,
+    &DataStorage::isIR_5,
+    &DataStorage::isIR_6};
+
+AnalogIn DataStorage::ainIR_11(PF_6);
+AnalogIn DataStorage::ainIR_12(PF_7);
+AnalogIn DataStorage::ainIR_13(PA_0);
+
+AnalogIn DataStorage::ainIR_21(PB_1);
+AnalogIn DataStorage::ainIR_22(PF_5);
+AnalogIn DataStorage::ainIR_23(PF_4);
+
+AnalogIn DataStorage::ainIR_31(PC_2);
+AnalogIn DataStorage::ainIR_32(PC_3);
+AnalogIn DataStorage::ainIR_33(PA_4);
+
+AnalogIn DataStorage::ainIR_41(PC_0);
+AnalogIn DataStorage::ainIR_42(PF_8);
+AnalogIn DataStorage::ainIR_43(PF_9);
+
+AnalogIn DataStorage::ainIR_51(PA_3);
+AnalogIn DataStorage::ainIR_52(PF_10);
+AnalogIn DataStorage::ainIR_53(PF_3);
+
+AnalogIn DataStorage::ainIR_61(PA_5);
+AnalogIn DataStorage::ainIR_62(PA_6);
+
+AnalogIn *DataStorage::ainIR[6][3] = {
+    {&DataStorage::ainIR_11, &DataStorage::ainIR_12, &DataStorage::ainIR_13},
+    {&DataStorage::ainIR_21, &DataStorage::ainIR_22, &DataStorage::ainIR_23},
+    {&DataStorage::ainIR_31, &DataStorage::ainIR_32, &DataStorage::ainIR_33},
+    {&DataStorage::ainIR_41, &DataStorage::ainIR_42, &DataStorage::ainIR_43},
+    {&DataStorage::ainIR_51, &DataStorage::ainIR_52, &DataStorage::ainIR_53},
+    {&DataStorage::ainIR_61, &DataStorage::ainIR_62, &DataStorage::ainIR_62}};
+
+DataStorage::DataStorage()
+{
     //testInt1 = 111;
     //testInt2 = 222;
     //testInt3 = 333;
 }
 
-DataStorage::DataStorage(std::string tmpTest) {
+DataStorage::DataStorage(std::string tmpTest)
+{
     //testInt1 = 111;
     //testInt2 = 222;
     //testInt3 = 333;
@@ -82,4 +132,20 @@
     printf("### DS - 02 - 02 - %d\r\n", WM_PWM[0][0]);
     int tmp = WM_PWM[0][0];
     return tmp;
-}*/
\ No newline at end of file
+}*/
+
+void DataStorage::set_PWM_write(int ii, float tmp)
+{
+    DataStorage::WM_PWM_out[ii]->write(tmp);
+}
+
+void DataStorage::set_PWM_period(int ii, float tmp)
+{
+    DataStorage::WM_PWM_out[ii]->period(tmp);
+}
+
+void DataStorage::set_PWM_status(int ii, int a, int b)
+{
+    (*DataStorage::WM_Control_out[ii - 1][0]) = a;
+    (*DataStorage::WM_Control_out[ii - 1][1]) = b;
+}
\ No newline at end of file

diff -r 833da29046f9 -r 3b10241770d7 DataStorage.h
--- a/DataStorage.h	Fri Dec 21 07:54:17 2018 +0000
+++ b/DataStorage.h	Wed Jun 05 07:54:09 2019 +0000
@@ -3,52 +3,90 @@
 
 #include "module_for_all.h"
 
-class DataStorage {
-public:
-
+class DataStorage
+{
+  public:
     DataStorage();
     DataStorage(std::string);
-    
+
     static bool isAccept;
     static int noAcceptCount;
-    
+    static bool isNoConnectServer;
+
     static int ipSelect;
-    static char* ipChar;
+    static char *ipChar;
     static std::string ipStr;
-    
+    static bool isTestMode;
+
     static std::string http_method;
     static std::string api_command;
     static std::string response;
-    
+
     //int* WM_PWM;
     //int (*WM_PWM)[2];
     static int WM_PWM[5][2];
-    
-    static DigitalOut  _W1_A;
-    static DigitalOut  _W1_B;
+
+    static DigitalOut _W1_A;
+    static DigitalOut _W1_B;
     //static DigitalIn  _W1_Ai;
     //static DigitalIn  _W1_Bi;
-    
-    static DigitalOut  _W2_A;
-    static DigitalOut  _W2_B;
-    static DigitalOut  _W3_A;
-    static DigitalOut  _W3_B;
-    static DigitalOut  _W4_A;
-    static DigitalOut  _W4_B;
-    static DigitalOut* WM_Control_out[4][2];
-    
+
+    static DigitalOut _W2_A;
+    static DigitalOut _W2_B;
+    static DigitalOut _W3_A;
+    static DigitalOut _W3_B;
+    static DigitalOut _W4_A;
+    static DigitalOut _W4_B;
+    static DigitalOut *WM_Control_out[4][2];
+
     static PwmOut _WM_PWM_out01;
     static PwmOut _WM_PWM_out02;
     static PwmOut _WM_PWM_out03;
     static PwmOut _WM_PWM_out04;
-    static PwmOut* WM_PWM_out[4];
-    
+    static PwmOut *WM_PWM_out[4];
+
+    static DigitalIn *isIR[6];
+    static DigitalIn isIR_1;
+    static DigitalIn isIR_2;
+    static DigitalIn isIR_3;
+    static DigitalIn isIR_4;
+    static DigitalIn isIR_5;
+    static DigitalIn isIR_6;
+
+    static AnalogIn *ainIR[6][3];
+    static AnalogIn ainIR_11;
+    static AnalogIn ainIR_12;
+    static AnalogIn ainIR_13;
+
+    static AnalogIn ainIR_21;
+    static AnalogIn ainIR_22;
+    static AnalogIn ainIR_23;
+
+    static AnalogIn ainIR_31;
+    static AnalogIn ainIR_32;
+    static AnalogIn ainIR_33;
+
+    static AnalogIn ainIR_41;
+    static AnalogIn ainIR_42;
+    static AnalogIn ainIR_43;
+
+    static AnalogIn ainIR_51;
+    static AnalogIn ainIR_52;
+    static AnalogIn ainIR_53;
+
+    static AnalogIn ainIR_61;
+    static AnalogIn ainIR_62;
+
     /* Define function */
     //void setConfig_PWM(PwmOut**, int[5][2]);
     //int get_testInt1();
-    
-private:
-    int _moveDirection;//1~16
+
+    void set_PWM_write(int, float);
+    void set_PWM_period(int, float);
+    static void set_PWM_status(int, int, int);
+
+  private:
+    int _moveDirection; //1~16
 };
 
 #endif
\ No newline at end of file