mirror of
https://github.com/sipeed/MaixCDK.git
synced 2026-11-09 17:04:38 -06:00
* [maixcam2] Fix gpio3_a2 config incorrect
* [maixcam2] Ignore release display pool warning
This commit is contained in:
@@ -203,9 +203,9 @@
|
||||
std::vector<int> {6, 2}
|
||||
}
|
||||
},
|
||||
{"C2", // GPIO3_A2
|
||||
{"D2", // GPIO3_A2
|
||||
PinInfo {
|
||||
std::vector<std::string> {"GPIOC2"}, // boot/user key
|
||||
std::vector<std::string> {"GPIOD2"}, // boot/user key
|
||||
PinRegInfo {0x02302024, 16, 3},
|
||||
std::vector<int> {0}
|
||||
}
|
||||
|
||||
@@ -374,7 +374,8 @@ namespace maix::display
|
||||
if (pool_id != AX_INVALID_POOLID) {
|
||||
ret = AX_POOL_DestroyPool(pool_id);
|
||||
if (ret != 0) {
|
||||
log::info("AX_POOL_DestroyPool failed, PoolId = 0x%d, ret:%#xn", pool_id, ret);
|
||||
// do nothing
|
||||
// log::info("AX_POOL_DestroyPool failed, PoolId = 0x%d, ret:%#x", pool_id, ret);
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
@@ -403,11 +404,11 @@ namespace maix::display
|
||||
err::Err reset(int size, int count) {
|
||||
err::Err ret = err::ERR_NONE;
|
||||
if (size != _pool_size || count != _pool_count) {
|
||||
if ((ret = deinit()) == err::ERR_NONE) {
|
||||
if ((ret = deinit()) != err::ERR_NONE) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
if ((ret = init(size, count)) == err::ERR_NONE) {
|
||||
if ((ret = init(size, count)) != err::ERR_NONE) {
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user