conflict resolution

src/motion/BMX160Sensor.cpp

@@ -5,9 +5,11 @@
 BMX160Sensor::BMX160Sensor(ScanI2C::FoundDevice foundDevice) : MotionSensor::MotionSensor(foundDevice) {}
 
 #ifdef RAK_4631
+#if !defined(MESHTASTIC_EXCLUDE_SCREEN)
 
 // screen is defined in main.cpp
 extern graphics::Screen *screen;
+#endif
 
 bool BMX160Sensor::init()
 {
@@ -29,6 +31,7 @@ int32_t BMX160Sensor::runOnce()
     /* Get a new sensor event */
     sensor.getAllData(&magAccel, NULL, &gAccel);
 
+#if !defined(MESHTASTIC_EXCLUDE_SCREEN)
     // experimental calibrate routine. Limited to between 10 and 30 seconds after boot
     if (millis() > 12 * 1000 && millis() < 30 * 1000) {
         if (!showingScreen) {
@@ -91,6 +94,7 @@ int32_t BMX160Sensor::runOnce()
         break;
     }
     screen->setHeading(heading);
+#endif
 
     return MOTION_SENSOR_CHECK_INTERVAL_MS;
 }

src/motion/MotionSensor.cpp

@@ -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;

src/motion/MotionSensor.h

@@ -46,7 +46,7 @@ class MotionSensor
     // Register a button press when a double-tap is detected
     virtual void buttonPress();
 
-#ifdef RAK_4631
+#if defined(RAK_4631) & !MESHTASTIC_EXCLUDE_SCREEN
     // draw an OLED frame (currently only used by the RAK4631 BMX160 sensor)
     static void drawFrameCalibration(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
 #endif