Commit graph

4483 commits

Author SHA1 Message Date
Ben Meadors 19bcffcc04
Merge branch 'master' into add-station-g2 2024-06-21 18:01:29 -05:00
Ben Meadors 068bf7a692
Merge pull request #1306 from meshtastic/power-saving-roles
Power saving roles notes and corrections
2024-06-21 18:00:41 -05:00
Ben Meadors 52652ddacf
Update device.mdx 2024-06-21 17:58:27 -05:00
Ben Meadors ce2aa6daac
Power saving roles notes and corrections 2024-06-21 16:58:59 -05:00
rcarteraz 655c26e2b8
Merge branch 'master' into add-station-g2 2024-06-21 09:48:58 -07:00
rcarteraz 364481c8b0
Merge pull request #1305 from markuslang79/master
Added links to German Meshtastic Groups
2024-06-21 09:48:46 -07:00
Markus Lang c2528b318e Update local-groups.mdx
Added 'Meshtastic Germany' Facebook group and 'Mesh Hessen' Telegram group links
2024-06-21 18:02:46 +02:00
rcarteraz a50eb058ab
Merge branch 'master' into add-station-g2 2024-06-20 13:58:49 -07:00
rcarteraz 2f5939b889
Merge pull request #1294 from meshtastic/dependabot/npm_and_yarn/braces-3.0.3
Bump braces from 3.0.2 to 3.0.3
2024-06-20 13:56:11 -07:00
rcarteraz 150e468f57
Merge branch 'master' into dependabot/npm_and_yarn/braces-3.0.3 2024-06-20 13:43:07 -07:00
rcarteraz 1b1106508f Merge branch 'add-station-g2' of https://github.com/rcarteraz/meshtastic into add-station-g2 2024-06-20 09:02:12 -07:00
rcarteraz 01b263303f add note about station g1 being discontinued 2024-06-20 09:01:59 -07:00
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
dependabot[bot] df5dcd5b66
Bump braces from 3.0.2 to 3.0.3
Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-18 20:02:00 +00: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