Merge remote-tracking branch 'origin/main'

app/src/main/cpp/GPIOControl.h

@@ -68,8 +68,6 @@
 #define CMD_SET_LIGHT_ADC                       102
 #define CMD_GET_CHARGING_BUS_VOLTAGE_STATE      112
 #define CMD_GET_BAT_BUS_VOLTAGE_STATE           117
-//#define CMD_GET_CHARGING_BUS_VOLTAGE_STATE      117
-//#define CMD_GET_BAT_BUS_VOLTAGE_STATE           112
 #define CMD_SET_SPI_MODE                        0       // TO BE ADDED
 #define CMD_SET_SPI_BITS_PER_WORD               0       // TO BE ADDED
 #define CMD_SET_SPI_MAXSPEEDHZ                  0       // TO BE ADDED

app/src/main/cpp/PhoneDevice.cpp

@@ -1570,7 +1570,7 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c
             inet_ntop(AF_INET, &addrIn.sin_addr, buf, sizeof(buf)); //其中recvAddr为SOCKADDR_IN类型
         }
 
-        XYLOG(XYLOG_SEVERITY_INFO, "Ethernet is Available Handle=%ld IP=%s CH=%u PR=%X PHOTOID=%u", (uint64_t)netHandle, buf, (uint32_t)localPhotoInfo.channel, (uint32_t)localPhotoInfo.preset, localPhotoInfo.photoId);
+        XYLOG(XYLOG_SEVERITY_INFO, "Ethernet is Available Handle=%llu IP=%s CH=%u PR=%X PHOTOID=%u", (uint64_t)netHandle, buf, (uint32_t)localPhotoInfo.channel, (uint32_t)localPhotoInfo.preset, localPhotoInfo.photoId);
     }
 
     // SetStaticIp();