Skip to content

Commit 485c371

Browse files
authored
Create a specific hw_model for WisMesh Tap (#5400)
* Create a specific hw_model for WisMesh Tap * Trunk * HAS_ETHERNET * Remove it altogether * Don't need these either
1 parent a255da3 commit 485c371

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

src/gps/GPS.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,8 @@ void GPS::setPowerState(GPSPowerState newState, uint32_t sleepTime)
788788
void GPS::writePinEN(bool on)
789789
{
790790
// Abort: if conflict with Canned Messages when using Wisblock(?)
791-
if (HW_VENDOR == meshtastic_HardwareModel_RAK4631 && (rotaryEncoderInterruptImpl1 || upDownInterruptImpl1))
791+
if ((HW_VENDOR == meshtastic_HardwareModel_RAK4631 || HW_VENDOR == meshtastic_HardwareModel_WISMESH_TAP) &&
792+
(rotaryEncoderInterruptImpl1 || upDownInterruptImpl1))
792793
return;
793794

794795
// Write and log

src/platform/nrf52/architecture.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
#define HW_VENDOR meshtastic_HardwareModel_PPR
4848
#elif defined(RAK2560)
4949
#define HW_VENDOR meshtastic_HardwareModel_RAK2560
50+
#elif defined(WISMESH_TAP)
51+
#define HW_VENDOR meshtastic_HardwareModel_WISMESH_TAP
5052
#elif defined(RAK4630)
5153
#define HW_VENDOR meshtastic_HardwareModel_RAK4631
5254
#elif defined(TTGO_T_ECHO)

variants/rak_wismeshtap/platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[env:rak_wismeshtap]
33
extends = nrf52840_base
44
board = wiscore_rak4631
5-
build_flags = ${nrf52840_base.build_flags} -Ivariants/rak_wismeshtap -D RAK_4631
5+
build_flags = ${nrf52840_base.build_flags} -Ivariants/rak_wismeshtap -DWISMESH_TAP -DRAK_4631
66
-L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
77
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
88
-DEINK_DISPLAY_MODEL=GxEPD2_213_BN

variants/rak_wismeshtap/variant.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -271,13 +271,8 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
271271

272272
#define HAS_RTC 1
273273

274-
#define HAS_ETHERNET 1
275-
276274
#define RAK_4631 1
277275

278-
#define PIN_ETHERNET_RESET 21
279-
#define PIN_ETHERNET_SS PIN_EINK_CS
280-
#define ETH_SPI_PORT SPI1
281276
#define AQ_SET_PIN 10
282277

283278
#ifdef __cplusplus

0 commit comments

Comments
 (0)