xymp
/
TermApp
3
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

优化

Browse Source
hdrplus
Matthew 7 months ago
parent 7cd424953a
commit 7cfe23f078
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File

4
app/src/main/cpp/GPIOControl.h
Unescape Escape View File

@ -92,7 +92,7 @@
#define CMD_SET_485_EN0 301 #define CMD_SET_485_EN0 301
#define CMD_SET_NETWORK_POWER_EN 362 #define CMD_SET_NETWORK_POWER_EN 362
#define CMD_SET_485_EN3 304 #define CMD_SET_485_EN3 304
#define CMD_SET_485_en2 303 #define CMD_SET_485_EN2 303
#define CMD_SET_SPI_POWER 129 #define CMD_SET_SPI_POWER 129
#define CMD_SET_5V_EN 363 #define CMD_SET_5V_EN 363
#define CMD_SDCARD_DETECT_EN 364 #define CMD_SDCARD_DETECT_EN 364
@ -101,7 +101,7 @@
#define CMD_SET_ANGLE_POWER 492 #define CMD_SET_ANGLE_POWER 492
#define CMD_SET_PULL_POWER 491 #define CMD_SET_PULL_POWER 491
#define CMD_SET_WTH_POWER 490 #define CMD_SET_WTH_POWER 490
#define CMD_SET_485_en4 305 #define CMD_SET_485_EN4 305
#define CMD_LED_CTRL 365 #define CMD_LED_CTRL 365
#define CMD_BD_EN 366 #define CMD_BD_EN 366
#define CMD_ADC_EN 367 #define CMD_ADC_EN 367

8
app/src/main/cpp/PhoneDevice.cpp
Unescape Escape View File

@ -3248,7 +3248,7 @@ bool CPhoneDevice::OpenSensors(int sensortype)
if(sensortype == CAMERA_SENSOR_OPEN) if(sensortype == CAMERA_SENSOR_OPEN)
{ {
GpioControl::setInt(CMD_SET_PIC1_POWER, 1); GpioControl::setInt(CMD_SET_PIC1_POWER, 1);
GpioControl::setInt(CMD_SET_485_en4, 1); GpioControl::setInt(CMD_SET_485_EN4, 1);
// GpioControl::setInt(CMD_SET_CAM_3V3_EN_STATE, 1); // 打开3.3V电压 // GpioControl::setInt(CMD_SET_CAM_3V3_EN_STATE, 1); // 打开3.3V电压
// GpioControl::setInt(CMD_SET_3V3_PWR_ENABLE, 1); // GpioControl::setInt(CMD_SET_3V3_PWR_ENABLE, 1);
#ifndef USING_N938 #ifndef USING_N938
@ -3270,7 +3270,7 @@ bool CPhoneDevice::OpenSensors(int sensortype)
if(sensortype == OTHER_SENSOR) if(sensortype == OTHER_SENSOR)
{ {
GpioControl::setInt(CMD_SET_OTHER_POWER, 1); GpioControl::setInt(CMD_SET_OTHER_POWER, 1);
GpioControl::setInt(CMD_SET_485_en2, 1); GpioControl::setInt(CMD_SET_485_EN2, 1);
} }
return 0; return 0;
} }
@ -3295,7 +3295,7 @@ bool CPhoneDevice::CloseSensors(int sensortype)
if(sensortype == CAMERA_SENSOR_OPEN) if(sensortype == CAMERA_SENSOR_OPEN)
{ {
GpioControl::setInt(CMD_SET_PIC1_POWER, 0); GpioControl::setInt(CMD_SET_PIC1_POWER, 0);
GpioControl::setInt(CMD_SET_485_en4, 0); GpioControl::setInt(CMD_SET_485_EN4, 0);
// GpioControl::setInt(CMD_SET_CAM_3V3_EN_STATE, 0); // GpioControl::setInt(CMD_SET_CAM_3V3_EN_STATE, 0);
#ifndef USING_N938 #ifndef USING_N938
GpioControl::setInt(CMD_SET_3V3_PWR_ENABLE, 0); GpioControl::setInt(CMD_SET_3V3_PWR_ENABLE, 0);
@ -3317,7 +3317,7 @@ bool CPhoneDevice::CloseSensors(int sensortype)
if(sensortype == OTHER_SENSOR) if(sensortype == OTHER_SENSOR)
{ {
GpioControl::setInt(CMD_SET_OTHER_POWER, 0); GpioControl::setInt(CMD_SET_OTHER_POWER, 0);
GpioControl::setInt(CMD_SET_485_en2, 0); GpioControl::setInt(CMD_SET_485_EN2, 0);
} }
return 0; return 0;
} }

24
app/src/main/cpp/SensorsProtocol.cpp
Unescape Escape View File

@ -605,23 +605,23 @@ void Gm_CloseSensorsPower()
setInt(CMD_SET_SPI_POWER, 1); setInt(CMD_SET_SPI_POWER, 1);
setInt(CMD_SET_485_EN0, 1); setInt(CMD_SET_485_EN0, 1);
setInt(CMD_SET_485_EN1, 1); setInt(CMD_SET_485_EN1, 1);
setInt(CMD_SET_485_en2, 1); setInt(CMD_SET_485_EN2, 1);
setInt(CMD_SET_485_EN3, 1); setInt(CMD_SET_485_EN3, 1);
setInt(CMD_SET_485_en4, 1); setInt(CMD_SET_485_EN4, 1);
#else #else
setInt(CMD_SET_SPI_POWER, 0); setInt(CMD_SET_SPI_POWER, 0);
setInt(CMD_SET_485_EN0, 0); setInt(CMD_SET_485_EN0, 0);
setInt(CMD_SET_485_EN1, 0); setInt(CMD_SET_485_EN1, 0);
setInt(CMD_SET_485_en2, 0); setInt(CMD_SET_485_EN2, 0);
setInt(CMD_SET_485_EN3, 0); setInt(CMD_SET_485_EN3, 0);
setInt(CMD_SET_485_en4, 0); setInt(CMD_SET_485_EN4, 0);
sleep(3); sleep(3);
igpio = getInt(CMD_SET_SPI_POWER); igpio = getInt(CMD_SET_SPI_POWER);
igpio = getInt(CMD_SET_485_EN0); igpio = getInt(CMD_SET_485_EN0);
igpio = getInt(CMD_SET_485_EN1); igpio = getInt(CMD_SET_485_EN1);
igpio = getInt(CMD_SET_485_en2); igpio = getInt(CMD_SET_485_EN2);
igpio = getInt(CMD_SET_485_EN3); igpio = getInt(CMD_SET_485_EN3);
igpio = getInt(CMD_SET_485_en4); igpio = getInt(CMD_SET_485_EN4);
#endif #endif
*/ */
} }
@ -665,24 +665,24 @@ void Gm_OpenSensorsPower()
setInt(CMD_SET_SPI_POWER, 1); setInt(CMD_SET_SPI_POWER, 1);
setInt(CMD_SET_485_EN0, 1); setInt(CMD_SET_485_EN0, 1);
setInt(CMD_SET_485_EN1, 1); setInt(CMD_SET_485_EN1, 1);
setInt(CMD_SET_485_en2, 1); setInt(CMD_SET_485_EN2, 1);
setInt(CMD_SET_485_EN3, 1); setInt(CMD_SET_485_EN3, 1);
setInt(CMD_SET_485_en4, 1); setInt(CMD_SET_485_EN4, 1);
//sleep(3); //sleep(3);
igpio = getInt(CMD_SET_SPI_POWER); igpio = getInt(CMD_SET_SPI_POWER);
igpio = getInt(CMD_SET_485_EN0); igpio = getInt(CMD_SET_485_EN0);
igpio = getInt(CMD_SET_485_EN1); igpio = getInt(CMD_SET_485_EN1);
igpio = getInt(CMD_SET_485_en2); igpio = getInt(CMD_SET_485_EN2);
igpio = getInt(CMD_SET_485_EN3); igpio = getInt(CMD_SET_485_EN3);
igpio = getInt(CMD_SET_485_en4); igpio = getInt(CMD_SET_485_EN4);
#else #else
setInt(CMD_SET_485_EN0, 0); setInt(CMD_SET_485_EN0, 0);
setInt(CMD_SET_485_EN1, 0); setInt(CMD_SET_485_EN1, 0);
setInt(CMD_SET_485_en2, 0); setInt(CMD_SET_485_EN2, 0);
setInt(CMD_SET_485_EN3, 0); setInt(CMD_SET_485_EN3, 0);
setInt(CMD_SET_485_en4, 0); setInt(CMD_SET_485_EN4, 0);
#endif #endif
// 打开电源 // 打开电源

Write Preview
Loading…
Cancel
Save