pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-06 03:29:17 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'master' into tft-gui-work

Browse Source
This commit is contained in:
Tom Fifield 2024-12-27 18:01:18 +11:00 committed by GitHub
commit 08fb8ae013
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/detect/ScanI2CTwoWire.cpp
View File

@ -458,11 +458,11 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
i2cBus->endTransmission(); i2cBus->endTransmission();
len = i2cBus->readBytes(info, 5); len = i2cBus->readBytes(info, 5);
if (len == 5 && memcmp(expectedInfo, info, len) == 0) { if (len == 5 && memcmp(expectedInfo, info, len) == 0) {
LOG_INFO("NXP SE050 crypto chip found\n"); LOG_INFO("NXP SE050 crypto chip found");
type = NXP_SE050; type = NXP_SE050;
} else { } else {
LOG_INFO("FT6336U touchscreen found\n"); LOG_INFO("FT6336U touchscreen found");
type = FT6336U; type = FT6336U;
} }
break; break;

2
src/input/MPR121Keyboard.cpp
View File

@ -87,7 +87,7 @@ uint8_t MPR121_KeyMap[12] = {2, 5, 8, 11, 1, 4, 7, 10, 0, 3, 6, 9};
MPR121Keyboard::MPR121Keyboard() : m_wire(nullptr), m_addr(0), readCallback(nullptr), writeCallback(nullptr) MPR121Keyboard::MPR121Keyboard() : m_wire(nullptr), m_addr(0), readCallback(nullptr), writeCallback(nullptr)
{ {
// LOG_DEBUG("MPR121 @ %02x\n", m_addr); // LOG_DEBUG("MPR121 @ %02x", m_addr);
state = Init; state = Init;
last_key = -1; last_key = -1;
last_tap = 0L; last_tap = 0L;

6
src/input/TouchScreenBase.cpp
View File

@ -113,13 +113,13 @@ int32_t TouchScreenBase::runOnce()
if (_tapped) { if (_tapped) {
_tapped = false; _tapped = false;
e.touchEvent = static_cast<char>(TOUCH_ACTION_TAP); e.touchEvent = static_cast<char>(TOUCH_ACTION_TAP);
LOG_DEBUG("action TAP(%d/%d)\n", _last_x, _last_y); LOG_DEBUG("action TAP(%d/%d)", _last_x, _last_y);
} }
} else { } else {
if (_tapped && (time_t(millis()) - _start) > TIME_LONG_PRESS - 50) { if (_tapped && (time_t(millis()) - _start) > TIME_LONG_PRESS - 50) {
_tapped = false; _tapped = false;
e.touchEvent = static_cast<char>(TOUCH_ACTION_TAP); e.touchEvent = static_cast<char>(TOUCH_ACTION_TAP);
LOG_DEBUG("action TAP(%d/%d)\n", _last_x, _last_y); LOG_DEBUG("action TAP(%d/%d)", _last_x, _last_y);
} }
} }
#else #else
@ -156,4 +156,4 @@ void TouchScreenBase::hapticFeedback()
drv.setWaveform(1, 0); // end waveform drv.setWaveform(1, 0); // end waveform
drv.go(); drv.go();
#endif #endif
} }

2
src/mesh/PhoneAPI.cpp
View File

@ -668,4 +668,4 @@ int PhoneAPI::onNotify(uint32_t newValue)
} }
return timeout ? -1 : 0; // If we timed out, MeshService should stop iterating through observers as we just removed one return timeout ? -1 : 0; // If we timed out, MeshService should stop iterating through observers as we just removed one
} }

4
src/modules/AdminModule.cpp
View File

@ -489,7 +489,7 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
IS_ONE_OF(config.device.role, meshtastic_Config_DeviceConfig_Role_ROUTER, IS_ONE_OF(config.device.role, meshtastic_Config_DeviceConfig_Role_ROUTER,
meshtastic_Config_DeviceConfig_Role_REPEATER)) { meshtastic_Config_DeviceConfig_Role_REPEATER)) {
config.device.rebroadcast_mode = meshtastic_Config_DeviceConfig_RebroadcastMode_ALL; config.device.rebroadcast_mode = meshtastic_Config_DeviceConfig_RebroadcastMode_ALL;
const char *warning = "Rebroadcast mode can't be set to NONE for a router or repeater\n"; const char *warning = "Rebroadcast mode can't be set to NONE for a router or repeater";
LOG_WARN(warning); LOG_WARN(warning);
sendWarning(warning); sendWarning(warning);
} }
@ -1157,4 +1157,4 @@ void disableBluetooth()
nrf52Bluetooth->shutdown(); nrf52Bluetooth->shutdown();
#endif #endif
#endif #endif
} }

6
src/motion/QMA6100PSensor.cpp
View File

@ -88,13 +88,13 @@ bool QMA6100PSingleton::init(ScanI2C::FoundDevice device)
bool status = begin(device.address.address, &Wire); bool status = begin(device.address.address, &Wire);
#endif #endif
if (status != true) { if (status != true) {
LOG_WARN("QMA6100P init begin failed\n"); LOG_WARN("QMA6100P init begin failed");
return false; return false;
} }
delay(20); delay(20);
// SW reset to make sure the device starts in a known state // SW reset to make sure the device starts in a known state
if (softwareReset() != true) { if (softwareReset() != true) {
LOG_WARN("QMA6100P init reset failed\n"); LOG_WARN("QMA6100P init reset failed");
return false; return false;
} }
delay(20); delay(20);
@ -180,4 +180,4 @@ bool QMA6100PSingleton::setWakeOnMotion()
return true; return true;
} }
#endif #endif

2
variants/rak2560/RAK9154Sensor.cpp
View File

@ -180,4 +180,4 @@ bool RAK9154Sensor::isCharging()
{ {
return (dc_cur > 0) ? true : false; return (dc_cur > 0) ? true : false;
} }
#endif // HAS_RAKPROT #endif // HAS_RAKPROT