some changes and moved a library down a levl from the main varient to…

… some of the rak4631 variants
meshtastic · Dec 6, 2024 · 138414f · 138414f
1 parent 06728f1
commit 138414f
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 2 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -160,4 +160,3 @@ lib_deps =
 	mprograms/[email protected]
 	dfrobot/[email protected]
 	https://github.com/meshtastic/DFRobot_LarkWeatherStation#4de3a9cadef0f6a5220a8a906cf9775b02b0040d
-	beegee-tokyo/RAK12035_SoilMoisture@^1.0.3
diff --git a/src/modules/Telemetry/Sensor/RAK12035VBSensor.cpp b/src/modules/Telemetry/Sensor/RAK12035VBSensor.cpp
@@ -16,7 +16,7 @@ int32_t RAK12035VBSensor::runOnce()
 
     sensor.set_sensor_addr(RAK12035VB_ADDR);
 
-    sensor.begin();
+    sensor.begin(nodeTelemetrySensorsMap[sensorType].first);
     // Get sensor firmware version
 	uint8_t data = 0;
 	sensor.get_sensor_version(&data);

diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini
@@ -20,6 +20,7 @@ lib_deps =
   https://github.com/RAKWireless/RAK13800-W5100S.git#1.0.2
   rakwireless/RAKwireless NCP5623 RGB LED library@^1.0.2
   https://github.com/RAKWireless/RAK12034-BMX160.git#dcead07ffa267d3c906e9ca4a1330ab989e957e2
+  beegee-tokyo/RAK12035_SoilMoisture@^1.0.3
 
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ; Note: as of 6/2013 the serial/bootloader based programming takes approximately 30 seconds

diff --git a/variants/rak4631_epaper/platformio.ini b/variants/rak4631_epaper/platformio.ini
@@ -17,6 +17,7 @@ lib_deps =
   melopero/Melopero RV3028@^1.1.0
   rakwireless/RAKwireless NCP5623 RGB LED library@^1.0.2
   beegee-tokyo/RAKwireless RAK12034@^1.0.0
+  beegee-tokyo/RAK12035_SoilMoisture@^1.0.3
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ;upload_protocol = jlink
diff --git a/variants/rak4631_epaper_onrxtx/platformio.ini b/variants/rak4631_epaper_onrxtx/platformio.ini
@@ -19,6 +19,7 @@ lib_deps =
   melopero/Melopero RV3028@^1.1.0
   rakwireless/RAKwireless NCP5623 RGB LED library@^1.0.2
   beegee-tokyo/RAKwireless RAK12034@^1.0.0
+  beegee-tokyo/RAK12035_SoilMoisture@^1.0.3
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ;upload_protocol = jlink

diff --git a/variants/rak4631_eth_gw/platformio.ini b/variants/rak4631_eth_gw/platformio.ini
@@ -32,6 +32,7 @@ lib_deps =
   rakwireless/RAKwireless NCP5623 RGB LED library@^1.0.2
   https://github.com/meshtastic/RAK12034-BMX160.git#4821355fb10390ba8557dc43ca29a023bcfbb9d9
   bblanchon/ArduinoJson @ 6.21.4
+  beegee-tokyo/RAK12035_SoilMoisture@^1.0.3
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ; Note: as of 6/2013 the serial/bootloader based programming takes approximately 30 seconds
 ;upload_protocol = jlink