rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-21 18:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

conflict resolution

Browse Source
This commit is contained in:
Thomas Göttgens
2024-10-08 11:41:54 +02:00
parent 37f294d0a6 e6e05dda1e
commit 9d9258a59b
11 changed files with 758 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/motion/MotionSensor.cpp
View File

@@ -29,7 +29,7 @@ ScanI2C::I2CPort MotionSensor::devicePort()
return device.address.port;
}
#ifdef RAK_4631
#if defined(RAK_4631) & !MESHTASTIC_EXCLUDE_SCREEN
void MotionSensor::drawFrameCalibration(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
{
// int x_offset = display->width() / 2;