From 6f94c8148a54c6f31d85303e973e64d8686e7285 Mon Sep 17 00:00:00 2001 From: Normunds Gavars Date: Tue, 1 Jul 2025 01:56:34 +0300 Subject: [PATCH 01/10] Add Minewsemi ME25LS01 variant --- boards/minewsemi_me25ls01.json | 59 +++++ src/helpers/nrf52/MinewsemiME25LS01Board.cpp | 92 ++++++++ src/helpers/nrf52/MinewsemiME25LS01Board.h | 112 ++++++++++ .../minewsemi_me25ls01/NullDisplayDriver.h | 24 ++ variants/minewsemi_me25ls01/platformio.ini | 184 +++++++++++++++ variants/minewsemi_me25ls01/target.cpp | 209 ++++++++++++++++++ variants/minewsemi_me25ls01/target.h | 46 ++++ variants/minewsemi_me25ls01/variant.cpp | 98 ++++++++ variants/minewsemi_me25ls01/variant.h | 147 ++++++++++++ 9 files changed, 971 insertions(+) create mode 100644 boards/minewsemi_me25ls01.json create mode 100644 src/helpers/nrf52/MinewsemiME25LS01Board.cpp create mode 100644 src/helpers/nrf52/MinewsemiME25LS01Board.h create mode 100644 variants/minewsemi_me25ls01/NullDisplayDriver.h create mode 100644 variants/minewsemi_me25ls01/platformio.ini create mode 100644 variants/minewsemi_me25ls01/target.cpp create mode 100644 variants/minewsemi_me25ls01/target.h create mode 100644 variants/minewsemi_me25ls01/variant.cpp create mode 100644 variants/minewsemi_me25ls01/variant.h diff --git a/boards/minewsemi_me25ls01.json b/boards/minewsemi_me25ls01.json new file mode 100644 index 00000000..4c943158 --- /dev/null +++ b/boards/minewsemi_me25ls01.json @@ -0,0 +1,59 @@ +{ + "build": { + "arduino": { + "ldscript": "nrf52840_s140_v7.ld" + }, + "core": "nRF5", + "cpu": "cortex-m4", + "extra_flags": "-DARDUINO_WIO_WM1110 -DNRF52840_XXAA", + "f_cpu": "64000000L", + "hwids": [ + ["0x239A", "0x8029"], + ["0x239A", "0x0029"], + ["0x239A", "0x002A"], + ["0x239A", "0x802A"] + ], + "usb_product": "me25ls01-BOOT", + "mcu": "nrf52840", + "variant": "minewsemi_me25ls01", + "bsp": { + "name": "adafruit" + }, + "softdevice": { + "sd_flags": "-DS140", + "sd_name": "s140", + "sd_version": "7.3.0", + "sd_fwid": "0x0123" + }, + "bootloader": { + "settings_addr": "0xFF000" + } + }, + "connectivity": ["bluetooth"], + "debug": { + "jlink_device": "nRF52840_xxAA", + "svd_path": "nrf52840.svd", + "openocd_target": "nrf52.cfg" + }, + "frameworks": ["arduino"], + "name": "Minewsemi ME25LS01", + "upload": { + "maximum_ram_size": 248832, + "maximum_size": 815104, + "speed": 115200, + "protocol": "nrfutil", + "protocols": [ + "jlink", + "nrfjprog", + "nrfutil", + "stlink", + "cmsis-dap", + "blackmagic" + ], + "use_1200bps_touch": true, + "require_upload_port": true, + "wait_for_upload_port": true + }, + "url": "https://en.minewsemi.com/lora-module/lr1110-nrf52840-me25LS01", + "vendor": "MINEWSEMI" +} diff --git a/src/helpers/nrf52/MinewsemiME25LS01Board.cpp b/src/helpers/nrf52/MinewsemiME25LS01Board.cpp new file mode 100644 index 00000000..f402a0fd --- /dev/null +++ b/src/helpers/nrf52/MinewsemiME25LS01Board.cpp @@ -0,0 +1,92 @@ +#include +#include "MinewsemiME25LS01Board.h" +#include + +#include + +void MinewsemiME25LS01Board::begin() { + // for future use, sub-classes SHOULD call this from their begin() + startup_reason = BD_STARTUP_NORMAL; + btn_prev_state = HIGH; + + sd_power_mode_set(NRF_POWER_MODE_LOWPWR); + +#ifdef BUTTON_PIN + // pinMode(BATTERY_PIN, INPUT); + pinMode(BUTTON_PIN, INPUT); + pinMode(LED_PIN, OUTPUT); +#endif + +#if defined(PIN_BOARD_SDA) && defined(PIN_BOARD_SCL) + Wire.setPins(PIN_BOARD_SDA, PIN_BOARD_SCL); +#endif + + Wire.begin(); + +#ifdef P_LORA_TX_LED + pinMode(P_LORA_TX_LED, OUTPUT); + digitalWrite(P_LORA_TX_LED, LOW); +#endif + + delay(10); // give sx1262 some time to power up +} + +#if 0 +static BLEDfu bledfu; + +static void connect_callback(uint16_t conn_handle) { + (void)conn_handle; + MESH_DEBUG_PRINTLN("BLE client connected"); +} + +static void disconnect_callback(uint16_t conn_handle, uint8_t reason) { + (void)conn_handle; + (void)reason; + + MESH_DEBUG_PRINTLN("BLE client disconnected"); +} + + +bool TrackerT1000eBoard::startOTAUpdate(const char* id, char reply[]) { + // Config the peripheral connection with maximum bandwidth + // more SRAM required by SoftDevice + // Note: All config***() function must be called before begin() + Bluefruit.configPrphBandwidth(BANDWIDTH_MAX); + Bluefruit.configPrphConn(92, BLE_GAP_EVENT_LENGTH_MIN, 16, 16); + + Bluefruit.begin(1, 0); + // Set max power. Accepted values are: -40, -30, -20, -16, -12, -8, -4, 0, 4 + Bluefruit.setTxPower(4); + // Set the BLE device name + Bluefruit.setName("T1000E_OTA"); + + Bluefruit.Periph.setConnectCallback(connect_callback); + Bluefruit.Periph.setDisconnectCallback(disconnect_callback); + + // To be consistent OTA DFU should be added first if it exists + bledfu.begin(); + + // Set up and start advertising + // Advertising packet + Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE); + Bluefruit.Advertising.addTxPower(); + Bluefruit.Advertising.addName(); + + /* Start Advertising + - Enable auto advertising if disconnected + - Interval: fast mode = 20 ms, slow mode = 152.5 ms + - Timeout for fast mode is 30 seconds + - Start(timeout) with timeout = 0 will advertise forever (until connected) + + For recommended advertising interval + https://developer.apple.com/library/content/qa/qa1931/_index.html + */ + Bluefruit.Advertising.restartOnDisconnect(true); + Bluefruit.Advertising.setInterval(32, 244); // in unit of 0.625 ms + Bluefruit.Advertising.setFastTimeout(30); // number of seconds in fast mode + Bluefruit.Advertising.start(0); // 0 = Don't stop advertising after n seconds + + strcpy(reply, "OK - started"); + return true; +} +#endif \ No newline at end of file diff --git a/src/helpers/nrf52/MinewsemiME25LS01Board.h b/src/helpers/nrf52/MinewsemiME25LS01Board.h new file mode 100644 index 00000000..4b8c8293 --- /dev/null +++ b/src/helpers/nrf52/MinewsemiME25LS01Board.h @@ -0,0 +1,112 @@ +#pragma once + +#include +#include + +// LoRa and SPI pins + +#define P_LORA_DIO_1 (32 + 12) // P1.12 +#define P_LORA_NSS (32 + 13) // P1.13 +#define P_LORA_RESET (32 + 11) // P1.11 +#define P_LORA_BUSY (32 + 10) // P1.10 +#define P_LORA_SCLK (32 + 15) // P1.15 +#define P_LORA_MISO (0 + 29) // P0.29 +#define P_LORA_MOSI (0 + 2) // P0.2 + +#define LR11X0_DIO_AS_RF_SWITCH true +#define LR11X0_DIO3_TCXO_VOLTAGE 1.6 + +// built-ins +//#define PIN_VBAT_READ 5 +//#define ADC_MULTIPLIER (3 * 1.73 * 1000) + +class MinewsemiME25LS01Board : public mesh::MainBoard { +protected: + uint8_t startup_reason; + uint8_t btn_prev_state; + +public: + void begin(); + + uint16_t getBattMilliVolts() override { + #ifdef BATTERY_PIN + #ifdef PIN_3V3_EN + digitalWrite(PIN_3V3_EN, HIGH); + #endif + analogReference(AR_INTERNAL_3_0); + analogReadResolution(12); + delay(10); + float volts = (analogRead(BATTERY_PIN) * ADC_MULTIPLIER * AREF_VOLTAGE) / 4096; + #ifdef PIN_3V3_EN + digitalWrite(PIN_3V3_EN, LOW); + #endif + + analogReference(AR_DEFAULT); // put back to default + analogReadResolution(10); + + return volts * 1000; + #else + return 0; + #endif + } + + uint8_t getStartupReason() const override { return startup_reason; } + + const char* getManufacturerName() const override { + return "m25ls01"; + } + + int buttonStateChanged() { + #ifdef BUTTON_PIN + uint8_t v = digitalRead(BUTTON_PIN); + if (v != btn_prev_state) { + btn_prev_state = v; + return (v == LOW) ? 1 : -1; + } + #endif + return 0; + } + + void powerOff() override { + #ifdef HAS_GPS + digitalWrite(GPS_VRTC_EN, LOW); + digitalWrite(GPS_RESET, LOW); + digitalWrite(GPS_SLEEP_INT, LOW); + digitalWrite(GPS_RTC_INT, LOW); + pinMode(GPS_RESETB, OUTPUT); + digitalWrite(GPS_RESETB, LOW); + #endif + + #ifdef BUZZER_EN + digitalWrite(BUZZER_EN, LOW); + #endif + + #ifdef PIN_3V3_EN + digitalWrite(PIN_3V3_EN, LOW); + #endif + + #ifdef LED_PIN + digitalWrite(LED_PIN, LOW); + #endif + #ifdef BUTTON_PIN + nrf_gpio_cfg_sense_input(digitalPinToInterrupt(BUTTON_PIN), NRF_GPIO_PIN_PULLUP, NRF_GPIO_PIN_SENSE_HIGH); + #endif + sd_power_system_off(); + } + + #if defined(P_LORA_TX_LED) + void onBeforeTransmit() override { + digitalWrite(P_LORA_TX_LED, HIGH);// turn TX LED on + } + void onAfterTransmit() override { + digitalWrite(P_LORA_TX_LED, LOW); // turn TX LED off + } +#endif + + + void reboot() override { + NVIC_SystemReset(); + } + +// bool startOTAUpdate(const char* id, char reply[]) override; +}; \ No newline at end of file diff --git a/variants/minewsemi_me25ls01/NullDisplayDriver.h b/variants/minewsemi_me25ls01/NullDisplayDriver.h new file mode 100644 index 00000000..38bf93f1 --- /dev/null +++ b/variants/minewsemi_me25ls01/NullDisplayDriver.h @@ -0,0 +1,24 @@ +#pragma once + +#include + +class NullDisplayDriver : public DisplayDriver { +public: + NullDisplayDriver() : DisplayDriver(128, 64) { } + bool begin() { return false; } // not present + + bool isOn() override { return false; } + void turnOn() override { } + void turnOff() override { } + void clear() override { } + void startFrame(Color bkg = DARK) override { } + void setTextSize(int sz) override { } + void setColor(Color c) override { } + void setCursor(int x, int y) override { } + void print(const char* str) override { } + void fillRect(int x, int y, int w, int h) override { } + void drawRect(int x, int y, int w, int h) override { } + void drawXbm(int x, int y, const uint8_t* bits, int w, int h) override { } + uint16_t getTextWidth(const char* str) override { return 0; } + void endFrame() { } +}; diff --git a/variants/minewsemi_me25ls01/platformio.ini b/variants/minewsemi_me25ls01/platformio.ini new file mode 100644 index 00000000..4775e289 --- /dev/null +++ b/variants/minewsemi_me25ls01/platformio.ini @@ -0,0 +1,184 @@ +; ----------------- NRF52 me25ls01--------------------- +[nrf52840_me25ls01] +extends = nrf52_base +platform_packages = framework-arduinoadafruitnrf52 +build_flags = ${nrf52_base.build_flags} + -I src/helpers/nrf52 + -I lib/nrf52/s140_nrf52_7.3.0_API/include + -I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52 +lib_ignore = + BluetoothOTA + lvgl + lib5b4 +lib_deps = + ${nrf52_base.lib_deps} + rweather/Crypto @ ^0.4.0 + +[me25ls01] +extends = nrf52840_me25ls01 +board = minewsemi_me25ls01 +board_build.ldscript = boards/nrf52840_s140_v7.ld +build_flags = ${nrf52840_me25ls01.build_flags} + -I variants/minewsemi_me25ls01 + -D me25ls01 + -D PIN_USER_BTN=27 + -D USER_BTN_PRESSED=HIGH + -D PIN_STATUS_LED=39 + -D P_LORA_TX_LED=22 + -D RADIO_CLASS=CustomLR1110 + -D WRAPPER_CLASS=CustomLR1110Wrapper + -D LORA_TX_POWER=22 + -D ENV_INCLUDE_GPS=0 + -D ENV_INCLUDE_AHTX0=1 + -D ENV_INCLUDE_BME280=1 + -D ENV_INCLUDE_INA3221=1 + -D ENV_INCLUDE_INA219=1 +build_src_filter = ${nrf52840_me25ls01.build_src_filter} + + + + + +<../variants/minewsemi_me25ls01> + + +debug_tool = jlink +upload_protocol = nrfutil +lib_deps = ${nrf52840_me25ls01.lib_deps} + densaugeo/base64 @ ~1.4.0 + stevemarple/MicroNMEA @ ^2.0.6 + end2endzone/NonBlockingRTTTL@^1.3.0 + adafruit/Adafruit SSD1306 @ ^2.5.13 + adafruit/Adafruit INA3221 Library @ ^1.0.1 + adafruit/Adafruit INA219 @ ^1.2.3 + adafruit/Adafruit AHTX0 @ ^2.0.5 + adafruit/Adafruit BME280 Library @ ^2.3.0 + +[env:Minewsemi_me25ls01_companion_radio_ble] +extends = me25ls01 +build_flags = ${me25ls01.build_flags} + -D MAX_CONTACTS=100 + -D MAX_GROUP_CHANNELS=8 + -D BLE_PIN_CODE=123456 +; -D BLE_DEBUG_LOGGING=1 + -D MESH_PACKET_LOGGING=1 + -D MESH_DEBUG=1 + -D OFFLINE_QUEUE_SIZE=256 + -D RX_BOOSTED_GAIN=true + -D RF_SWITCH_TABLE + -D DISPLAY_CLASS=NullDisplayDriver + ;-D PIN_BUZZER=25 + ;-D PIN_BUZZER_EN=37 +build_src_filter = ${me25ls01.build_src_filter} + + + ;+ + +<../examples/companion_radio/*.cpp> +lib_deps = ${me25ls01.lib_deps} + adafruit/RTClib @ ^2.1.3 + + +[env:Minewsemi_me25ls01_repeater] +extends = me25ls01 +build_flags = ${me25ls01.build_flags} + -D MAX_CONTACTS=100 + -D MAX_GROUP_CHANNELS=8 + -D BLE_PIN_CODE=123456 +; -D BLE_DEBUG_LOGGING=1 + -D MESH_PACKET_LOGGING=1 + -D MESH_DEBUG=1 + -D OFFLINE_QUEUE_SIZE=256 + -D RX_BOOSTED_GAIN=true + -D RF_SWITCH_TABLE + -D ADVERT_NAME='"ME25LS01 Repeater"' + -D ADVERT_LAT=0.0 + -D ADVERT_LON=0.0 + -D ADMIN_PASSWORD='"password"' + -D MAX_NEIGHBOURS=8 + -D DISPLAY_CLASS=NullDisplayDriver +build_src_filter = ${me25ls01.build_src_filter} + ;+ + ;+ + ;+<../examples/companion_radio/*.cpp> + +<../examples/simple_repeater> +lib_deps = ${me25ls01.lib_deps} + adafruit/RTClib @ ^2.1.3 + + + +[env:Minewsemi_me25ls01_room_server] +extends = me25ls01 +build_flags = ${me25ls01.build_flags} + -D MAX_CONTACTS=100 + -D MAX_GROUP_CHANNELS=8 +; -D BLE_PIN_CODE=123456 +; -D BLE_DEBUG_LOGGING=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 + -D OFFLINE_QUEUE_SIZE=256 + -D RX_BOOSTED_GAIN=true + -D RF_SWITCH_TABLE + -D ADVERT_NAME='"ME25LS01 Room"' + -D ADVERT_LAT=0.0 + -D ADVERT_LON=0.0 + -D ADMIN_PASSWORD='"password"' + -D ROOM_PASSWORD='"hello"' + -D MAX_NEIGHBOURS=8 + -D DISPLAY_CLASS=NullDisplayDriver +build_src_filter = ${me25ls01.build_src_filter} + ;+ + ;+ + ;+<../examples/companion_radio/*.cpp> + ;+<../examples/simple_repeater> + +<../examples/simple_room_server> +lib_deps = ${me25ls01.lib_deps} + adafruit/RTClib @ ^2.1.3 + +[env:Minewsemi_me25ls01_terminal_chat] +extends = me25ls01 +build_flags = ${me25ls01.build_flags} + -D MAX_CONTACTS=100 + -D MAX_GROUP_CHANNELS=8 + -D BLE_PIN_CODE=123456 +; -D BLE_DEBUG_LOGGING=1 + -D MESH_PACKET_LOGGING=1 + -D MESH_DEBUG=1 + -D OFFLINE_QUEUE_SIZE=256 + -D RX_BOOSTED_GAIN=true + -D RF_SWITCH_TABLE + -D ADVERT_NAME='"ME25LS01 Chat"' + -D ADVERT_LAT=0.0 + -D ADVERT_LON=0.0 + -D ADMIN_PASSWORD='"password"' + -D ROOM_PASSWORD='"hello"' + -D MAX_NEIGHBOURS=8 + -D DISPLAY_CLASS=NullDisplayDriver +build_src_filter = ${me25ls01.build_src_filter} + ;+ + ;+ + ;+<../examples/companion_radio/*.cpp> + ;+<../examples/simple_repeater> + ;+<../examples/simple_room_server> + +<../examples/simple_secure_chat/main.cpp> +lib_deps = ${me25ls01.lib_deps} + adafruit/RTClib @ ^2.1.3 + +[env:Minewsemi_me25ls01_companion_radio_usb] +extends = me25ls01 +build_flags = ${me25ls01.build_flags} + -D MAX_CONTACTS=100 + -D MAX_GROUP_CHANNELS=8 + ;-D BLE_PIN_CODE=123456 +; -D BLE_DEBUG_LOGGING=1 + -D MESH_PACKET_LOGGING=1 + -D MESH_DEBUG=1 + -D OFFLINE_QUEUE_SIZE=256 + -D RX_BOOSTED_GAIN=true + -D RF_SWITCH_TABLE + -D DISPLAY_CLASS=NullDisplayDriver +build_src_filter = ${me25ls01.build_src_filter} + + + ;+ + ;+ + ;+<../examples/companion_radio/*.cpp> + ;+<../examples/simple_repeater> + ;+<../examples/simple_room_server> + +<../examples/companion_radio> +lib_deps = ${me25ls01.lib_deps} + adafruit/RTClib @ ^2.1.3 + diff --git a/variants/minewsemi_me25ls01/target.cpp b/variants/minewsemi_me25ls01/target.cpp new file mode 100644 index 00000000..b6b1b585 --- /dev/null +++ b/variants/minewsemi_me25ls01/target.cpp @@ -0,0 +1,209 @@ +#include +//#include "t1000e_sensors.h" +#include "target.h" +#include + +MinewsemiME25LS01Board board; + +RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI); + +WRAPPER_CLASS radio_driver(radio, board); + +VolatileRTCClock rtc_clock; +MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); +//T1000SensorManager sensors = T1000SensorManager(nmea); +me25ls01SensorManager sensors = me25ls01SensorManager(nmea); + +#ifdef DISPLAY_CLASS + NullDisplayDriver display; +#endif + +#ifndef LORA_CR + #define LORA_CR 5 +#endif + +#ifdef RF_SWITCH_TABLE +static const uint32_t rfswitch_dios[Module::RFSWITCH_MAX_PINS] = { + RADIOLIB_LR11X0_DIO5, + RADIOLIB_LR11X0_DIO6, + RADIOLIB_LR11X0_DIO7, + RADIOLIB_LR11X0_DIO8, + RADIOLIB_NC +}; + +static const Module::RfSwitchMode_t rfswitch_table[] = { + // mode DIO5 DIO6 DIO7 DIO8 + { LR11x0::MODE_STBY, {LOW, LOW, LOW, LOW }}, + { LR11x0::MODE_RX, {HIGH, LOW, LOW, HIGH }}, + { LR11x0::MODE_TX, {HIGH, HIGH, LOW, HIGH }}, + { LR11x0::MODE_TX_HP, {LOW, HIGH, LOW, HIGH }}, + { LR11x0::MODE_TX_HF, {LOW, LOW, LOW, LOW }}, + { LR11x0::MODE_GNSS, {LOW, LOW, HIGH, LOW }}, + { LR11x0::MODE_WIFI, {LOW, LOW, LOW, LOW }}, + END_OF_MODE_TABLE, +}; +#endif + +bool radio_init() { + //rtc_clock.begin(Wire); + +#ifdef LR11X0_DIO3_TCXO_VOLTAGE + float tcxo = LR11X0_DIO3_TCXO_VOLTAGE; +#else + float tcxo = 1.6f; +#endif + + SPI.setPins(P_LORA_MISO, P_LORA_SCLK, P_LORA_MOSI); + SPI.begin(); + int status = radio.begin(LORA_FREQ, LORA_BW, LORA_SF, LORA_CR, RADIOLIB_LR11X0_LORA_SYNC_WORD_PRIVATE, LORA_TX_POWER, 16, tcxo); + if (status != RADIOLIB_ERR_NONE) { + Serial.print("ERROR: radio init failed: "); + Serial.println(status); + return false; // fail + } + + radio.setCRC(1); + +#ifdef RF_SWITCH_TABLE + radio.setRfSwitchTable(rfswitch_dios, rfswitch_table); +#endif +#ifdef RX_BOOSTED_GAIN + radio.setRxBoostedGainMode(RX_BOOSTED_GAIN); +#endif + + return true; // success +} + +uint32_t radio_get_rng_seed() { + return radio.random(0x7FFFFFFF); +} + +void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) { + radio.setFrequency(freq); + radio.setSpreadingFactor(sf); + radio.setBandwidth(bw); + radio.setCodingRate(cr); +} + +void radio_set_tx_power(uint8_t dbm) { + radio.setOutputPower(dbm); +} + +mesh::LocalIdentity radio_new_identity() { + RadioNoiseListener rng(radio); + return mesh::LocalIdentity(&rng); // create new random identity +} + +void me25ls01SensorManager::start_gps() { + gps_active = false; + //_nmea->begin(); + // this init sequence should be better + // comes from seeed examples and deals with all gps pins + // pinMode(GPS_EN, OUTPUT); + // digitalWrite(GPS_EN, HIGH); + // delay(10); + // pinMode(GPS_VRTC_EN, OUTPUT); + // digitalWrite(GPS_VRTC_EN, HIGH); + // delay(10); + + // pinMode(GPS_RESET, OUTPUT); + // digitalWrite(GPS_RESET, HIGH); + // delay(10); + // digitalWrite(GPS_RESET, LOW); + + // pinMode(GPS_SLEEP_INT, OUTPUT); + // digitalWrite(GPS_SLEEP_INT, HIGH); + // pinMode(GPS_RTC_INT, OUTPUT); + // digitalWrite(GPS_RTC_INT, LOW); + // pinMode(GPS_RESETB, INPUT_PULLUP); +} + +void me25ls01SensorManager::sleep_gps() { + gps_active = false; + // digitalWrite(GPS_VRTC_EN, HIGH); + // digitalWrite(GPS_EN, LOW); + // digitalWrite(GPS_RESET, HIGH); + // digitalWrite(GPS_SLEEP_INT, HIGH); + // digitalWrite(GPS_RTC_INT, LOW); + // pinMode(GPS_RESETB, OUTPUT); + // digitalWrite(GPS_RESETB, LOW); + //_nmea->stop(); +} + +void me25ls01SensorManager::stop_gps() { + gps_active = false; + // digitalWrite(GPS_VRTC_EN, LOW); + // digitalWrite(GPS_EN, LOW); + // digitalWrite(GPS_RESET, HIGH); + // digitalWrite(GPS_SLEEP_INT, HIGH); + // digitalWrite(GPS_RTC_INT, LOW); + // pinMode(GPS_RESETB, OUTPUT); + // digitalWrite(GPS_RESETB, LOW); + // //_nmea->stop(); +} + + +bool me25ls01SensorManager::begin() { + // init GPS + Serial1.begin(115200); + + // make sure gps pin are off + // digitalWrite(GPS_VRTC_EN, LOW); + // digitalWrite(GPS_RESET, LOW); + // digitalWrite(GPS_SLEEP_INT, LOW); + // digitalWrite(GPS_RTC_INT, LOW); + // pinMode(GPS_RESETB, OUTPUT); + // digitalWrite(GPS_RESETB, LOW); + + return true; +} + +bool me25ls01SensorManager::querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) { + if (requester_permissions & TELEM_PERM_LOCATION) { // does requester have permission? + //telemetry.addGPS(TELEM_CHANNEL_SELF, node_lat, node_lon, node_altitude); + } + if (requester_permissions & TELEM_PERM_ENVIRONMENT) { + //telemetry.addLuminosity(TELEM_CHANNEL_SELF, t1000e_get_light()); + //telemetry.addTemperature(TELEM_CHANNEL_SELF, t1000e_get_temperature()); + } + return true; +} + +void me25ls01SensorManager::loop() { + static long next_gps_update = 0; + + //_nmea->loop(); + + // if (millis() > next_gps_update) { + // if (_nmea->isValid()) { + // node_lat = ((double)_nmea->getLatitude())/1000000.; + // node_lon = ((double)_nmea->getLongitude())/1000000.; + // node_altitude = ((double)_nmea->getAltitude()) / 1000.0; + // //Serial.printf("lat %f lon %f\r\n", _lat, _lon); + // } + // next_gps_update = millis() + 1000; + //} +} + +int me25ls01SensorManager::getNumSettings() const { return 1; } // just one supported: "gps" (power switch) + +const char* me25ls01SensorManager::getSettingName(int i) const { + return i == 0 ? "gps" : NULL; +} +const char* me25ls01SensorManager::getSettingValue(int i) const { + if (i == 0) { + return gps_active ? "1" : "0"; + } + return NULL; +} +bool me25ls01SensorManager::setSettingValue(const char* name, const char* value) { + if (strcmp(name, "gps") == 0) { + // if (strcmp(value, "0") == 0) { + // sleep_gps(); // sleep for faster fix ! + // } else { + // start_gps(); + // } + return true; + } + return false; // not supported +} diff --git a/variants/minewsemi_me25ls01/target.h b/variants/minewsemi_me25ls01/target.h new file mode 100644 index 00000000..e5354a10 --- /dev/null +++ b/variants/minewsemi_me25ls01/target.h @@ -0,0 +1,46 @@ +#pragma once + +#define RADIOLIB_STATIC_ONLY 1 +#include +#include +#include +#include +#include +#include +#include +#ifdef DISPLAY_CLASS + #include "NullDisplayDriver.h" +#endif + +class me25ls01SensorManager: public SensorManager { + bool gps_active = false; + LocationProvider * _nmea; + + void start_gps(); + void sleep_gps(); + void stop_gps(); +public: + me25ls01SensorManager(LocationProvider &nmea): _nmea(&nmea) { } + bool begin() override; + bool querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) override; + void loop() override; + int getNumSettings() const override; + const char* getSettingName(int i) const override; + const char* getSettingValue(int i) const override; + bool setSettingValue(const char* name, const char* value) override; +}; + +#ifdef DISPLAY_CLASS + extern NullDisplayDriver display; +#endif + +extern MinewsemiME25LS01Board board; +extern WRAPPER_CLASS radio_driver; +extern VolatileRTCClock rtc_clock; +extern me25ls01SensorManager sensors; + +bool radio_init(); +uint32_t radio_get_rng_seed(); +void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr); +void radio_set_tx_power(uint8_t dbm); +mesh::LocalIdentity radio_new_identity(); diff --git a/variants/minewsemi_me25ls01/variant.cpp b/variants/minewsemi_me25ls01/variant.cpp new file mode 100644 index 00000000..5440e600 --- /dev/null +++ b/variants/minewsemi_me25ls01/variant.cpp @@ -0,0 +1,98 @@ +/* + * variant.cpp + * Copyright (C) 2023 Seeed K.K. + * MIT License + */ + +#include "variant.h" +#include "wiring_constants.h" +#include "wiring_digital.h" + +const uint32_t g_ADigitalPinMap[PINS_COUNT + 1] = +{ + 0, // P0.00 + 1, // P0.01 + 2, // P0.02, AIN0 BATTERY_PIN + 3, // P0.03 + 4, // P0.04, SENSOR_EN + 5, // P0.05, EXT_PWR_DETEC + 6, // P0.06, PIN_BUTTON1 + 7, // P0.07, LORA_BUSY + 8, // P0.08, GPS_VRTC_EN + 9, // P0.09 + 10, // P0.10 + 11, // P0.11, PIN_SPI_SCK + 12, // P0.12, PIN_SPI_NSS + 13, // P0.13, PIN_SERIAL1_TX + 14, // P0.14, PIN_SERIAL1_RX + 15, // P0.15, GPS_RTC_INT + 16, // P0.16, PIN_SERIAL2_TX + 17, // P0.17, PIN_SERIAL2_RX + 18, // P0.18 + 19, // P0.19 + 20, // P0.20 + 21, // P0.21 + 22, // P0.22 + 23, // P0.23 + 24, // P0.24, LED_GREEN + 25, // P0.25, BUZZER_PIN + 26, // P0.26, PIN_WIRE_SDA + 27, // P0.27, PIN_WIRE_SCL + 28, // P0.28 + 29, // P0.29, AIN5, LUX_SENSOR + 30, // P0.30 + 31, // P0.31, AIN7, TEMP_SENSOR + 32, // P1.00 + 33, // P1.01, LORA_DIO_1 + 34, // P1.02 + 35, // P1.03, EXT_CHRG_DETECT + 36, // P1.04 + 37, // P1.05, LR1110_EN + 38, // P1.06, 3V3_EN PWR TO SENSORS + 39, // P1.07, PIN_3V3_ACC_EN + 40, // P1.08, PIN_SPI_MISO + 41, // P1.09, PIN_SPI_MOSI + 42, // P1.10, LORA_RESET + 43, // P1.11, GPS_EN + 44, // P1.12, GPS_SLEEP_INT + 45, // P1.13 + 46, // P1.14, GPS_RESETB + 47, // P1.15, PIN_GPS_RESET + 255, // NRFX_SPIM_PIN_NOT_USED +}; + +void initVariant() +{ + // All pins output HIGH by default. + // https://github.com/Seeed-Studio/Adafruit_nRF52_Arduino/blob/fab7d30a997a1dfeef9d1d59bfb549adda73815a/cores/nRF5/wiring.c#L65-L69 + + pinMode(BATTERY_PIN, INPUT); + pinMode(EXT_CHRG_DETECT, INPUT); + pinMode(EXT_PWR_DETECT, INPUT); + // pinMode(GPS_RESETB, INPUT); + pinMode(PIN_BUTTON1, INPUT); + + pinMode(PIN_3V3_EN, OUTPUT); + pinMode(PIN_3V3_ACC_EN, OUTPUT); + // pinMode(BUZZER_EN, OUTPUT); + // pinMode(SENSOR_EN, OUTPUT); + // pinMode(GPS_EN, OUTPUT); + // pinMode(GPS_RESET, OUTPUT); + // pinMode(GPS_VRTC_EN, OUTPUT); + // pinMode(GPS_SLEEP_INT, OUTPUT); + // pinMode(GPS_RTC_INT, OUTPUT); + pinMode(LED_PIN, OUTPUT); + pinMode(P_LORA_TX_LED, OUTPUT); + + // digitalWrite(PIN_3V3_EN, LOW); + // digitalWrite(PIN_3V3_ACC_EN, LOW); + // digitalWrite(BUZZER_EN, LOW); + // digitalWrite(SENSOR_EN, LOW); + // digitalWrite(GPS_EN, LOW); + // digitalWrite(GPS_RESET, LOW); + // digitalWrite(GPS_VRTC_EN, LOW); + // digitalWrite(GPS_SLEEP_INT, HIGH); + // digitalWrite(GPS_RTC_INT, LOW); + digitalWrite(LED_PIN, HIGH); + digitalWrite(P_LORA_TX_LED, LOW); +} diff --git a/variants/minewsemi_me25ls01/variant.h b/variants/minewsemi_me25ls01/variant.h new file mode 100644 index 00000000..d085a4b9 --- /dev/null +++ b/variants/minewsemi_me25ls01/variant.h @@ -0,0 +1,147 @@ +/* + * variant.h + * Copyright (C) 2023 Seeed K.K. + * MIT License + */ + +#pragma once + +#include "WVariant.h" + +//////////////////////////////////////////////////////////////////////////////// +// Low frequency clock source + +#define USE_LFXO // 32.768 kHz crystal oscillator +#define VARIANT_MCK (64000000ul) +// #define USE_LFRC // 32.768 kHz RC oscillator + +//////////////////////////////////////////////////////////////////////////////// +// Power + +#define NRF_APM // detect usb power +#define PIN_3V3_EN (32 + 5) // P1.6 Power to Sensors +#define PIN_3V3_ACC_EN -1 + +#define BATTERY_PIN (-1) // P0.2/AIN0 +#define BATTERY_IMMUTABLE +#define ADC_MULTIPLIER (2.0F) + +#define EXT_CHRG_DETECT (-1) // P1.3 +#define EXT_PWR_DETECT (-1) // P0.5 + +#define ADC_RESOLUTION (14) +#define BATTERY_SENSE_RES (12) + +#define AREF_VOLTAGE (3.0) + +//////////////////////////////////////////////////////////////////////////////// +// Number of pins + +#define PINS_COUNT (48) +#define NUM_DIGITAL_PINS (48) +#define NUM_ANALOG_INPUTS (6) +#define NUM_ANALOG_OUTPUTS (0) + +//////////////////////////////////////////////////////////////////////////////// +// UART pin definition + +#define PIN_SERIAL1_RX (14) // P0.14 - checked +#define PIN_SERIAL1_TX (13) // P0.13 - checked + +#define PIN_SERIAL2_RX (17) // P0.17 - checked +#define PIN_SERIAL2_TX (16) // P0.16 - checked + +//////////////////////////////////////////////////////////////////////////////// +// I2C pin definition + +#define HAS_WIRE (1) // checked +#define WIRE_INTERFACES_COUNT (1) // checked + +#define PIN_WIRE_SDA (15) // P0.26 - checked +#define PIN_WIRE_SCL (17) // P0.27 - checked +#define I2C_NO_RESCAN +// #define HAS_QMA6100P +// #define QMA_6100P_INT_PIN (-1) // P1.2 + +//////////////////////////////////////////////////////////////////////////////// +// SPI pin definition + +#define SPI_INTERFACES_COUNT (1) + +#define PIN_SPI_MISO (0 + 29) // P0.29 +#define PIN_SPI_MOSI (0 + 2) // P0.2 +#define PIN_SPI_SCK (32 + 15) // P1.15 +#define PIN_SPI_NSS (32 + 13) // P1.13 + +//////////////////////////////////////////////////////////////////////////////// +// Builtin LEDs + +#define LED_BUILTIN (-1) +#define LED_RED (32 + 5) // P1.5 +#define LED_BLUE (32 + 7) // P1.7 +#define LED_PIN LED_BLUE +#define P_LORA_TX_LED LED_RED + +#define LED_STATE_ON HIGH + +//////////////////////////////////////////////////////////////////////////////// +// Builtin buttons + +#define PIN_BUTTON1 (0 + 27) // P0.6 +#define BUTTON_PIN PIN_BUTTON1 + +//////////////////////////////////////////////////////////////////////////////// +// LR1110 + +#define LORA_DIO_1 (32 + 12) // P1.12 +#define LORA_DIO_2 (32 + 10) // P1.10 +#define LORA_NSS (PIN_SPI_NSS) // P1.13 +#define LORA_RESET (32 + 11) // P1.11 +#define LORA_BUSY (32 + 10) // P1.10 +#define LORA_SCLK (PIN_SPI_SCK) // P1.15 +#define LORA_MISO (PIN_SPI_MISO) // P0.29 +#define LORA_MOSI (PIN_SPI_MOSI) // P0.2 +#define LORA_CS PIN_SPI_NSS // P1.13 + +#define LR11X0_DIO_AS_RF_SWITCH true +#define LR11X0_DIO3_TCXO_VOLTAGE 1.6 + +#define LR1110_IRQ_PIN LORA_DIO_1 +#define LR1110_NRESET_PIN LORA_RESET +#define LR1110_BUSY_PIN LORA_DIO_2 +#define LR1110_SPI_NSS_PIN LORA_CS +#define LR1110_SPI_SCK_PIN LORA_SCLK +#define LR1110_SPI_MOSI_PIN LORA_MOSI +#define LR1110_SPI_MISO_PIN LORA_MISO +//////////////////////////////////////////////////////////////////////////////// +// GPS + +//#define HAS_GPS 0 +#define GPS_RX_PIN PIN_SERIAL1_RX +#define GPS_TX_PIN PIN_SERIAL1_TX + +#define GPS_EN (-1) // P1.11 +#define GPS_RESET (-1) // P1.15 + +#define GPS_VRTC_EN (-1) // P0.8 +#define GPS_SLEEP_INT (-1) // P1.12 +#define GPS_RTC_INT (-1) // P0.15 +#define GPS_RESETB (-1) // P1.14 + +//////////////////////////////////////////////////////////////////////////////// +// Temp+Lux Sensor + +#define SENSOR_EN (-1) // P0.4 +#define TEMP_SENSOR (-1) // P0.31/AIN7 +#define LUX_SENSOR (-1) // P0.29/AIN5 + +//////////////////////////////////////////////////////////////////////////////// +// Accelerometer (I2C addr : ??? ) + +#define PIN_3V3_ACC_EN (-1) // P1.7 + +//////////////////////////////////////////////////////////////////////////////// +// Buzzer + +#define BUZZER_EN (-1) // P1.5 +#define BUZZER_PIN (0 + 25) // P0.25 \ No newline at end of file From af2628bb00ec8306b15520438c23c0bc39608257 Mon Sep 17 00:00:00 2001 From: Normunds Gavars Date: Wed, 2 Jul 2025 12:27:39 +0300 Subject: [PATCH 02/10] Use EnvironmentSensorManager in Minewsemi variant --- variants/minewsemi_me25ls01/target.cpp | 129 ++---------------------- variants/minewsemi_me25ls01/target.h | 21 +--- variants/minewsemi_me25ls01/variant.cpp | 6 -- variants/minewsemi_me25ls01/variant.h | 6 -- 4 files changed, 11 insertions(+), 151 deletions(-) diff --git a/variants/minewsemi_me25ls01/target.cpp b/variants/minewsemi_me25ls01/target.cpp index b6b1b585..13306762 100644 --- a/variants/minewsemi_me25ls01/target.cpp +++ b/variants/minewsemi_me25ls01/target.cpp @@ -1,7 +1,5 @@ #include -//#include "t1000e_sensors.h" #include "target.h" -#include MinewsemiME25LS01Board board; @@ -10,9 +8,14 @@ RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BU WRAPPER_CLASS radio_driver(radio, board); VolatileRTCClock rtc_clock; -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); -//T1000SensorManager sensors = T1000SensorManager(nmea); -me25ls01SensorManager sensors = me25ls01SensorManager(nmea); +extern EnvironmentSensorManager sensors; +#if ENV_INCLUDE_GPS + #include + MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); +#else + EnvironmentSensorManager sensors; +#endif #ifdef DISPLAY_CLASS NullDisplayDriver display; @@ -92,118 +95,4 @@ void radio_set_tx_power(uint8_t dbm) { mesh::LocalIdentity radio_new_identity() { RadioNoiseListener rng(radio); return mesh::LocalIdentity(&rng); // create new random identity -} - -void me25ls01SensorManager::start_gps() { - gps_active = false; - //_nmea->begin(); - // this init sequence should be better - // comes from seeed examples and deals with all gps pins - // pinMode(GPS_EN, OUTPUT); - // digitalWrite(GPS_EN, HIGH); - // delay(10); - // pinMode(GPS_VRTC_EN, OUTPUT); - // digitalWrite(GPS_VRTC_EN, HIGH); - // delay(10); - - // pinMode(GPS_RESET, OUTPUT); - // digitalWrite(GPS_RESET, HIGH); - // delay(10); - // digitalWrite(GPS_RESET, LOW); - - // pinMode(GPS_SLEEP_INT, OUTPUT); - // digitalWrite(GPS_SLEEP_INT, HIGH); - // pinMode(GPS_RTC_INT, OUTPUT); - // digitalWrite(GPS_RTC_INT, LOW); - // pinMode(GPS_RESETB, INPUT_PULLUP); -} - -void me25ls01SensorManager::sleep_gps() { - gps_active = false; - // digitalWrite(GPS_VRTC_EN, HIGH); - // digitalWrite(GPS_EN, LOW); - // digitalWrite(GPS_RESET, HIGH); - // digitalWrite(GPS_SLEEP_INT, HIGH); - // digitalWrite(GPS_RTC_INT, LOW); - // pinMode(GPS_RESETB, OUTPUT); - // digitalWrite(GPS_RESETB, LOW); - //_nmea->stop(); -} - -void me25ls01SensorManager::stop_gps() { - gps_active = false; - // digitalWrite(GPS_VRTC_EN, LOW); - // digitalWrite(GPS_EN, LOW); - // digitalWrite(GPS_RESET, HIGH); - // digitalWrite(GPS_SLEEP_INT, HIGH); - // digitalWrite(GPS_RTC_INT, LOW); - // pinMode(GPS_RESETB, OUTPUT); - // digitalWrite(GPS_RESETB, LOW); - // //_nmea->stop(); -} - - -bool me25ls01SensorManager::begin() { - // init GPS - Serial1.begin(115200); - - // make sure gps pin are off - // digitalWrite(GPS_VRTC_EN, LOW); - // digitalWrite(GPS_RESET, LOW); - // digitalWrite(GPS_SLEEP_INT, LOW); - // digitalWrite(GPS_RTC_INT, LOW); - // pinMode(GPS_RESETB, OUTPUT); - // digitalWrite(GPS_RESETB, LOW); - - return true; -} - -bool me25ls01SensorManager::querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) { - if (requester_permissions & TELEM_PERM_LOCATION) { // does requester have permission? - //telemetry.addGPS(TELEM_CHANNEL_SELF, node_lat, node_lon, node_altitude); - } - if (requester_permissions & TELEM_PERM_ENVIRONMENT) { - //telemetry.addLuminosity(TELEM_CHANNEL_SELF, t1000e_get_light()); - //telemetry.addTemperature(TELEM_CHANNEL_SELF, t1000e_get_temperature()); - } - return true; -} - -void me25ls01SensorManager::loop() { - static long next_gps_update = 0; - - //_nmea->loop(); - - // if (millis() > next_gps_update) { - // if (_nmea->isValid()) { - // node_lat = ((double)_nmea->getLatitude())/1000000.; - // node_lon = ((double)_nmea->getLongitude())/1000000.; - // node_altitude = ((double)_nmea->getAltitude()) / 1000.0; - // //Serial.printf("lat %f lon %f\r\n", _lat, _lon); - // } - // next_gps_update = millis() + 1000; - //} -} - -int me25ls01SensorManager::getNumSettings() const { return 1; } // just one supported: "gps" (power switch) - -const char* me25ls01SensorManager::getSettingName(int i) const { - return i == 0 ? "gps" : NULL; -} -const char* me25ls01SensorManager::getSettingValue(int i) const { - if (i == 0) { - return gps_active ? "1" : "0"; - } - return NULL; -} -bool me25ls01SensorManager::setSettingValue(const char* name, const char* value) { - if (strcmp(name, "gps") == 0) { - // if (strcmp(value, "0") == 0) { - // sleep_gps(); // sleep for faster fix ! - // } else { - // start_gps(); - // } - return true; - } - return false; // not supported -} +} \ No newline at end of file diff --git a/variants/minewsemi_me25ls01/target.h b/variants/minewsemi_me25ls01/target.h index e5354a10..aad55757 100644 --- a/variants/minewsemi_me25ls01/target.h +++ b/variants/minewsemi_me25ls01/target.h @@ -8,28 +8,11 @@ #include #include #include +#include #ifdef DISPLAY_CLASS #include "NullDisplayDriver.h" #endif -class me25ls01SensorManager: public SensorManager { - bool gps_active = false; - LocationProvider * _nmea; - - void start_gps(); - void sleep_gps(); - void stop_gps(); -public: - me25ls01SensorManager(LocationProvider &nmea): _nmea(&nmea) { } - bool begin() override; - bool querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) override; - void loop() override; - int getNumSettings() const override; - const char* getSettingName(int i) const override; - const char* getSettingValue(int i) const override; - bool setSettingValue(const char* name, const char* value) override; -}; - #ifdef DISPLAY_CLASS extern NullDisplayDriver display; #endif @@ -37,7 +20,7 @@ public: extern MinewsemiME25LS01Board board; extern WRAPPER_CLASS radio_driver; extern VolatileRTCClock rtc_clock; -extern me25ls01SensorManager sensors; +extern EnvironmentSensorManager sensors; bool radio_init(); uint32_t radio_get_rng_seed(); diff --git a/variants/minewsemi_me25ls01/variant.cpp b/variants/minewsemi_me25ls01/variant.cpp index 5440e600..a6b6eaab 100644 --- a/variants/minewsemi_me25ls01/variant.cpp +++ b/variants/minewsemi_me25ls01/variant.cpp @@ -1,9 +1,3 @@ -/* - * variant.cpp - * Copyright (C) 2023 Seeed K.K. - * MIT License - */ - #include "variant.h" #include "wiring_constants.h" #include "wiring_digital.h" diff --git a/variants/minewsemi_me25ls01/variant.h b/variants/minewsemi_me25ls01/variant.h index d085a4b9..de57a65e 100644 --- a/variants/minewsemi_me25ls01/variant.h +++ b/variants/minewsemi_me25ls01/variant.h @@ -1,9 +1,3 @@ -/* - * variant.h - * Copyright (C) 2023 Seeed K.K. - * MIT License - */ - #pragma once #include "WVariant.h" From 6440bcaf48ddfb37d0f281928127f565d064c5c2 Mon Sep 17 00:00:00 2001 From: Normunds Gavars Date: Thu, 3 Jul 2025 00:07:50 +0300 Subject: [PATCH 03/10] Clean up pins in variant.h --- variants/minewsemi_me25ls01/variant.cpp | 64 ++++++++----------------- variants/minewsemi_me25ls01/variant.h | 60 ++++------------------- 2 files changed, 31 insertions(+), 93 deletions(-) diff --git a/variants/minewsemi_me25ls01/variant.cpp b/variants/minewsemi_me25ls01/variant.cpp index a6b6eaab..15f30d14 100644 --- a/variants/minewsemi_me25ls01/variant.cpp +++ b/variants/minewsemi_me25ls01/variant.cpp @@ -6,44 +6,44 @@ const uint32_t g_ADigitalPinMap[PINS_COUNT + 1] = { 0, // P0.00 1, // P0.01 - 2, // P0.02, AIN0 BATTERY_PIN + 2, // P0.02 3, // P0.03 - 4, // P0.04, SENSOR_EN - 5, // P0.05, EXT_PWR_DETEC - 6, // P0.06, PIN_BUTTON1 - 7, // P0.07, LORA_BUSY - 8, // P0.08, GPS_VRTC_EN + 4, // P0.04 + 5, // P0.05 + 6, // P0.06 + 7, // P0.07 + 8, // P0.08 9, // P0.09 10, // P0.10 - 11, // P0.11, PIN_SPI_SCK - 12, // P0.12, PIN_SPI_NSS + 11, // P0.11 + 12, // P0.12 13, // P0.13, PIN_SERIAL1_TX 14, // P0.14, PIN_SERIAL1_RX - 15, // P0.15, GPS_RTC_INT - 16, // P0.16, PIN_SERIAL2_TX - 17, // P0.17, PIN_SERIAL2_RX + 15, // P0.15, PIN_SERIAL2_RX + 16, // P0.16, PIN_WIRE_SCL + 17, // P0.17, PIN_SERIAL2_TX 18, // P0.18 19, // P0.19 20, // P0.20 - 21, // P0.21 + 21, // P0.21, PIN_WIRE_SDA 22, // P0.22 23, // P0.23 - 24, // P0.24, LED_GREEN - 25, // P0.25, BUZZER_PIN - 26, // P0.26, PIN_WIRE_SDA - 27, // P0.27, PIN_WIRE_SCL + 24, // P0.24, + 25, // P0.25, + 26, // P0.26, + 27, // P0.27, 28, // P0.28 - 29, // P0.29, AIN5, LUX_SENSOR + 29, // P0.29, 30, // P0.30 - 31, // P0.31, AIN7, TEMP_SENSOR + 31, // P0.31, 32, // P1.00 33, // P1.01, LORA_DIO_1 34, // P1.02 - 35, // P1.03, EXT_CHRG_DETECT + 35, // P1.03, 36, // P1.04 37, // P1.05, LR1110_EN - 38, // P1.06, 3V3_EN PWR TO SENSORS - 39, // P1.07, PIN_3V3_ACC_EN + 38, // P1.06, + 39, // P1.07, 40, // P1.08, PIN_SPI_MISO 41, // P1.09, PIN_SPI_MOSI 42, // P1.10, LORA_RESET @@ -57,36 +57,14 @@ const uint32_t g_ADigitalPinMap[PINS_COUNT + 1] = void initVariant() { - // All pins output HIGH by default. - // https://github.com/Seeed-Studio/Adafruit_nRF52_Arduino/blob/fab7d30a997a1dfeef9d1d59bfb549adda73815a/cores/nRF5/wiring.c#L65-L69 - pinMode(BATTERY_PIN, INPUT); - pinMode(EXT_CHRG_DETECT, INPUT); - pinMode(EXT_PWR_DETECT, INPUT); - // pinMode(GPS_RESETB, INPUT); pinMode(PIN_BUTTON1, INPUT); pinMode(PIN_3V3_EN, OUTPUT); pinMode(PIN_3V3_ACC_EN, OUTPUT); - // pinMode(BUZZER_EN, OUTPUT); - // pinMode(SENSOR_EN, OUTPUT); - // pinMode(GPS_EN, OUTPUT); - // pinMode(GPS_RESET, OUTPUT); - // pinMode(GPS_VRTC_EN, OUTPUT); - // pinMode(GPS_SLEEP_INT, OUTPUT); - // pinMode(GPS_RTC_INT, OUTPUT); pinMode(LED_PIN, OUTPUT); pinMode(P_LORA_TX_LED, OUTPUT); - // digitalWrite(PIN_3V3_EN, LOW); - // digitalWrite(PIN_3V3_ACC_EN, LOW); - // digitalWrite(BUZZER_EN, LOW); - // digitalWrite(SENSOR_EN, LOW); - // digitalWrite(GPS_EN, LOW); - // digitalWrite(GPS_RESET, LOW); - // digitalWrite(GPS_VRTC_EN, LOW); - // digitalWrite(GPS_SLEEP_INT, HIGH); - // digitalWrite(GPS_RTC_INT, LOW); digitalWrite(LED_PIN, HIGH); digitalWrite(P_LORA_TX_LED, LOW); } diff --git a/variants/minewsemi_me25ls01/variant.h b/variants/minewsemi_me25ls01/variant.h index de57a65e..bbf15ff6 100644 --- a/variants/minewsemi_me25ls01/variant.h +++ b/variants/minewsemi_me25ls01/variant.h @@ -9,10 +9,7 @@ #define VARIANT_MCK (64000000ul) // #define USE_LFRC // 32.768 kHz RC oscillator -//////////////////////////////////////////////////////////////////////////////// // Power - -#define NRF_APM // detect usb power #define PIN_3V3_EN (32 + 5) // P1.6 Power to Sensors #define PIN_3V3_ACC_EN -1 @@ -20,46 +17,33 @@ #define BATTERY_IMMUTABLE #define ADC_MULTIPLIER (2.0F) -#define EXT_CHRG_DETECT (-1) // P1.3 -#define EXT_PWR_DETECT (-1) // P0.5 - #define ADC_RESOLUTION (14) #define BATTERY_SENSE_RES (12) #define AREF_VOLTAGE (3.0) -//////////////////////////////////////////////////////////////////////////////// // Number of pins - #define PINS_COUNT (48) #define NUM_DIGITAL_PINS (48) #define NUM_ANALOG_INPUTS (6) #define NUM_ANALOG_OUTPUTS (0) -//////////////////////////////////////////////////////////////////////////////// // UART pin definition +#define PIN_SERIAL1_RX (14) // P0.14 +#define PIN_SERIAL1_TX (13) // P0.13 -#define PIN_SERIAL1_RX (14) // P0.14 - checked -#define PIN_SERIAL1_TX (13) // P0.13 - checked +#define PIN_SERIAL2_RX (15) // P0.15 +#define PIN_SERIAL2_TX (17) // P0.17 -#define PIN_SERIAL2_RX (17) // P0.17 - checked -#define PIN_SERIAL2_TX (16) // P0.16 - checked - -//////////////////////////////////////////////////////////////////////////////// // I2C pin definition +#define HAS_WIRE (1) +#define WIRE_INTERFACES_COUNT (1) -#define HAS_WIRE (1) // checked -#define WIRE_INTERFACES_COUNT (1) // checked - -#define PIN_WIRE_SDA (15) // P0.26 - checked -#define PIN_WIRE_SCL (17) // P0.27 - checked +#define PIN_WIRE_SDA (21) // P0.21 +#define PIN_WIRE_SCL (16) // P0.16 #define I2C_NO_RESCAN -// #define HAS_QMA6100P -// #define QMA_6100P_INT_PIN (-1) // P1.2 -//////////////////////////////////////////////////////////////////////////////// // SPI pin definition - #define SPI_INTERFACES_COUNT (1) #define PIN_SPI_MISO (0 + 29) // P0.29 @@ -67,9 +51,7 @@ #define PIN_SPI_SCK (32 + 15) // P1.15 #define PIN_SPI_NSS (32 + 13) // P1.13 -//////////////////////////////////////////////////////////////////////////////// // Builtin LEDs - #define LED_BUILTIN (-1) #define LED_RED (32 + 5) // P1.5 #define LED_BLUE (32 + 7) // P1.7 @@ -78,15 +60,12 @@ #define LED_STATE_ON HIGH -//////////////////////////////////////////////////////////////////////////////// // Builtin buttons #define PIN_BUTTON1 (0 + 27) // P0.6 #define BUTTON_PIN PIN_BUTTON1 -//////////////////////////////////////////////////////////////////////////////// // LR1110 - #define LORA_DIO_1 (32 + 12) // P1.12 #define LORA_DIO_2 (32 + 10) // P1.10 #define LORA_NSS (PIN_SPI_NSS) // P1.13 @@ -107,10 +86,9 @@ #define LR1110_SPI_SCK_PIN LORA_SCLK #define LR1110_SPI_MOSI_PIN LORA_MOSI #define LR1110_SPI_MISO_PIN LORA_MISO -//////////////////////////////////////////////////////////////////////////////// -// GPS -//#define HAS_GPS 0 +// GPS +#define HAS_GPS 0 #define GPS_RX_PIN PIN_SERIAL1_RX #define GPS_TX_PIN PIN_SERIAL1_TX @@ -121,21 +99,3 @@ #define GPS_SLEEP_INT (-1) // P1.12 #define GPS_RTC_INT (-1) // P0.15 #define GPS_RESETB (-1) // P1.14 - -//////////////////////////////////////////////////////////////////////////////// -// Temp+Lux Sensor - -#define SENSOR_EN (-1) // P0.4 -#define TEMP_SENSOR (-1) // P0.31/AIN7 -#define LUX_SENSOR (-1) // P0.29/AIN5 - -//////////////////////////////////////////////////////////////////////////////// -// Accelerometer (I2C addr : ??? ) - -#define PIN_3V3_ACC_EN (-1) // P1.7 - -//////////////////////////////////////////////////////////////////////////////// -// Buzzer - -#define BUZZER_EN (-1) // P1.5 -#define BUZZER_PIN (0 + 25) // P0.25 \ No newline at end of file From ec98d5f8a51dc497259610a4038ac25a35dbe112 Mon Sep 17 00:00:00 2001 From: Lloyd Date: Wed, 2 Jul 2025 23:41:31 +0100 Subject: [PATCH 04/10] BLE: Remove ScanResponse.addName() to fix re-advertising after disconnect Removed the call to Bluefruit.ScanResponse.addName() in startAdv(), as it was preventing BLE from reliably restarting advertising after a disconnect. Hypothesis: adding the device name to the scan response exceeds internal buffer limits or causes a conflict with advertising timing, leading to the BLE stack silently failing to re-advertise. Tested successfully (on T-1000) without this line, advertising now resumes correctly after disconnection (on Iphone) --- src/helpers/nrf52/SerialBLEInterface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/helpers/nrf52/SerialBLEInterface.cpp b/src/helpers/nrf52/SerialBLEInterface.cpp index f43a3767..c6c99d5b 100644 --- a/src/helpers/nrf52/SerialBLEInterface.cpp +++ b/src/helpers/nrf52/SerialBLEInterface.cpp @@ -27,7 +27,7 @@ void SerialBLEInterface::startAdv() { // Secondary Scan Response packet (optional) // Since there is no room for 'Name' in Advertising packet - Bluefruit.ScanResponse.addName(); + // Bluefruit.ScanResponse.addName(); /* Start Advertising * - Enable auto advertising if disconnected From 71255e00f173f7552a210ac96a508e6898dd2902 Mon Sep 17 00:00:00 2001 From: Florent de Lamotte Date: Fri, 4 Jul 2025 15:42:56 +0200 Subject: [PATCH 05/10] stm32 targets: set preamble to 16 --- variants/rak3x72/target.cpp | 2 +- variants/wio-e5-dev/target.cpp | 2 +- variants/wio-e5-mini/target.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/variants/rak3x72/target.cpp b/variants/rak3x72/target.cpp index d7070eae..446783aa 100644 --- a/variants/rak3x72/target.cpp +++ b/variants/rak3x72/target.cpp @@ -38,7 +38,7 @@ bool radio_init() { radio.setRfSwitchTable(rfswitch_pins, rfswitch_table); - int status = radio.begin(LORA_FREQ, LORA_BW, LORA_SF, LORA_CR, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 8, STM32WL_TCXO_VOLTAGE, 0); + int status = radio.begin(LORA_FREQ, LORA_BW, LORA_SF, LORA_CR, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 16, STM32WL_TCXO_VOLTAGE, 0); if (status != RADIOLIB_ERR_NONE) { Serial.print("ERROR: radio init failed: "); diff --git a/variants/wio-e5-dev/target.cpp b/variants/wio-e5-dev/target.cpp index 8ccbe384..42e900e4 100644 --- a/variants/wio-e5-dev/target.cpp +++ b/variants/wio-e5-dev/target.cpp @@ -35,7 +35,7 @@ bool radio_init() { radio.setRfSwitchTable(rfswitch_pins, rfswitch_table); - int status = radio.begin(LORA_FREQ, LORA_BW, LORA_SF, LORA_CR, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 8, 1.7, 0); + int status = radio.begin(LORA_FREQ, LORA_BW, LORA_SF, LORA_CR, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 16, 1.7, 0); if (status != RADIOLIB_ERR_NONE) { Serial.print("ERROR: radio init failed: "); diff --git a/variants/wio-e5-mini/target.cpp b/variants/wio-e5-mini/target.cpp index 6c045dd5..0e2358b8 100644 --- a/variants/wio-e5-mini/target.cpp +++ b/variants/wio-e5-mini/target.cpp @@ -33,7 +33,7 @@ bool radio_init() { radio.setRfSwitchTable(rfswitch_pins, rfswitch_table); - int status = radio.begin(LORA_FREQ, LORA_BW, LORA_SF, LORA_CR, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 8, 1.7, 0); + int status = radio.begin(LORA_FREQ, LORA_BW, LORA_SF, LORA_CR, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 16, 1.7, 0); if (status != RADIOLIB_ERR_NONE) { Serial.print("ERROR: radio init failed: "); From fa481e832b4360593f2a1a8340e2f59944940882 Mon Sep 17 00:00:00 2001 From: liquidraver <504870+liquidraver@users.noreply.github.com> Date: Fri, 4 Jul 2025 16:40:19 +0200 Subject: [PATCH 06/10] LR's corrected calculation override (instead of SX) and minor changes according to radiolib's wiki --- src/helpers/CustomLR1110.h | 76 ++++++++++++++++++++++++------------- variants/t1000-e/target.cpp | 3 +- 2 files changed, 52 insertions(+), 27 deletions(-) diff --git a/src/helpers/CustomLR1110.h b/src/helpers/CustomLR1110.h index d431dac1..e82f48f5 100644 --- a/src/helpers/CustomLR1110.h +++ b/src/helpers/CustomLR1110.h @@ -10,34 +10,58 @@ class CustomLR1110 : public LR1110 { CustomLR1110(Module *mod) : LR1110(mod) { } RadioLibTime_t getTimeOnAir(size_t len) override { - uint32_t symbolLength_us = ((uint32_t)(1000 * 10) << this->spreadingFactor) / (this->bandwidthKhz * 10) ; - uint8_t sfCoeff1_x4 = 17; // (4.25 * 4) - uint8_t sfCoeff2 = 8; - if(this->spreadingFactor == 5 || this->spreadingFactor == 6) { - sfCoeff1_x4 = 25; // 6.25 * 4 - sfCoeff2 = 0; - } - uint8_t sfDivisor = 4*this->spreadingFactor; - if(symbolLength_us >= 16000) { - sfDivisor = 4*(this->spreadingFactor - 2); - } - const int8_t bitsPerCrc = 16; - const int8_t N_symbol_header = this->headerType == RADIOLIB_SX126X_LORA_HEADER_EXPLICIT ? 20 : 0; - - // numerator of equation in section 6.1.4 of SX1268 datasheet v1.1 (might not actually be bitcount, but it has len * 8) - int16_t bitCount = (int16_t) 8 * len + this->crcTypeLoRa * bitsPerCrc - 4 * this->spreadingFactor + sfCoeff2 + N_symbol_header; - if(bitCount < 0) { - bitCount = 0; - } - // add (sfDivisor) - 1 to the numerator to give integer CEIL(...) - uint16_t nPreCodedSymbols = (bitCount + (sfDivisor - 1)) / (sfDivisor); - - // preamble can be 65k, therefore nSymbol_x4 needs to be 32 bit - uint32_t nSymbol_x4 = (this->preambleLengthLoRa + 8) * 4 + sfCoeff1_x4 + nPreCodedSymbols * (this->codingRate + 4) * 4; - - return((symbolLength_us * nSymbol_x4) / 4); + // calculate number of symbols + float N_symbol = 0; + if(this->codingRate <= RADIOLIB_LR11X0_LORA_CR_4_8_SHORT) { + // legacy coding rate - nice and simple + // get SF coefficients + float coeff1 = 0; + int16_t coeff2 = 0; + int16_t coeff3 = 0; + if(this->spreadingFactor < 7) { + // SF5, SF6 + coeff1 = 6.25; + coeff2 = 4*this->spreadingFactor; + coeff3 = 4*this->spreadingFactor; + } else if(this->spreadingFactor < 11) { + // SF7. SF8, SF9, SF10 + coeff1 = 4.25; + coeff2 = 4*this->spreadingFactor + 8; + coeff3 = 4*this->spreadingFactor; + } else { + // SF11, SF12 + coeff1 = 4.25; + coeff2 = 4*this->spreadingFactor + 8; + coeff3 = 4*(this->spreadingFactor - 2); } + // get CRC length + int16_t N_bitCRC = 16; + if(this->crcTypeLoRa == RADIOLIB_LR11X0_LORA_CRC_DISABLED) { + N_bitCRC = 0; + } + + // get header length + int16_t N_symbolHeader = 20; + if(this->headerType == RADIOLIB_LR11X0_LORA_HEADER_IMPLICIT) { + N_symbolHeader = 0; + } + + // calculate number of LoRa preamble symbols - NO! Lora preamble is already in symbols + // uint32_t N_symbolPreamble = (this->preambleLengthLoRa & 0x0F) * (uint32_t(1) << ((this->preambleLengthLoRa & 0xF0) >> 4)); + + // calculate the number of symbols - nope + // N_symbol = (float)N_symbolPreamble + coeff1 + 8.0f + ceilf((float)RADIOLIB_MAX((int16_t)(8 * len + N_bitCRC - coeff2 + N_symbolHeader), (int16_t)0) / (float)coeff3) * (float)(this->codingRate + 4); + // calculate the number of symbols - using only preamblelora because it's already in symbols + N_symbol = (float)preambleLengthLoRa + coeff1 + 8.0f + ceilf((float)RADIOLIB_MAX((int16_t)(8 * len + N_bitCRC - coeff2 + N_symbolHeader), (int16_t)0) / (float)coeff3) * (float)(this->codingRate + 4); + } else { + // long interleaving - not needed for this modem + } + + // get time-on-air in us + return(((uint32_t(1) << this->spreadingFactor) / this->bandwidthKhz) * N_symbol * 1000.0f); +} + bool isReceiving() { uint16_t irq = getIrqStatus(); bool detected = ((irq & LR1110_IRQ_HEADER_VALID) || (irq & LR1110_IRQ_HAS_PREAMBLE)); diff --git a/variants/t1000-e/target.cpp b/variants/t1000-e/target.cpp index f6fb1f04..06509c4f 100644 --- a/variants/t1000-e/target.cpp +++ b/variants/t1000-e/target.cpp @@ -61,7 +61,8 @@ bool radio_init() { return false; // fail } - radio.setCRC(1); + radio.setCRC(2); + radio.explicitHeader(); #ifdef RF_SWITCH_TABLE radio.setRfSwitchTable(rfswitch_dios, rfswitch_table); From aa3c702ffdbe06fce30735813488484d00cb4f71 Mon Sep 17 00:00:00 2001 From: Normunds Gavars Date: Fri, 4 Jul 2025 19:27:11 +0300 Subject: [PATCH 07/10] Read battery voltage on Minewsemi ME25LS01 --- src/helpers/nrf52/MinewsemiME25LS01Board.cpp | 11 ++--- src/helpers/nrf52/MinewsemiME25LS01Board.h | 50 +++++--------------- variants/minewsemi_me25ls01/platformio.ini | 19 -------- variants/minewsemi_me25ls01/variant.cpp | 6 +-- variants/minewsemi_me25ls01/variant.h | 9 +--- 5 files changed, 22 insertions(+), 73 deletions(-) diff --git a/src/helpers/nrf52/MinewsemiME25LS01Board.cpp b/src/helpers/nrf52/MinewsemiME25LS01Board.cpp index f402a0fd..c41a6bc0 100644 --- a/src/helpers/nrf52/MinewsemiME25LS01Board.cpp +++ b/src/helpers/nrf52/MinewsemiME25LS01Board.cpp @@ -8,11 +8,12 @@ void MinewsemiME25LS01Board::begin() { // for future use, sub-classes SHOULD call this from their begin() startup_reason = BD_STARTUP_NORMAL; btn_prev_state = HIGH; + + pinMode(PIN_VBAT_READ, INPUT); sd_power_mode_set(NRF_POWER_MODE_LOWPWR); #ifdef BUTTON_PIN - // pinMode(BATTERY_PIN, INPUT); pinMode(BUTTON_PIN, INPUT); pinMode(LED_PIN, OUTPUT); #endif @@ -31,7 +32,6 @@ void MinewsemiME25LS01Board::begin() { delay(10); // give sx1262 some time to power up } -#if 0 static BLEDfu bledfu; static void connect_callback(uint16_t conn_handle) { @@ -47,7 +47,7 @@ static void disconnect_callback(uint16_t conn_handle, uint8_t reason) { } -bool TrackerT1000eBoard::startOTAUpdate(const char* id, char reply[]) { +bool MinewsemiME25LS01Board::startOTAUpdate(const char* id, char reply[]) { // Config the peripheral connection with maximum bandwidth // more SRAM required by SoftDevice // Note: All config***() function must be called before begin() @@ -58,7 +58,7 @@ bool TrackerT1000eBoard::startOTAUpdate(const char* id, char reply[]) { // Set max power. Accepted values are: -40, -30, -20, -16, -12, -8, -4, 0, 4 Bluefruit.setTxPower(4); // Set the BLE device name - Bluefruit.setName("T1000E_OTA"); + Bluefruit.setName("Minewsemi_OTA"); Bluefruit.Periph.setConnectCallback(connect_callback); Bluefruit.Periph.setDisconnectCallback(disconnect_callback); @@ -88,5 +88,4 @@ bool TrackerT1000eBoard::startOTAUpdate(const char* id, char reply[]) { strcpy(reply, "OK - started"); return true; -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/src/helpers/nrf52/MinewsemiME25LS01Board.h b/src/helpers/nrf52/MinewsemiME25LS01Board.h index 4b8c8293..777606a6 100644 --- a/src/helpers/nrf52/MinewsemiME25LS01Board.h +++ b/src/helpers/nrf52/MinewsemiME25LS01Board.h @@ -16,9 +16,9 @@ #define LR11X0_DIO_AS_RF_SWITCH true #define LR11X0_DIO3_TCXO_VOLTAGE 1.6 -// built-ins -//#define PIN_VBAT_READ 5 -//#define ADC_MULTIPLIER (3 * 1.73 * 1000) +#define PIN_VBAT_READ BATTERY_PIN +#define ADC_MULTIPLIER (1.815f) // dependent on voltage divider resistors. TODO: more accurate battery tracking + class MinewsemiME25LS01Board : public mesh::MainBoard { protected: @@ -28,43 +28,23 @@ protected: public: void begin(); +#define BATTERY_SAMPLES 8 + uint16_t getBattMilliVolts() override { - #ifdef BATTERY_PIN - #ifdef PIN_3V3_EN - digitalWrite(PIN_3V3_EN, HIGH); - #endif - analogReference(AR_INTERNAL_3_0); analogReadResolution(12); - delay(10); - float volts = (analogRead(BATTERY_PIN) * ADC_MULTIPLIER * AREF_VOLTAGE) / 4096; - #ifdef PIN_3V3_EN - digitalWrite(PIN_3V3_EN, LOW); - #endif - analogReference(AR_DEFAULT); // put back to default - analogReadResolution(10); - - return volts * 1000; - #else - return 0; - #endif + uint32_t raw = 0; + for (int i = 0; i < BATTERY_SAMPLES; i++) { + raw += analogRead(PIN_VBAT_READ); + } + raw = raw / BATTERY_SAMPLES; + return (ADC_MULTIPLIER * raw); } uint8_t getStartupReason() const override { return startup_reason; } const char* getManufacturerName() const override { - return "m25ls01"; - } - - int buttonStateChanged() { - #ifdef BUTTON_PIN - uint8_t v = digitalRead(BUTTON_PIN); - if (v != btn_prev_state) { - btn_prev_state = v; - return (v == LOW) ? 1 : -1; - } - #endif - return 0; + return "Minewsemi"; } void powerOff() override { @@ -81,10 +61,6 @@ public: digitalWrite(BUZZER_EN, LOW); #endif - #ifdef PIN_3V3_EN - digitalWrite(PIN_3V3_EN, LOW); - #endif - #ifdef LED_PIN digitalWrite(LED_PIN, LOW); #endif @@ -108,5 +84,5 @@ public: NVIC_SystemReset(); } -// bool startOTAUpdate(const char* id, char reply[]) override; + bool startOTAUpdate(const char* id, char reply[]) override; }; \ No newline at end of file diff --git a/variants/minewsemi_me25ls01/platformio.ini b/variants/minewsemi_me25ls01/platformio.ini index 4775e289..302e695f 100644 --- a/variants/minewsemi_me25ls01/platformio.ini +++ b/variants/minewsemi_me25ls01/platformio.ini @@ -8,7 +8,6 @@ build_flags = ${nrf52_base.build_flags} -I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52 lib_ignore = BluetoothOTA - lvgl lib5b4 lib_deps = ${nrf52_base.lib_deps} @@ -67,7 +66,6 @@ build_flags = ${me25ls01.build_flags} ;-D PIN_BUZZER_EN=37 build_src_filter = ${me25ls01.build_src_filter} + - ;+ +<../examples/companion_radio/*.cpp> lib_deps = ${me25ls01.lib_deps} adafruit/RTClib @ ^2.1.3 @@ -92,9 +90,6 @@ build_flags = ${me25ls01.build_flags} -D MAX_NEIGHBOURS=8 -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${me25ls01.build_src_filter} - ;+ - ;+ - ;+<../examples/companion_radio/*.cpp> +<../examples/simple_repeater> lib_deps = ${me25ls01.lib_deps} adafruit/RTClib @ ^2.1.3 @@ -121,10 +116,6 @@ build_flags = ${me25ls01.build_flags} -D MAX_NEIGHBOURS=8 -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${me25ls01.build_src_filter} - ;+ - ;+ - ;+<../examples/companion_radio/*.cpp> - ;+<../examples/simple_repeater> +<../examples/simple_room_server> lib_deps = ${me25ls01.lib_deps} adafruit/RTClib @ ^2.1.3 @@ -149,11 +140,6 @@ build_flags = ${me25ls01.build_flags} -D MAX_NEIGHBOURS=8 -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${me25ls01.build_src_filter} - ;+ - ;+ - ;+<../examples/companion_radio/*.cpp> - ;+<../examples/simple_repeater> - ;+<../examples/simple_room_server> +<../examples/simple_secure_chat/main.cpp> lib_deps = ${me25ls01.lib_deps} adafruit/RTClib @ ^2.1.3 @@ -173,11 +159,6 @@ build_flags = ${me25ls01.build_flags} -D DISPLAY_CLASS=NullDisplayDriver build_src_filter = ${me25ls01.build_src_filter} + - ;+ - ;+ - ;+<../examples/companion_radio/*.cpp> - ;+<../examples/simple_repeater> - ;+<../examples/simple_room_server> +<../examples/companion_radio> lib_deps = ${me25ls01.lib_deps} adafruit/RTClib @ ^2.1.3 diff --git a/variants/minewsemi_me25ls01/variant.cpp b/variants/minewsemi_me25ls01/variant.cpp index 15f30d14..5dbac9d3 100644 --- a/variants/minewsemi_me25ls01/variant.cpp +++ b/variants/minewsemi_me25ls01/variant.cpp @@ -35,7 +35,7 @@ const uint32_t g_ADigitalPinMap[PINS_COUNT + 1] = 28, // P0.28 29, // P0.29, 30, // P0.30 - 31, // P0.31, + 31, // P0.31, BATTERY_PIN 32, // P1.00 33, // P1.01, LORA_DIO_1 34, // P1.02 @@ -60,8 +60,8 @@ void initVariant() pinMode(BATTERY_PIN, INPUT); pinMode(PIN_BUTTON1, INPUT); - pinMode(PIN_3V3_EN, OUTPUT); - pinMode(PIN_3V3_ACC_EN, OUTPUT); + // pinMode(PIN_3V3_EN, OUTPUT); + // pinMode(PIN_3V3_ACC_EN, OUTPUT); pinMode(LED_PIN, OUTPUT); pinMode(P_LORA_TX_LED, OUTPUT); diff --git a/variants/minewsemi_me25ls01/variant.h b/variants/minewsemi_me25ls01/variant.h index bbf15ff6..a8bbbe3a 100644 --- a/variants/minewsemi_me25ls01/variant.h +++ b/variants/minewsemi_me25ls01/variant.h @@ -2,26 +2,19 @@ #include "WVariant.h" -//////////////////////////////////////////////////////////////////////////////// // Low frequency clock source - #define USE_LFXO // 32.768 kHz crystal oscillator #define VARIANT_MCK (64000000ul) // #define USE_LFRC // 32.768 kHz RC oscillator // Power -#define PIN_3V3_EN (32 + 5) // P1.6 Power to Sensors -#define PIN_3V3_ACC_EN -1 - -#define BATTERY_PIN (-1) // P0.2/AIN0 +#define BATTERY_PIN (31) #define BATTERY_IMMUTABLE #define ADC_MULTIPLIER (2.0F) #define ADC_RESOLUTION (14) #define BATTERY_SENSE_RES (12) -#define AREF_VOLTAGE (3.0) - // Number of pins #define PINS_COUNT (48) #define NUM_DIGITAL_PINS (48) From d32fa5c00476013f3a12183277a15aaa5d6795e9 Mon Sep 17 00:00:00 2001 From: Lloyd Date: Fri, 4 Jul 2025 21:07:55 +0100 Subject: [PATCH 08/10] Manually restart BLE advertising after disconnect to prevent stack freeze MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replaced use of `restartOnDisconnect(true)` with explicit (existing) manual re-advertising logic. This avoids Bluetooth stack instability caused by overlapping advertising state, Changes: - Added explicit `Bluefruit.Advertising.stop()` and data clears in `startAdv()` - Disabled automatic restart with `restartOnDisconnect(false)` - Re-advertising now fully handled in `checkRecvFrame()` loop Tested on: iPhone, Android, Windows, and Chrome – confirmed stable reconnects and name visibility. --- src/helpers/nrf52/SerialBLEInterface.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/helpers/nrf52/SerialBLEInterface.cpp b/src/helpers/nrf52/SerialBLEInterface.cpp index c6c99d5b..af5b425e 100644 --- a/src/helpers/nrf52/SerialBLEInterface.cpp +++ b/src/helpers/nrf52/SerialBLEInterface.cpp @@ -18,6 +18,10 @@ void SerialBLEInterface::begin(const char* device_name, uint32_t pin_code) { } void SerialBLEInterface::startAdv() { + Bluefruit.Advertising.stop(); // always clean restart + Bluefruit.Advertising.clearData(); // clear advertising data + Bluefruit.ScanResponse.clearData(); // clear scan response data + // Advertising packet Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE); Bluefruit.Advertising.addTxPower(); @@ -27,7 +31,7 @@ void SerialBLEInterface::startAdv() { // Secondary Scan Response packet (optional) // Since there is no room for 'Name' in Advertising packet - // Bluefruit.ScanResponse.addName(); + Bluefruit.ScanResponse.addName(); /* Start Advertising * - Enable auto advertising if disconnected @@ -38,7 +42,7 @@ void SerialBLEInterface::startAdv() { * For recommended advertising interval * https://developer.apple.com/library/content/qa/qa1931/_index.html */ - Bluefruit.Advertising.restartOnDisconnect(true); + Bluefruit.Advertising.restartOnDisconnect(false); // don't restart automatically as already beeing done in checkRecvFrame() Bluefruit.Advertising.setInterval(32, 244); // in unit of 0.625 ms Bluefruit.Advertising.setFastTimeout(30); // number of seconds in fast mode Bluefruit.Advertising.start(0); // 0 = Don't stop advertising after n seconds From 7ea6a9851362546ee181123b810935cc4d26dac6 Mon Sep 17 00:00:00 2001 From: liamcottle Date: Sun, 6 Jul 2025 14:07:56 +1200 Subject: [PATCH 09/10] dont show cli data replies on display --- examples/companion_radio/MyMesh.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp index 879200b7..c141f9d6 100644 --- a/examples/companion_radio/MyMesh.cpp +++ b/examples/companion_radio/MyMesh.cpp @@ -315,17 +315,24 @@ void MyMesh::queueMessage(const ContactInfo &from, uint8_t txt_type, mesh::Packe i += tlen; addToOfflineQueue(out_frame, i); + // we only want to show text messages on display, not cli data + bool should_display = txt_type == TXT_TYPE_PLAIN || txt_type == TXT_TYPE_SIGNED_PLAIN; + if (_serial->isConnected()) { uint8_t frame[1]; frame[0] = PUSH_CODE_MSG_WAITING; // send push 'tickle' _serial->writeFrame(frame, 1); } else { #ifdef DISPLAY_CLASS - ui_task.soundBuzzer(UIEventType::contactMessage); + if(should_display){ + ui_task.soundBuzzer(UIEventType::contactMessage); + } #endif } #ifdef DISPLAY_CLASS - ui_task.newMsg(path_len, from.name, text, offline_queue_len); + if(should_display){ + ui_task.newMsg(path_len, from.name, text, offline_queue_len); + } #endif } From 0914056a09244b850f43595d27303e9d5ecf500f Mon Sep 17 00:00:00 2001 From: liamcottle Date: Sun, 6 Jul 2025 14:16:43 +1200 Subject: [PATCH 10/10] tidy logic for devices with display --- examples/companion_radio/MyMesh.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp index c141f9d6..6ddc19d6 100644 --- a/examples/companion_radio/MyMesh.cpp +++ b/examples/companion_radio/MyMesh.cpp @@ -315,23 +315,20 @@ void MyMesh::queueMessage(const ContactInfo &from, uint8_t txt_type, mesh::Packe i += tlen; addToOfflineQueue(out_frame, i); - // we only want to show text messages on display, not cli data - bool should_display = txt_type == TXT_TYPE_PLAIN || txt_type == TXT_TYPE_SIGNED_PLAIN; - if (_serial->isConnected()) { uint8_t frame[1]; frame[0] = PUSH_CODE_MSG_WAITING; // send push 'tickle' _serial->writeFrame(frame, 1); - } else { + } + #ifdef DISPLAY_CLASS - if(should_display){ + // we only want to show text messages on display, not cli data + bool should_display = txt_type == TXT_TYPE_PLAIN || txt_type == TXT_TYPE_SIGNED_PLAIN; + if (should_display) { + ui_task.newMsg(path_len, from.name, text, offline_queue_len); + if (!_serial->isConnected()) { ui_task.soundBuzzer(UIEventType::contactMessage); } -#endif - } -#ifdef DISPLAY_CLASS - if(should_display){ - ui_task.newMsg(path_len, from.name, text, offline_queue_len); } #endif }