Skip to content

Commit dcab92f

Browse files
Mr-DaveMr-Dave
committed
Update project page for MotionPlus
1 parent 9e557f8 commit dcab92f

10 files changed

Lines changed: 3657 additions & 83 deletions

‎index.html‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<meta name="keywords" content="security camera software, ip camera, rtsp, pi camera, motion detection, cctv,open source, free, privacy masking"/>
88
<meta property="og:title" content="Motion - Open source security camera software"/>
99
<meta property="og:site_name" content="Motion"/>
10-
<meta property="og:type" content="website"/>
10+
<meta property="og:type" content="website"/>
1111
<meta property="og:url" content="https://motion-project.github.io/"/>
1212
<meta property="og:image" content="https://motion-project.github.io/motion.png"/>
1313
<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -44,19 +44,18 @@
4444
</div>
4545
<section class="page-header">
4646
<h1>
47-
Motion
47+
Home
4848
</h1>
4949
</section>
5050
<section class="main-content">
51-
<h3>
52-
<a id="welcome-to-motion" class="anchor" href="#welcome-to-motion" aria-hidden="true">
53-
<span aria-hidden="true" class="octicon octicon-link"></span>
54-
</a>About Motion
55-
</h3>
5651
<p></p>
57-
Motion is a highly configurable program that monitors video signals from many types of cameras.
52+
Motion and MotionPlus are highly configurable programs that monitor video signals from many types of cameras and depending
53+
upon how they are configured, perform actions when movement is detected.
5854
<p></p>
59-
Set it up to monitor your security cameras, watch birds, check in on your pet, create timelapse videos and more.
55+
Motion is the original software dating back to 2000 while MotionPlus is a new application. MotionPlus was added as a
56+
new application in order to allow for removal of older functionality rarely used while also adding new functionalities.
57+
<p></p>
58+
The applications include the ablity to:
6059
<p></p>
6160
<ul>
6261
<li>Create videos or save pictures of the activity</li>
@@ -68,7 +67,7 @@ <h3>
6867
<li>Full tls(https) support with authentication for webcontrol and streams</li>
6968
</ul>
7069
<p></p>
71-
Use Motion with many types of devices
70+
Use with many types of devices
7271
<p></p>
7372
<ul>
7473
<li>Network cameras via RTSP, RTMP and HTTP</li>

‎motion_download.html‎

Lines changed: 53 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -40,33 +40,60 @@ <h1>
4040
Download
4141
</h1>
4242
</section>
43+
4344
<section class="main-content">
44-
<h3><a id="releases" class="anchor" href="#releases" aria-hidden="true">
45-
<span aria-hidden="true" class="octicon octicon-link"></span></a>
46-
Releases
47-
</h3>
48-
<p></p>
49-
The most current release of the Motion application can be found on the
50-
<a href="https://github.com/Motion-Project/motion/releases">releases</a> page.
51-
<p></p>
52-
<h3>
53-
<a id="source-code" class="anchor" href="#source-code" aria-hidden="true">
54-
<span aria-hidden="true" class="octicon octicon-link"></span></a>
55-
Source code
56-
</h3>
57-
<p></p>
58-
The latest source code for Motion is in our github
59-
<a href="https://github.com/Motion-Project/motion">repo</a>.
60-
Instructions for building Motion on various systems is included in the
61-
<a href="motion_build.html">Motion guide</a>.
62-
<p></p>
63-
For users that wish to create their own deb file from the github source code, a build
64-
script is available in the motion-packaging repository which automates the deb creation process.
65-
<p></p>
66-
Download the
67-
<a href="https://raw.githubusercontent.com/Motion-Project/motion-packaging/master/builddeb.sh">script</a>, mark
68-
it as executable, then execute it. The script will identify and report any missing packages and once all the
69-
required packages are installed on the system it will create a deb package.
45+
46+
<p></p>
47+
<p></p>
48+
The following provides the links to the Motion and MotionPlus releases, source code, build instructions
49+
and scripts to build deb files.
50+
<p></p>
51+
<p></p>
52+
<div class="tblreleasecurrent">
53+
<table style="border-width:0.5px; text-align: center;" cellspacing="0" cellpadding="0" >
54+
<colgroup>
55+
<col width="300px">
56+
<col width="300px">
57+
<col width="300px">
58+
</colgroup>
59+
<thead >
60+
<tr >
61+
<th word-wrap:break-word > Motion </th>
62+
<td word-wrap:break-word > </td>
63+
<th word-wrap:break-word > MotionPlus </th>
64+
</tr>
65+
</thead>
66+
<tbody>
67+
<tr>
68+
<td word-wrap:break-word > </td>
69+
<td word-wrap:break-word > </td>
70+
<td word-wrap:break-word > </td>
71+
</tr>
72+
73+
<tr>
74+
<td word-wrap:break-word > <a href="https://github.com/Motion-Project/motion/releases">Releases</a></td>
75+
<td word-wrap:break-word > </td>
76+
<td word-wrap:break-word > <a href="https://github.com/Motion-Project/motionplus/releases">Releases</a></td>
77+
</tr>
78+
<tr>
79+
<td word-wrap:break-word > <a href="https://github.com/Motion-Project/motion">Source Code Repository</a></td>
80+
<td word-wrap:break-word > </td>
81+
<td word-wrap:break-word > <a href="https://github.com/Motion-Project/motionplus">Source Code Repository</a></td>
82+
</tr>
83+
<tr>
84+
<td word-wrap:break-word > <a href="motion_build.html">Build Guide</a> </td>
85+
<td word-wrap:break-word > </td>
86+
<td word-wrap:break-word > <a href="motionplus_build.html">Build Guide</a> </td>
87+
</tr>
88+
<tr>
89+
<td word-wrap:break-word > <a href="https://raw.githubusercontent.com/Motion-Project/motion-packaging/master/builddeb.sh">Deb Creation Script</a></td>
90+
<td word-wrap:break-word > </td>
91+
<td word-wrap:break-word > <a href="https://raw.githubusercontent.com/Motion-Project/motion-packaging/master/buildplus.sh">Deb Creation Script</a> </td>
92+
</tr>
93+
</tbody>
94+
</table>
95+
</div>
96+
7097
</section>
7198
</body>
7299
</html>

‎motion_guide.html‎

Lines changed: 206 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -42,40 +42,217 @@ <h1>
4242
</section>
4343
<section class="main-content">
4444

45-
<h3><a name="Current_Release"></a> Latest Stable Release</h3>
46-
<ul>
47-
<li> <a href="motion_build.html"> Installing with apt/debs and building from source </a></li>
48-
<li> <a href="motion_config.html"> Configuration </a></li>
49-
<li> <a href="motion_config.html#commandlineoptions"> Command Line Options </a></li>
50-
<li> <a href="motion_config.html#configfiles">Configuration Files</a></li>
51-
<li> <a href="motion_config.html#Signals_Sent"> Signals (sent with e.g. kill command) </a></li>
52-
<li> Configuration Options</li>
53-
<ul>
54-
<li> <a href="motion_config.html#Configuration_OptionsAlpha"> Listed alphabetically with mapping of old option names to current names </a></li>
55-
<li> <a href="motion_config.html#Configuration_OptionsTopic"> Listed by topic </a></li>
56-
<li> <a href="motion_config.html#Configuration_OptionsDetail"> Detail descriptions of each option</a></li>
57-
</ul>
5845
<p></p>
46+
The links below provide the documentation associated with the various releases of the Motion and MotionPlus software.
5947
<p></p>
60-
</ul>
6148
<p></p>
62-
<h3><a name="Prior"></a> Prior Release Versions</h3>
63-
<ul>
64-
<li> <a href="4.4.0/motion_config.html"> Version 4.4.0</a></li>
65-
<li> <a href="4.3.2/motion_config.html"> Version 4.3.2</a></li>
66-
<li> <a href="4.3.1/motion_config.html"> Version 4.3.1</a></li>
67-
<li> <a href="4.3.0/motion_config.html"> Version 4.3.0</a></li>
68-
<li> <a href="4.2.2/motion_config.html"> Version 4.2.2</a></li>
69-
<li> <a href="4.2.1/motion_config.html"> Version 4.2.1</a></li>
70-
<li> <a href="4.2/motion_config.html"> Version 4.2</a></li>
71-
<li> <a href="4.1.1/motion_guide.html"> Version 4.1.1</a></li>
72-
<li> <a href="4.1/motion_guide.html"> Version 4.1</a></li>
73-
<li> <a href="4.0.1/motion_guide.html"> Version 4.0.1</a></li>
74-
<li> <a href="4.0/motion_guide.html"> Version 4.0</a></li>
75-
<li> <a href="3.4.1/motion_guide.html"> Version 3.4.1</a></li>
49+
50+
51+
<h3><a name="Current_Release"></a>Documentation For Latest Releases</h3>
52+
<div class="tblreleasecurrent">
53+
<table style="border-width:0.5px; text-align: center;" cellspacing="0" cellpadding="0" >
54+
<colgroup>
55+
<col width="300px">
56+
<col width="300px">
57+
<col width="300px">
58+
</colgroup>
59+
<thead >
60+
<tr >
61+
<th word-wrap:break-word > Motion </th>
62+
<td word-wrap:break-word > </td>
63+
<th word-wrap:break-word > MotionPlus </th>
64+
</tr>
65+
</thead>
66+
<tbody>
67+
<tr>
68+
<td word-wrap:break-word > <a href="motion_build.html">Installing and building from source </a></td>
69+
<td word-wrap:break-word > </td>
70+
<td word-wrap:break-word > <a href="motionplus_build.html">Installing and building from source </a></td>
71+
</tr>
72+
<tr>
73+
<td word-wrap:break-word > <a href="motion_config.html">Configuration</a></td>
74+
<td word-wrap:break-word > </td>
75+
<td word-wrap:break-word > <a href="motionplus_config.html">Configuration</a></td>
76+
</tr>
77+
<tr>
78+
<td word-wrap:break-word > </a></td>
79+
<td word-wrap:break-word > </td>
80+
<td word-wrap:break-word > <a href="motionplus_examples.html">Examples</a></td>
81+
</tr>
82+
83+
</tbody>
84+
</table>
85+
</div>
86+
87+
<p></p>
88+
<p></p>
89+
<p></p>
90+
<p></p>
91+
92+
<h3><a name="Comparison"></a>Comparison Of Motion vs MotionPlus</h3>
93+
<div>
94+
<table class="tblcomp" >
95+
<colgroup>
96+
<col width="300px">
97+
<col width="300px">
98+
<col width="300px">
99+
</colgroup>
100+
<thead >
101+
<tr >
102+
<th bgcolor="#edf4f9" word-wrap:break-word >Motion</th>
103+
<th bgcolor="#edf4f9" word-wrap:break-word >Description</th>
104+
<th bgcolor="#edf4f9" word-wrap:break-word >MotionPlus</th>
105+
</tr>
106+
</thead>
107+
<tbody>
108+
<tr>
109+
<td bgcolor="#edf4f9" word-wrap:break-word >Limited</td>
110+
<td bgcolor="#edf4f9" word-wrap:break-word >Feature Enhancements</td>
111+
<td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
112+
</tr>
113+
<tr>
114+
<td bgcolor="#edf4f9" word-wrap:break-word >Optional</td>
115+
<td bgcolor="#edf4f9" word-wrap:break-word >FFmpeg Libraries</td>
116+
<td bgcolor="#edf4f9" word-wrap:break-word >Required</td>
117+
</tr>
118+
<tr>
119+
<td bgcolor="#edf4f9" word-wrap:break-word >Supported</td>
120+
<td bgcolor="#edf4f9" word-wrap:break-word >Multiple input v4l2 cards(RoundRobin)</td>
121+
<td bgcolor="#edf4f9" word-wrap:break-word >Not Supported</td>
122+
</tr>
123+
<tr>
124+
<td bgcolor="#edf4f9" word-wrap:break-word >Supported</td>
125+
<td bgcolor="#edf4f9" word-wrap:break-word >Brooktree video cards</td>
126+
<td bgcolor="#edf4f9" word-wrap:break-word >Not Supported</td>
127+
</tr>
128+
<tr>
129+
<td bgcolor="#edf4f9" word-wrap:break-word >Internal partial legacy</td>
130+
<td bgcolor="#edf4f9" word-wrap:break-word >Camera Tracking</td>
131+
<td bgcolor="#edf4f9" word-wrap:break-word >External scripts only</td>
132+
</tr>
133+
<tr>
134+
<td bgcolor="#edf4f9" word-wrap:break-word >Optional</td>
135+
<td bgcolor="#edf4f9" word-wrap:break-word >Multiple ports for web control and streams</td>
136+
<td bgcolor="#edf4f9" word-wrap:break-word >Single port only</td>
137+
</tr>
138+
<tr>
139+
<td bgcolor="#edf4f9" word-wrap:break-word >-</td>
140+
<td bgcolor="#edf4f9" word-wrap:break-word >OpenCV Cascades/HOG/DNN</td>
141+
<td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
142+
</tr>
143+
<tr>
144+
<td bgcolor="#edf4f9" word-wrap:break-word >-</td>
145+
<td bgcolor="#edf4f9" word-wrap:break-word >Direct libcamera support</td>
146+
<td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
147+
</tr>
148+
<tr>
149+
<td bgcolor="#edf4f9" word-wrap:break-word >-</td>
150+
<td bgcolor="#edf4f9" word-wrap:break-word >Sound recording from passthrough cameras</td>
151+
<td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
152+
</tr>
153+
<tr>
154+
<td bgcolor="#edf4f9" word-wrap:break-word >-</td>
155+
<td bgcolor="#edf4f9" word-wrap:break-word >Sound frequency detection</td>
156+
<td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
157+
</tr>
158+
<tr>
159+
<td bgcolor="#edf4f9" word-wrap:break-word >-</td>
160+
<td bgcolor="#edf4f9" word-wrap:break-word >Download/Play movies via web page</td>
161+
<td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
162+
</tr>
163+
<tr>
164+
<td bgcolor="#edf4f9" word-wrap:break-word >-</td>
165+
<td bgcolor="#edf4f9" word-wrap:break-word >Add/Delete cameras via web page</td>
166+
<td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
167+
</tr>
168+
<tr>
169+
<td bgcolor="#edf4f9" word-wrap:break-word >-</td>
170+
<td bgcolor="#edf4f9" word-wrap:break-word >Additional Motion detection measures</td>
171+
<td bgcolor="#edf4f9" word-wrap:break-word >Yes</td>
172+
</tr>
173+
174+
</tbody>
175+
</table>
176+
</div>
177+
76178
<p></p>
77179
<p></p>
78-
</ul>
180+
<p></p>
181+
<p></p>
182+
183+
<h3><a name="Prior"></a>Documentation For Prior Releases</h3>
184+
<p></p>
185+
The documentation is provided as it was included in each release.
186+
<p></p>
187+
<p></p>
188+
189+
<div class="tblreleaseprior">
190+
<table style="border-width:0.5px; text-align: center;" cellspacing="0" cellpadding="0" >
191+
<colgroup>
192+
<col width="500px">
193+
<col width="500px">
194+
</colgroup>
195+
<thead >
196+
<tr >
197+
<th word-wrap:break-word > Motion </th>
198+
<th word-wrap:break-word > MotionPlus </th>
199+
</tr>
200+
</thead>
201+
<tbody>
202+
<tr>
203+
<td word-wrap:break-word > <a href="4.4.0/motion_config.html"> Version 4.4.0</a> </td>
204+
<td word-wrap:break-word > </td>
205+
</tr>
206+
<tr>
207+
<td word-wrap:break-word > <a href="4.3.2/motion_config.html"> Version 4.3.2</a> </td>
208+
<td word-wrap:break-word > </td>
209+
</tr>
210+
<tr>
211+
<td word-wrap:break-word > <a href="4.3.1/motion_config.html"> Version 4.3.1</a></td>
212+
<td word-wrap:break-word > </td>
213+
</tr>
214+
<tr>
215+
<td word-wrap:break-word > <a href="4.3.0/motion_config.html"> Version 4.3.0</a></td>
216+
<td word-wrap:break-word > </td>
217+
</tr>
218+
<tr>
219+
<td word-wrap:break-word ><a href="4.2.2/motion_config.html"> Version 4.2.2</a> </td>
220+
<td word-wrap:break-word > </td>
221+
</tr>
222+
<tr>
223+
<td word-wrap:break-word ><a href="4.2.1/motion_config.html"> Version 4.2.1</a> </td>
224+
<td word-wrap:break-word > </td>
225+
</tr>
226+
<tr>
227+
<td word-wrap:break-word ><a href="4.2/motion_config.html"> Version 4.2</a> </td>
228+
<td word-wrap:break-word > </td>
229+
</tr>
230+
<tr>
231+
<td word-wrap:break-word ><a href="4.1.1/motion_guide.html"> Version 4.1.1</a> </td>
232+
<td word-wrap:break-word > </td>
233+
</tr>
234+
<tr>
235+
<td word-wrap:break-word ><a href="4.1/motion_guide.html"> Version 4.1</a></td>
236+
<td word-wrap:break-word > </td>
237+
</tr>
238+
<tr>
239+
<td word-wrap:break-word ><a href="4.0.1/motion_guide.html"> Version 4.0.1</a> </td>
240+
<td word-wrap:break-word > </td>
241+
</tr>
242+
<tr>
243+
<td word-wrap:break-word > <a href="4.0/motion_guide.html"> Version 4.0</a></td>
244+
<td word-wrap:break-word > </td>
245+
</tr>
246+
<tr>
247+
<td word-wrap:break-word ><a href="3.4.1/motion_guide.html"> Version 3.4.1</a> </td>
248+
<td word-wrap:break-word > </td>
249+
</tr>
250+
251+
</tbody>
252+
</table>
253+
</div>
254+
255+
79256
</section>
80257
</body>
81258
</html>

0 commit comments

Comments
 (0)