Skip to content

Commit 7ae5e14

Browse files
README update
1 parent 7faddb3 commit 7ae5e14

File tree

6 files changed

+25
-660
lines changed

6 files changed

+25
-660
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ jobs:
261261
id: toml
262262
run: |
263263
NEOLINK_VERSION="$(toml get Cargo.toml package.version | sed 's|"||g')"
264-
echo "version=${NEOLINK_VERSION}" >> $GITHUB_OUTPUT
264+
echo "version=${NEOLINK_VERSION}" >> $GITHUB_OUTPUT
265265
- name: Download Windows
266266
uses: actions/download-artifact@v3
267267
with:

.pre-commit-config.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
repos:
2+
- repo: https://github.com/doublify/pre-commit-rust
3+
rev: eeee35a
4+
hooks:
5+
- id: fmt
6+
- repo: https://github.com/pre-commit/pre-commit-hooks
7+
rev: v4.4.0 # Use the ref you want to point at
8+
hooks:
9+
- id: trailing-whitespace
10+
- id: check-case-conflict
11+
- id: check-merge-conflict
12+
- id: check-toml
13+
- id: mixed-line-ending
14+

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ sudo apt install \
5151
libgstrtspserver-1.0-0 \
5252
libgstreamer1.0-0 \
5353
libgstreamer-plugins-bad1.0-0 \
54+
gstreamer1.0-plugins-base \
5455
gstreamer1.0-plugins-good \
5556
gstreamer1.0-plugins-bad
5657
```
@@ -102,7 +103,7 @@ The IP is discovered with four methods
102103

103104
1. Local discovery: Here we send a broadcast on all visible networks asking the local
104105
network if there is a camera with this UID. This only works if the network supports broadcasts
105-
106+
106107
If you know the ip address you can put it into the `address` field of the config and attempt a
107108
direct connection without broadcasts. This requires a route from neolink to the camera.
108109

@@ -115,9 +116,9 @@ The IP is discovered with four methods
115116
Once the camera either polls/recives a connect request from the reolink servers the camera will then
116117
initiate a connect to neolink. This requires that our IP and the reolink IPs are reacable from the camera.
117118

118-
4. Relay: In this case we request that reolink relay our connection. Neolink nor the camera need to be able to
119+
4. Relay: In this case we request that reolink relay our connection. Neolink nor the camera need to be able to
119120
direcly contact each other. But both neolink and the camera need to be able to contact reolink.
120-
121+
121122
This can be controlled with the config
122123

123124
```toml
@@ -188,7 +189,6 @@ uid = "ABCDEF0123456789"
188189
[cameras.pause]
189190
on_motion = true # Should pause when no motion
190191
on_client = true # Should pause when no rtsp client
191-
mode = "none" # What to do when paused values are: none, black, still, test
192192
timeout = 2.1 # How long to wait after motion stops before pausing
193193
```
194194

docs/Setting Up Neolink For Use With Blue Iris.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,23 @@ The config file tells Neolink how to connect to your camera and serve the video
4747
1. Create a simple text file (i.g. `config.toml`) in the same directory you have unpacked Neolink with the following format:
4848

4949
bind = "0.0.0.0"
50-
50+
5151
[[cameras]]
5252
name = "cameraname"
5353
username = "admin"
5454
password = "password"
5555
address = "192.168.1.10:9000"
5656
stream = "both"
57-
57+
5858
2. Change `cameraname` to a legible, phonetic name that describes your camera. Leave the quotes around the name.
5959

6060
3. The default username is `admin`; leave this unless you've created another user.
6161

6262
4. Replace `password` with the password you set on the camera. If you chose to not use a password, remove this line from the config file. Again, leave the quotes.
6363

64-
5. Replace `192.168.1.10:9000` with the IP address you set for your camera.
64+
5. Replace `192.168.1.10:9000` with the IP address you set for your camera.
6565
Note: The port, `:9000`, should remain at the end of your IP address. This is the proprietary "media port" that Reolink uses.
66-
66+
6767
6. The `stream` line allows you to choose which stream type to use. Neolink supports streaming two streams, the main-stream, and the sub-stream. It can stream either one, or both. If you wish to stream both streams, leave this line as is. If you wish to stream _only_ the main-stream, change `both` to `mainStream`. If you wish to stream only the sub-stream, change `both` to `subStream`.
6868

6969
Note: Reolink D400/B400 Cameras **_do not support serving both streams at once_**, so you must manually choose which stream type to use. For best quality, choose the main stream.
@@ -190,7 +190,7 @@ _The best way to have Neolink run at startup is create a Scheduled Task that sta
190190

191191
12. Check "If the task fails, restart every:"
192192

193-
13. For redundancy, enter `999` into the number of restart tries.
193+
13. For redundancy, enter `999` into the number of restart tries.
194194

195195
_The Settings tab should look something like this:_
196196

sample_config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ address = "192.168.1.187:9000"
6767
#
6868
# By default we hide these status messages from the user but you can instead requst that
6969
# they be printed to stdout using print_format
70-
#
70+
#
7171
# Valid values are:
7272
# - None
7373
# - Human

0 commit comments

Comments
 (0)