Commit graph

4261 commits

Author SHA1 Message Date
rcarteraz d8d08f6b2f
Merge branch 'meshtastic:master' into add-station-g2 2024-06-20 08:54:49 -07:00
rcarteraz 47a3624863 Add Station G2 2024-06-20 08:54:18 -07:00
rcarteraz 4c0b8a95ad Squashed commit of the following:
commit 86bc3c93e5
Merge: 6cabd5fe cfec3e8e
Author: rcarteraz <robert.l.carter2@gmail.com>
Date:   Wed Jun 19 18:48:14 2024 -0700

    Merge pull request #1301 from rcarteraz/1200bps-reset-button

    Add mention of 1200bps reset button in web flasher

commit cfec3e8eac
Merge: 59d71321 6cabd5fe
Author: rcarteraz <robert.l.carter2@gmail.com>
Date:   Wed Jun 19 17:59:09 2024 -0700

    Merge branch 'master' into 1200bps-reset-button

commit 6cabd5fe95
Merge: f6a97b28 6c40c2e5
Author: rcarteraz <robert.l.carter2@gmail.com>
Date:   Wed Jun 19 17:58:54 2024 -0700

    Merge pull request #1295 from geeksville/pr-nrf52-guide

    Add basic nrf52 guide

commit 6c40c2e555
Merge: 9cbea09e f6a97b28
Author: rcarteraz <robert.l.carter2@gmail.com>
Date:   Wed Jun 19 17:56:57 2024 -0700

    Merge branch 'master' into pr-nrf52-guide

commit 59d71321e3
Author: rcarteraz <robert.l.carter2@gmail.com>
Date:   Wed Jun 19 17:52:06 2024 -0700

    Add mention of 1200bps reset button in web flasher

commit 9cbea09e5c
Author: rcarteraz <robert.l.carter2@gmail.com>
Date:   Tue Jun 18 13:53:25 2024 -0700

    formatting and minor changes

commit fad3a940d1
Merge: f3523b72 f95a398c
Author: rcarteraz <robert.l.carter2@gmail.com>
Date:   Tue Jun 18 13:01:01 2024 -0700

    Merge branch 'master' into pr-nrf52-guide

commit f3523b72f5
Merge: b2fcaa55 70638582
Author: geeksville <kevinh@geeksville.com>
Date:   Sun Jun 16 21:11:52 2024 -0700

    Merge branch 'master' into pr-nrf52-guide

commit b2fcaa5530
Author: geeksville <kevinh@geeksville.com>
Date:   Sun Jun 16 15:16:37 2024 -0700

    Add basic nrf52 guide
2024-06-19 18:50:33 -07:00
rcarteraz 86bc3c93e5
Merge pull request #1301 from rcarteraz/1200bps-reset-button
Add mention of 1200bps reset button in web flasher
2024-06-19 18:48:14 -07:00
rcarteraz cfec3e8eac
Merge branch 'master' into 1200bps-reset-button 2024-06-19 17:59:09 -07:00
rcarteraz 6cabd5fe95
Merge pull request #1295 from geeksville/pr-nrf52-guide
Add basic nrf52 guide
2024-06-19 17:58:54 -07:00
rcarteraz 6c40c2e555
Merge branch 'master' into pr-nrf52-guide 2024-06-19 17:56:57 -07:00
rcarteraz 59d71321e3 Add mention of 1200bps reset button in web flasher 2024-06-19 17:52:06 -07:00
pdxlocations f6a97b28d3
Merge pull request #1300 from Kavitate/patch-1
Update local-groups.mdx
2024-06-19 17:17:54 -07:00
Kavitate a9ad016c10
Update local-groups.mdx
Removed Midwest Mesh header.
2024-06-19 16:38:50 -05:00
Kavitate 8b2999e031
Update local-groups.mdx
Regrouped qualifying states to be listed under the "Midwest Region".
2024-06-19 12:11:36 -05:00
pdxlocations 14ee775453
Merge branch 'master' into patch-1 2024-06-19 09:56:52 -07:00
Kavitate 211f913bad
Update local-groups.mdx
Updated group name and server logo.
2024-06-19 11:54:25 -05:00
rcarteraz eb2560402e
Merge pull request #1298 from rcarteraz/add-unphone
Add unPhone to supported hardware docs
2024-06-19 08:53:23 -07:00
rcarteraz e75f7f5e72 P 2024-06-19 08:23:26 -07:00
Kavitate 4475171276
Update local-groups.mdx
Added midwest mesh group for qualifying states.
2024-06-19 08:39:04 -05:00
rcarteraz b5e5c27bbc i'm about to go postal 2024-06-18 20:31:29 -07:00
rcarteraz 127251a233 another try 2024-06-18 20:24:21 -07:00
rcarteraz dcbfeec56a why isn't this working? 2024-06-18 20:20:28 -07:00
rcarteraz d7c78552d5 trunk fmt 2024-06-18 20:17:03 -07:00
rcarteraz d1b27b4c4f whitespace 2024-06-18 20:16:05 -07:00
rcarteraz 1d9cb80438 Fix spacing 2024-06-18 20:09:03 -07:00
rcarteraz ae7556ec4f add unPhone to supported docs 2024-06-18 20:06:44 -07:00
rcarteraz 9cbea09e5c formatting and minor changes 2024-06-18 13:53:25 -07:00
rcarteraz fad3a940d1
Merge branch 'master' into pr-nrf52-guide 2024-06-18 13:01:01 -07:00
rcarteraz f95a398cd4
Merge pull request #1297 from meshtastic/dependabot/npm_and_yarn/ws-7.5.10
Bump ws from 7.5.9 to 7.5.10
2024-06-18 13:00:46 -07:00
dependabot[bot] 9b7eab4ad7
Bump ws from 7.5.9 to 7.5.10
Bumps [ws](https://github.com/websockets/ws) from 7.5.9 to 7.5.10.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/7.5.9...7.5.10)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-18 18:39:11 +00:00
geeksville f3523b72f5
Merge branch 'master' into pr-nrf52-guide 2024-06-16 21:11:52 -07:00
rcarteraz 70638582bf
Merge pull request #1296 from geeksville/pr-fixinstructs
Update build instructions - pnpm is apparently now the tool used
2024-06-16 17:25:18 -07:00
geeksville 050e57ec18 Update build instructions - pnpm is apparently now the tool used
per @chrichton - woot!
2024-06-16 15:34:22 -07:00
geeksville b2fcaa5530 Add basic nrf52 guide 2024-06-16 15:16:37 -07:00
pdxlocations 78de79b150
Merge pull request #1293 from dunlapbs/patch-2
Update local-groups.mdx
2024-06-12 12:00:25 -07:00
dunlapbs 21dbcfd3e1
Update local-groups.mdx
Modify "Portland and SW Washington" to "PDXMesh for Portland and SW Washington"
2024-06-12 10:56:03 -07:00
pdxlocations 79d5b3ab76
Merge pull request #1292 from dunlapbs/patch-1
Update local-groups.mdx
2024-06-12 10:38:29 -07:00
pdxlocations 257c4e0fb9
Merge branch 'master' into patch-1 2024-06-12 10:34:03 -07:00
pdxlocations 54a22e1708
Merge pull request #1291 from rcarteraz/update-heltec-links
Add Rokland Heltec links
2024-06-12 10:33:05 -07:00
dunlapbs acfbcaabec
Update local-groups.mdx
Adding the Portland and SW Washington Community Discord
2024-06-12 09:44:14 -07:00
rcarteraz f7a8aaeaef update wsl link 2024-06-12 09:31:25 -07:00
rcarteraz 2105ee4e67 add rokland heltec links 2024-06-12 08:36:14 -07:00
pdxlocations e5ea17ba1b
Merge pull request #1290 from NB7N/patch-1
Update local-groups.mdx
2024-06-11 22:35:34 -07:00
NB7N 73b86f82fe
Update local-groups.mdx
Added Oregon community website
2024-06-11 15:06:04 -07:00
rcarteraz bcce4bf9de
Merge pull request #1287 from Nestpebble/patch-6
Update to European Lora frequency and duty cycle info, including EU regulatory framework, and add UK regulatory doc
2024-06-11 08:31:50 -07:00
Nestpebble 1c25b8e593
Update radio-settings.mdx 2024-06-09 21:56:05 +01:00
Nestpebble c0d1579877
Update _lora-regions to clarify rolling hour
The rolling 1-hour window isn't clear in the docs.
2024-06-09 21:19:09 +01:00
Nestpebble 91afc1c8b7
Update radio-settings.mdx 2024-06-07 10:27:15 +01:00
Nestpebble 86becff264
Update docs/about/overview/radio-settings.mdx
Corrected one typo, another one appears. C'est la vie...

Co-authored-by: Alice <84906+wheresalice@users.noreply.github.com>
2024-06-07 08:25:53 +01:00
Nestpebble 59421a134c
Update radio-settings.mdx
Added info on the EU and the selection of bands.
2024-06-06 23:47:57 +01:00
Nestpebble 13c246a5e5
Update region-by-country.mdx 2024-06-06 23:43:22 +01:00
Nestpebble ba287af896
Update UK regulatory doc & include note for EU
Following discussion on the Discord, some additional notes to help locate the specific parts of the UK and EU regulations for local frequency bands, duty cycles, etc.
2024-06-06 00:54:49 +01:00
pdxlocations 09caac5075
Merge pull request #1285 from RCGV1/master
Update Bay Area in Local Groups
2024-06-03 23:04:09 -07:00