mirror of
https://github.com/meshtastic/firmware.git
synced 2025-10-08 07:22:26 +00:00
Compare commits
No commits in common. "b1682612e4e86f896dd09bd4cb7b72e234b2ede2" and "90862fb42067b0adb116b8bc48179ace3fba3631" have entirely different histories.
b1682612e4
...
90862fb420
@ -30,9 +30,6 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
|
|||||||
gnupg2 \
|
gnupg2 \
|
||||||
libusb-1.0-0-dev \
|
libusb-1.0-0-dev \
|
||||||
libi2c-dev \
|
libi2c-dev \
|
||||||
libxcb-xkb-dev \
|
|
||||||
libxkbcommon-dev \
|
|
||||||
libinput-dev \
|
|
||||||
&& apt-get clean && rm -rf /var/lib/apt/lists/*
|
&& apt-get clean && rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
RUN pipx install platformio
|
RUN pipx install platformio
|
||||||
|
6
.gitattributes
vendored
6
.gitattributes
vendored
@ -1,5 +1,5 @@
|
|||||||
* text=auto eol=lf
|
* text=auto eol=lf
|
||||||
*.cmd text eol=crlf
|
*.{cmd,[cC][mM][dD]} text eol=crlf
|
||||||
*.bat text eol=crlf
|
*.{bat,[bB][aA][tT]} text eol=crlf
|
||||||
*.ps1 text eol=crlf
|
*.{ps1,[pP][sS]} text eol=crlf
|
||||||
*.{sh,[sS][hH]} text eol=lf
|
*.{sh,[sS][hH]} text eol=lf
|
||||||
|
1
.github/workflows/stale_bot.yml
vendored
1
.github/workflows/stale_bot.yml
vendored
@ -18,6 +18,5 @@ jobs:
|
|||||||
- name: Stale PR+Issues
|
- name: Stale PR+Issues
|
||||||
uses: actions/stale@v9.1.0
|
uses: actions/stale@v9.1.0
|
||||||
with:
|
with:
|
||||||
days-before-stale: 45
|
|
||||||
exempt-issue-labels: pinned,3.0
|
exempt-issue-labels: pinned,3.0
|
||||||
exempt-pr-labels: pinned,3.0
|
exempt-pr-labels: pinned,3.0
|
||||||
|
2
.github/workflows/test_native.yml
vendored
2
.github/workflows/test_native.yml
vendored
@ -143,7 +143,7 @@ jobs:
|
|||||||
merge-multiple: true
|
merge-multiple: true
|
||||||
|
|
||||||
- name: Test Report
|
- name: Test Report
|
||||||
uses: dorny/test-reporter@v2.0.0
|
uses: dorny/test-reporter@v1.9.1
|
||||||
with:
|
with:
|
||||||
name: PlatformIO Tests
|
name: PlatformIO Tests
|
||||||
path: testreport.xml
|
path: testreport.xml
|
||||||
|
@ -9,14 +9,14 @@ plugins:
|
|||||||
lint:
|
lint:
|
||||||
enabled:
|
enabled:
|
||||||
- prettier@3.5.3
|
- prettier@3.5.3
|
||||||
- trufflehog@3.88.16
|
- trufflehog@3.88.15
|
||||||
- yamllint@1.36.0
|
- yamllint@1.35.1
|
||||||
- bandit@1.8.3
|
- bandit@1.8.3
|
||||||
- checkov@3.2.382
|
- checkov@3.2.382
|
||||||
- terrascan@1.19.9
|
- terrascan@1.19.9
|
||||||
- trivy@0.60.0
|
- trivy@0.60.0
|
||||||
- taplo@0.9.3
|
- taplo@0.9.3
|
||||||
- ruff@0.9.10
|
- ruff@0.9.9
|
||||||
- isort@6.0.1
|
- isort@6.0.1
|
||||||
- markdownlint@0.44.0
|
- markdownlint@0.44.0
|
||||||
- oxipng@9.1.4
|
- oxipng@9.1.4
|
||||||
|
@ -7,15 +7,13 @@
|
|||||||
"core": "esp32",
|
"core": "esp32",
|
||||||
"extra_flags": [
|
"extra_flags": [
|
||||||
"-DARDUINO_ESP32S3_DEV",
|
"-DARDUINO_ESP32S3_DEV",
|
||||||
|
"-DARDUINO_USB_MODE=1",
|
||||||
"-DARDUINO_RUNNING_CORE=1",
|
"-DARDUINO_RUNNING_CORE=1",
|
||||||
"-DARDUINO_EVENT_RUNNING_CORE=1",
|
"-DARDUINO_EVENT_RUNNING_CORE=1"
|
||||||
"-DARDUINO_USB_CDC_ON_BOOT=1",
|
|
||||||
"-DBOARD_HAS_PSRAM"
|
|
||||||
],
|
],
|
||||||
"f_cpu": "240000000L",
|
"f_cpu": "240000000L",
|
||||||
"f_flash": "80000000L",
|
"f_flash": "80000000L",
|
||||||
"flash_mode": "qio",
|
"flash_mode": "qio",
|
||||||
"psram_type": "qio",
|
|
||||||
"hwids": [["0x303A", "0x1001"]],
|
"hwids": [["0x303A", "0x1001"]],
|
||||||
"mcu": "esp32s3",
|
"mcu": "esp32s3",
|
||||||
"variant": "esp32s3"
|
"variant": "esp32s3"
|
||||||
|
@ -73,10 +73,9 @@ const RegionInfo regions[] = {
|
|||||||
RDEF(RU, 868.7f, 869.2f, 100, 0, 20, true, false, false),
|
RDEF(RU, 868.7f, 869.2f, 100, 0, 20, true, false, false),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
https://www.law.go.kr/LSW/admRulLsInfoP.do?admRulId=53943&efYd=0
|
???
|
||||||
https://resources.lora-alliance.org/technical-specifications/rp002-1-0-4-regional-parameters
|
|
||||||
*/
|
*/
|
||||||
RDEF(KR, 920.0f, 923.0f, 100, 0, 23, true, false, false),
|
RDEF(KR, 920.0f, 923.0f, 100, 0, 0, true, false, false),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Taiwan, 920-925Mhz, limited to 0.5W indoor or coastal, 1.0W outdoor.
|
Taiwan, 920-925Mhz, limited to 0.5W indoor or coastal, 1.0W outdoor.
|
||||||
|
@ -89,20 +89,18 @@ bool PacketAPI::receivePacket(void)
|
|||||||
|
|
||||||
bool PacketAPI::sendPacket(void)
|
bool PacketAPI::sendPacket(void)
|
||||||
{
|
{
|
||||||
if (server->available()) {
|
// fill dummy buffer; we don't use it, we directly send the fromRadio structure
|
||||||
// fill dummy buffer; we don't use it, we directly send the fromRadio structure
|
uint32_t len = getFromRadio(txBuf);
|
||||||
uint32_t len = getFromRadio(txBuf);
|
if (len != 0) {
|
||||||
if (len != 0) {
|
static uint32_t id = 0;
|
||||||
static uint32_t id = 0;
|
fromRadioScratch.id = ++id;
|
||||||
fromRadioScratch.id = ++id;
|
bool result = server->sendPacket(DataPacket<meshtastic_FromRadio>(id, fromRadioScratch));
|
||||||
bool result = server->sendPacket(DataPacket<meshtastic_FromRadio>(id, fromRadioScratch));
|
if (!result) {
|
||||||
if (!result) {
|
LOG_ERROR("send queue full");
|
||||||
LOG_ERROR("send queue full");
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
}
|
return result;
|
||||||
return false;
|
} else
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool PacketAPI::notifyProgrammingMode(void)
|
bool PacketAPI::notifyProgrammingMode(void)
|
||||||
|
@ -12,4 +12,4 @@ lib_deps =
|
|||||||
${nrf52840_base.lib_deps}
|
${nrf52840_base.lib_deps}
|
||||||
; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
|
; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
|
||||||
upload_protocol = nrfutil
|
upload_protocol = nrfutil
|
||||||
;upload_port = /dev/ttyACM1
|
upload_port = /dev/ttyACM1
|
@ -16,4 +16,4 @@ lib_deps =
|
|||||||
zinggjm/GxEPD2@^1.6.2
|
zinggjm/GxEPD2@^1.6.2
|
||||||
; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
|
; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
|
||||||
upload_protocol = nrfutil
|
upload_protocol = nrfutil
|
||||||
;upload_port = /dev/ttyACM1
|
upload_port = /dev/ttyACM1
|
||||||
|
@ -12,4 +12,4 @@ lib_deps =
|
|||||||
${nrf52840_base.lib_deps}
|
${nrf52840_base.lib_deps}
|
||||||
; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
|
; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
|
||||||
upload_protocol = nrfutil
|
upload_protocol = nrfutil
|
||||||
;upload_port = /dev/ttyACM1
|
upload_port = /dev/ttyACM1
|
||||||
|
@ -6,7 +6,7 @@ board_build.psram_type = opi
|
|||||||
board_upload.flash_size = 8MB
|
board_upload.flash_size = 8MB
|
||||||
board_upload.maximum_size = 8388608
|
board_upload.maximum_size = 8388608
|
||||||
board = esp32-s3-devkitc-1
|
board = esp32-s3-devkitc-1
|
||||||
;upload_port = /dev/ttyUSB0
|
upload_port = /dev/ttyUSB0
|
||||||
board_level = extra
|
board_level = extra
|
||||||
upload_protocol = esptool
|
upload_protocol = esptool
|
||||||
build_flags =
|
build_flags =
|
||||||
@ -33,7 +33,7 @@ board_build.psram_type = opi
|
|||||||
board_upload.flash_size = 8MB
|
board_upload.flash_size = 8MB
|
||||||
board_upload.maximum_size = 8388608
|
board_upload.maximum_size = 8388608
|
||||||
board = esp32-s3-devkitc-1
|
board = esp32-s3-devkitc-1
|
||||||
;upload_port = /dev/ttyUSB0
|
upload_port = /dev/ttyUSB0
|
||||||
board_level = extra
|
board_level = extra
|
||||||
upload_protocol = esptool
|
upload_protocol = esptool
|
||||||
build_flags =
|
build_flags =
|
||||||
@ -60,7 +60,7 @@ board_build.psram_type = opi
|
|||||||
board_upload.flash_size = 8MB
|
board_upload.flash_size = 8MB
|
||||||
board_upload.maximum_size = 8388608
|
board_upload.maximum_size = 8388608
|
||||||
board = esp32-s3-devkitc-1
|
board = esp32-s3-devkitc-1
|
||||||
;upload_port = /dev/ttyUSB0
|
upload_port = /dev/ttyUSB0
|
||||||
board_level = extra
|
board_level = extra
|
||||||
upload_protocol = esptool
|
upload_protocol = esptool
|
||||||
build_flags =
|
build_flags =
|
||||||
|
Loading…
Reference in New Issue
Block a user