Skip to content

Commit 0b6ed2d

Browse files
HarukiToredaHarukiToreda
committed
Merge branch 'develop' into InkHUD-Improvements
2 parents e73e817 + 91dd39a commit 0b6ed2d

72 files changed

Lines changed: 1511 additions & 398 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.clusterfuzzlite/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ENV PIP_ROOT_USER_ACTION=ignore
2020
RUN apt-get update && apt-get install --no-install-recommends -y \
2121
cmake git zip libgpiod-dev libbluetooth-dev libi2c-dev \
2222
libunistring-dev libmicrohttpd-dev libgnutls28-dev libgcrypt20-dev \
23-
libusb-1.0-0-dev libssl-dev pkg-config && \
23+
libusb-1.0-0-dev libssl-dev pkg-config libsqlite3-dev && \
2424
apt-get clean && rm -rf /var/lib/apt/lists/* && \
2525
pip install --no-cache-dir -U \
2626
platformio==6.1.16 \

‎.trunk/trunk.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ plugins:
99
lint:
1010
enabled:
1111
- checkov@3.2.497
12-
- renovate@42.78.2
13-
- prettier@3.7.4
12+
- renovate@42.81.8
13+
- prettier@3.8.0
1414
- trufflehog@3.92.4
15-
- yamllint@1.37.1
15+
- yamllint@1.38.0
1616
- bandit@1.9.2
1717
- trivy@0.68.2
1818
- taplo@0.10.0

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
1414
curl wget g++ zip git ca-certificates pkg-config \
1515
libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
1616
libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev \
17-
libx11-dev libinput-dev libxkbcommon-x11-dev \
17+
libx11-dev libinput-dev libxkbcommon-x11-dev libsqlite3-dev \
1818
&& apt-get clean && rm -rf /var/lib/apt/lists/* \
1919
&& pip install --no-cache-dir -U platformio \
2020
&& mkdir /tmp/firmware

‎alpine.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN apk --no-cache add \
1111
bash g++ libstdc++-dev linux-headers zip git ca-certificates libbsd-dev \
1212
libgpiod-dev yaml-cpp-dev bluez-dev \
1313
libusb-dev i2c-tools-dev libuv-dev openssl-dev pkgconf argp-standalone \
14-
libx11-dev libinput-dev libxkbcommon-dev \
14+
libx11-dev libinput-dev libxkbcommon-dev sqlite-dev \
1515
&& rm -rf /var/cache/apk/* \
1616
&& pip install --no-cache-dir -U platformio \
1717
&& mkdir /tmp/firmware

‎boards/CDEBYTE_EoRa-Hub.json‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "esp32s3_out.ld",
5+
"partitions": "default.csv",
6+
"memory_type": "qio_qspi"
7+
},
8+
"core": "esp32",
9+
"extra_flags": [
10+
"-DBOARD_HAS_PSRAM",
11+
"-DARDUINO_USB_CDC_ON_BOOT=0",
12+
"-DARDUINO_RUNNING_CORE=1",
13+
"-DARDUINO_EVENT_RUNNING_CORE=1"
14+
],
15+
"f_cpu": "240000000L",
16+
"f_flash": "80000000L",
17+
"flash_mode": "qio",
18+
"mcu": "esp32s3",
19+
"variant": "esp32s3"
20+
},
21+
"connectivity": ["wifi"],
22+
"debug": {
23+
"openocd_target": "esp32s3.cfg"
24+
},
25+
"frameworks": ["arduino", "espidf"],
26+
"name": "CDEBYTE_EoRa-Hub",
27+
"upload": {
28+
"flash_size": "4MB",
29+
"maximum_ram_size": 327680,
30+
"maximum_size": 4194304,
31+
"use_1200bps_touch": true,
32+
"wait_for_upload_port": true,
33+
"require_upload_port": true,
34+
"speed": 921600
35+
},
36+
"url": "https://www.cdebyte.com/products/EoRa-HUB-900TB",
37+
"vendor": "CDEBYTE"
38+
}

‎boards/ThinkNode-M4.json‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
"build": {
3+
"arduino": {
4+
"ldscript": "nrf52840_s140_v6.ld"
5+
},
6+
"core": "nRF5",
7+
"cpu": "cortex-m4",
8+
"extra_flags": "-DARDUINO_NRF52840_ELECROW_M4 -DNRF52840_XXAA",
9+
"f_cpu": "64000000L",
10+
"hwids": [
11+
["0x239A", "0x4405"],
12+
["0x239A", "0x0029"],
13+
["0x239A", "0x002A"]
14+
],
15+
"usb_product": "elecrow_thinknode_m4",
16+
"mcu": "nrf52840",
17+
"variant": "ELECROW-ThinkNode-M4",
18+
"variants_dir": "variants",
19+
"bsp": {
20+
"name": "adafruit"
21+
},
22+
"softdevice": {
23+
"sd_flags": "-DS140",
24+
"sd_name": "s140",
25+
"sd_version": "6.1.1",
26+
"sd_fwid": "0x00B6"
27+
},
28+
"bootloader": {
29+
"settings_addr": "0xFF000"
30+
}
31+
},
32+
"connectivity": ["bluetooth"],
33+
"debug": {
34+
"jlink_device": "nRF52840_xxAA",
35+
"onboard_tools": ["jlink"],
36+
"svd_path": "nrf52840.svd",
37+
"openocd_target": "nrf52840-mdk-rs"
38+
},
39+
"frameworks": ["arduino"],
40+
"name": "ELECROW ThinkNode m4",
41+
"upload": {
42+
"maximum_ram_size": 248832,
43+
"maximum_size": 815104,
44+
"speed": 115200,
45+
"protocol": "nrfutil",
46+
"protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
47+
"use_1200bps_touch": true,
48+
"require_upload_port": true,
49+
"wait_for_upload_port": true
50+
},
51+
"url": "https://www.elecrow.com/thinknode-m4-power-bank-lora-device-with-meshtastic-lora-tracker-function-powered-by-nrf52840.html",
52+
"vendor": "ELECROW"
53+
}

‎boards/t-watch-s3.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"-DBOARD_HAS_PSRAM",
1010
"-DT_WATCH_S3",
1111
"-DARDUINO_USB_CDC_ON_BOOT=1",
12-
"-DARDUINO_USB_MODE=0",
12+
"-DARDUINO_USB_MODE=1",
1313
"-DARDUINO_RUNNING_CORE=1",
1414
"-DARDUINO_EVENT_RUNNING_CORE=1"
1515
],

‎debian/control‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ Build-Depends: debhelper-compat (= 13),
2525
liborcania-dev,
2626
libx11-dev,
2727
libinput-dev,
28-
libxkbcommon-x11-dev
28+
libxkbcommon-x11-dev,
29+
libsqlite3-dev
2930
Standards-Version: 4.6.2
3031
Homepage: https://github.com/meshtastic/firmware
3132
Rules-Requires-Root: no

‎meshtasticd.spec.rpkg‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ BuildRequires: pkgconfig(bluez)
3939
BuildRequires: pkgconfig(libusb-1.0)
4040
BuildRequires: libi2c-devel
4141
BuildRequires: pkgconfig(libuv)
42+
BuildRequires: pkgconfig(sqlite3)
4243
# Web components:
4344
BuildRequires: pkgconfig(openssl)
4445
BuildRequires: pkgconfig(liborcania)

‎platformio.ini‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ lib_deps =
119119
[device-ui_base]
120120
lib_deps =
121121
# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
122-
https://github.com/meshtastic/device-ui/archive/12f8cddc1e2908e1988da21e3500c695668e8d92.zip
122+
https://github.com/meshtastic/device-ui/archive/5a870c623a4e9ab7a7abe3d02950536f107d1a31.zip
123123

124124
; Common libs for environmental measurements in telemetry module
125125
[environmental_base]
@@ -129,7 +129,7 @@ lib_deps =
129129
# renovate: datasource=custom.pio depName=Adafruit Unified Sensor packageName=adafruit/library/Adafruit Unified Sensor
130130
adafruit/Adafruit Unified Sensor@1.1.15
131131
# renovate: datasource=custom.pio depName=Adafruit BMP280 packageName=adafruit/library/Adafruit BMP280 Library
132-
adafruit/Adafruit BMP280 Library@2.6.8
132+
adafruit/Adafruit BMP280 Library@3.0.0
133133
# renovate: datasource=custom.pio depName=Adafruit BMP085 packageName=adafruit/library/Adafruit BMP085 Library
134134
adafruit/Adafruit BMP085 Library@1.2.4
135135
# renovate: datasource=custom.pio depName=Adafruit BME280 packageName=adafruit/library/Adafruit BME280 Library
@@ -142,8 +142,6 @@ lib_deps =
142142
adafruit/Adafruit INA260 Library@1.5.3
143143
# renovate: datasource=custom.pio depName=Adafruit INA219 packageName=adafruit/library/Adafruit INA219
144144
adafruit/Adafruit INA219@1.2.3
145-
# renovate: datasource=custom.pio depName=Adafruit PM25 AQI Sensor packageName=adafruit/library/Adafruit PM25 AQI Sensor
146-
adafruit/Adafruit PM25 AQI Sensor@2.0.0
147145
# renovate: datasource=custom.pio depName=Adafruit MPU6050 packageName=adafruit/library/Adafruit MPU6050
148146
adafruit/Adafruit MPU6050@2.2.6
149147
# renovate: datasource=custom.pio depName=Adafruit LIS3DH packageName=adafruit/library/Adafruit LIS3DH

0 commit comments

Comments
 (0)