Skip to content

Commit d199de0

Browse files
committed
Merge branch 'develop'
Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
2 parents fef6e12 + d02c6ca commit d199de0

Some content is hidden

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

59 files changed

+3076
-1484
lines changed

components.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ declare module 'vue' {
4949
BedScrewsAdjustDialog: typeof import('./src/components/common/BedScrewsAdjustDialog.vue')['default']
5050
CollapsableCard: typeof import('./src/components/common/CollapsableCard.vue')['default']
5151
FlashMessage: typeof import('./src/components/common/FlashMessage.vue')['default']
52+
KeyboardShortcutsDialog: typeof import('./src/components/common/KeyboardShortcutsDialog.vue')['default']
5253
KlippyStatusCard: typeof import('./src/components/common/KlippyStatusCard.vue')['default']
5354
ManualProbeDialog: typeof import('./src/components/common/ManualProbeDialog.vue')['default']
5455
PeripheralsDialog: typeof import('./src/components/common/PeripheralsDialog.vue')['default']

docs/features/cameras.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ The current supported types are:
4747
- Loads a webrtc stream from go2rtc.
4848
- Example stream URL: `http(s)://your.domain/webrtc/stream.html?src=trident&mode=webrtc`
4949

50+
- **WebRTC (MediaMTX)**
51+
- Loads a webrtc stream from MediaMTX.
52+
- Example stream URL: `http(s)://your.domain/stream`
53+
5054
- **IP Camera**
5155
- Experimental option replacing the `<img>` tag with a `<video>` tag.
5256
- Use only if your provided URL supports native HTML5 video tags.

0 commit comments

Comments
 (0)