938GPIO口更新

app/src/main/cpp/GPIOControl.h

@@ -33,16 +33,48 @@
 #define CMD_SET_SPI_MAXSPEEDHZ                  125
 #define CMD_SET_PWM_BEE_STATE                   126
 #define CMD_SET_ALM_MODE                        128
-#define CMD_SET_SPI_POWER                       129
+#define CMD_SET_SYSTEM_RESET  		            202
 #define CMD_SET_485_EN_STATE					131
-#define CMD_SET_CAM_3V3_EN_STATE				132
 #define CMD_SET_12V_EN_STATE					133
-#define CMD_SET_SYSTEM_RESET  		            202
+#if 0
-
+#define CMD_SET_SPI_POWER                       129
+#define CMD_SET_CAM_3V3_EN_STATE				132
+#endif
 
 #ifdef USING_N938
 
-#if 1
+#if 0   //云台
+#define CMD_SET_485_ENABLE 512
+#define CMD_SET_3V3_PWR_ENABLE 516
+#define CMD_SET_5V_PWR_ENABLE 517
+#define CMD_SET_SENSOR_ENABLE 504
+#define CMD_SET_SENSOR_PWR_ENABLE 505
+#define CMD_SET_SENSOR2_ENABLE 506
+#define CMD_SET_SENSOR4_ENABLE 510
+#define CMD_SET_SENSOR1_PWR_ENABLE 513
+#define CMD_SET_SENSOR2_PWR_ENABLE 514
+#define CMD_SET_SENSOR3_PWR_ENABLE 509
+#define CMD_SET_SENSOR4_PWR_ENABLE 525
+#define CMD_SET_PHOTO_IN 520
+#define CMD_SET_PHOTO_OUT 515
+
+#define CMD_SET_ADC_ENABLE 500
+#define CMD_SET_MIPI_SWITCH 501
+#define CMD_SET_CAM_RSTN1 502
+#define CMD_SET_CAM_RSTN0 503
+#define CMD_SET_SD_DECT 507
+#define CMD_SET_PTZ_PWR_ENABLE 508
+#define CMD_SET_RTC_ENABLE 511
+#define CMD_SET_100M_ENABLE 518
+#define CMD_SET_100M_SWITCH_PWR_ENABLE 519
+#define CMD_SET_AM_POWER_ENABLE 521
+#define CMD_SET_NRSEC_POWER_ENABLE 522
+#define CMD_SET_AMP_ENABLE 523
+#define CMD_SET_LIGHT1_RESISTOR_ENABLE 524
+#define CMD_SET_100M_RESET 526
+#endif
+
+#if 0   //微拍
 #define CMD_SET_485_EN_STATE		            131
 #define CMD_SET_CAM_3V3_EN_STATE		        132
 #define CMD_SET_12V_EN_STATE		            133
@@ -68,7 +100,30 @@
 #define CMD_SET_OTG_STATE			            107
 #define CMD_GET_OTG_STATE			            108
 
-#else
+#else   //938
+#define CMD_SET_485_en1	                        302
+#define CMD_SET_CAM_3V3_EN_STATE                360
+#define CMD_SET_UART0_EN                    	361
+#define CMD_SET_485_en0	                        301
+#define CMD_SET_NETWORK_POWER_EN            	362
+#define CMD_SET_485_en3	                        304
+#define CMD_SET_485_en2                     	303
+#define CMD_SET_SPI_POWER	                    129
+#define CMD_SET_5V_EN                       	363
+#define CMD_SDCARD_DETECT_EN                	364
+#define CMD_SET_PIC1_POWER	                    494
+#define CMD_SET_OTHER_POWER                     493
+#define CMD_SET_ANGLE_POWER                 	492
+#define CMD_SET_PULL_POWER	                    491
+#define CMD_SET_WTH_POWER	                    490
+#define CMD_SET_485_en4	                        305
+#define CMD_LED_CTRL	                        365
+#define CMD_BD_EN                           	366
+#define CMD_ADC_EN	                            367
+#define CMD_SPI2SERIAL_POWER_EN             	368
+#define CMD_RS485_3V3_EN	                    369
+#endif
+#if 0
 
 #define CMD_485_0_DE                            156     // 485_0 DE信号
 #define CMD_485_0_PWR_EN                        157     // 485_0 电源使能

app/src/main/cpp/PhoneDevice.cpp

@@ -3211,15 +3211,17 @@ bool CPhoneDevice::OpenSensors(int sensortype)
     {
         GpioControl::setInt(CMD_SET_CAM_3V3_EN_STATE, 1);
         GpioControl::setInt(CMD_SET_SPI_POWER, 1);
-//    GpioControl::setInt(CMD_SET_5V_EN, 1);
+        GpioControl::setInt(CMD_SET_5V_EN, 1);
         GpioControl::setInt(CMD_SET_485_EN_STATE, 1);
-//        GpioControl::setInt(CMD_SET_12V_EN_STATE, 1);
+        GpioControl::setInt(CMD_SET_12V_EN_STATE, 1);
+        GpioControl::setInt(CMD_RS485_3V3_EN, 1);
     }
     if(sensortype == CAMERA_SENSOR_OPEN)
     {
         GpioControl::setInt(CMD_SET_PIC1_POWER, 1);
         GpioControl::setInt(CMD_SET_485_en4, 1);
-    }else if(sensortype == WEATHER_SENSOR_OPEN || sensortype == ICETHICK_SENSOR_OPEN)
+    }
+    if(sensortype == WEATHER_SENSOR_OPEN || sensortype == ICETHICK_SENSOR_OPEN)
     {
         GpioControl::setInt(CMD_SET_WTH_POWER, 1);
         GpioControl::setInt(CMD_SET_485_en0, 1);
@@ -3245,9 +3247,10 @@ bool CPhoneDevice::CloseSensors(int sensortype)
     {
         GpioControl::setInt(CMD_SET_CAM_3V3_EN_STATE, 0);
         GpioControl::setInt(CMD_SET_SPI_POWER, 0);
-//    GpioControl::setInt(CMD_SET_5V_EN, 1);
+        GpioControl::setInt(CMD_SET_5V_EN, 1);
         GpioControl::setInt(CMD_SET_485_EN_STATE, 0);
-//        GpioControl::setInt(CMD_SET_12V_EN_STATE, 0);
+        GpioControl::setInt(CMD_SET_12V_EN_STATE, 0);
+        GpioControl::setInt(CMD_RS485_3V3_EN, 0);
     }
 
     int     igpio;
@@ -3255,7 +3258,8 @@ bool CPhoneDevice::CloseSensors(int sensortype)
     {
         GpioControl::setInt(CMD_SET_PIC1_POWER, 0);
         GpioControl::setInt(CMD_SET_485_en4, 0);
-    }else if(sensortype == WEATHER_SENSOR_OPEN || sensortype == ICETHICK_SENSOR_OPEN)
+    }
+    if(sensortype == WEATHER_SENSOR_OPEN || sensortype == ICETHICK_SENSOR_OPEN)
     {
         GpioControl::setInt(CMD_SET_WTH_POWER, 0);
         GpioControl::setInt(CMD_SET_485_en0, 0);