Skip to content

Commit 0811905

Browse files
Merge pull request #2 from Tom-Hirschberger/development
Development
2 parents 2c05add + 2f21012 commit 0811905

5 files changed

+53
-22
lines changed

LICENSE

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2019 Tom-Hirschberger
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

MMM-LEDStripControl.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* global Module
22
3-
/* Magic Mirror
3+
/* MagicMirror²
44
* Module: LEDStripControl
55
*
66
* By Tom Hirschberger

ledstripcontrol.css

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.lsc-rootWrapper{
1+
.MMM-LEDStripControl .lsc-rootWrapper{
22
display: flex;
33
flex-direction: row;
44
flex-wrap: wrap;
@@ -8,88 +8,88 @@
88
text-align: center;
99
}
1010

11-
.lsc-output.lsc-icon{
11+
.MMM-LEDStripControl .lsc-output.lsc-icon{
1212
padding: 5px;
1313
}
1414

15-
.lsc-hdwBtn.lsc-icon{
15+
.MMM-LEDStripControl .lsc-hdwBtn.lsc-icon{
1616
padding: 5px;
1717
}
1818

19-
.lsc-color-header, .lsc-options-header {
19+
.MMM-LEDStripControl .lsc-color-header, .MMM-LEDStripControl .lsc-options-header {
2020
font-size: 20px;
2121
}
2222

23-
.lsc-optionsInnerHeader {
23+
.MMM-LEDStripControl .lsc-optionsInnerHeader {
2424
font-size: 16px;
2525
}
2626

27-
.lsc-totalColorWrapper, .lsc-totalOptionsWrapper{
27+
.MMM-LEDStripControl .lsc-totalColorWrapper, .MMM-LEDStripControl .lsc-totalOptionsWrapper{
2828
display: flex;
2929
flex-direction: column;
3030
margin: 5px;
3131
}
3232

33-
.lsc-colorOuterWrapper, .lsc-optionsOuterWrapper{
33+
.MMM-LEDStripControl .lsc-colorOuterWrapper, .MMM-LEDStripControl .lsc-optionsOuterWrapper{
3434
display: flex;
3535
flex-direction: row;
3636
}
3737

38-
.lsc-up-down-wrapper, .lsc-optionsInnerWrapper{
38+
.MMM-LEDStripControl .lsc-up-down-wrapper, .MMM-LEDStripControl .lsc-optionsInnerWrapper{
3939
display:flex;
4040
flex-direction: column;
4141
align-items: center;
4242
}
4343

44-
.lsc-left-right-wrapper {
44+
.MMM-LEDStripControl .lsc-left-right-wrapper {
4545
display:flex;
4646
flex-direction: row;
4747
align-items: center;
4848
}
4949

50-
.lsc-colorIndicator {
50+
.MMM-LEDStripControl .lsc-colorIndicator {
5151
border-radius: 5px;
5252
min-height: 20px;
5353
width: 100%;
5454
margin-bottom: 5px;
5555
}
5656

57-
.lsc-icon, .lsc-value {
57+
.MMM-LEDStripControl .lsc-icon, .MMM-LEDStripControl .lsc-value {
5858
min-width: 65px;
5959
font-size: 30px;
6060
margin-left: auto;
6161
margin-right: auto;
6262
}
6363

64-
.lsc-selected {
64+
.MMM-LEDStripControl .lsc-selected {
6565
border : 5px solid red;
6666
border-radius: 5px;
6767
}
6868

69-
.lsc-unselected {
69+
.MMM-LEDStripControl .lsc-unselected {
7070
border : 5px solid black;
7171
border-radius: 5px;
7272
}
7373

74-
.lsc-outputWrapper, .lsc-brightnessWrapper {
74+
.MMM-LEDStripControl .lsc-outputWrapper, .MMM-LEDStripControl .lsc-brightnessWrapper {
7575
width: 100%;
7676
}
7777

78-
.lsc-brightnessWrapper {
78+
.MMM-LEDStripControl .lsc-brightnessWrapper {
7979
display:flex;
8080
flex-direction: column;
8181
align-items: center;
8282
}
8383

84-
.lsc-output-on {
84+
.MMM-LEDStripControl .lsc-output-on {
8585
color: rgb(228, 214, 19);
8686
}
8787

88-
.lsc-output-off {
88+
.MMM-LEDStripControl .lsc-output-off {
8989
color: rgb(99, 95, 48);
9090
}
9191

92-
.lsc-left, .lsc-fastLeft, .lsc-right, .lsc-fastRight {
92+
.MMM-LEDStripControl .lsc-left, .MMM-LEDStripControl .lsc-fastLeft, .MMM-LEDStripControl .lsc-right, .MMM-LEDStripControl .lsc-fastRight {
9393
min-width: 0px;
9494
margin-left: 10px;
9595
margin-right: 10px;

node_helper.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Magic Mirror
1+
/* MagicMirror²
22
* Module: LEDStripControl
33
*
44
* By Tom Hirschberger

package.json

+12-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,23 @@
11
{
22
"name": "MMM-LEDStripControl",
3-
"version": "0.0.2",
4-
"description": "",
3+
"version": "0.0.3",
4+
"description": "A MagicMirror² module to control WS28XX LED strips with notifications. A module to convert the notifications into MQTT commands like MMM-MQTTbridge is needed to communicate with the LED strip.",
55
"main": "MMM-LEDStripControl",
66
"dependencies": {},
77
"devDependencies": {},
88
"scripts": {
99
"test": "echo \"Error: no test specified\" && exit 0"
1010
},
11+
"keywords": [
12+
"MagicMirror",
13+
"MM",
14+
"LED",
15+
"WS2801",
16+
"WS2813",
17+
"WS2812B",
18+
"Pong",
19+
"MQTT"
20+
],
1121
"repository": {
1222
"type": "git",
1323
"url": "git@github.com:Tom-Hirschberger/MMM-LEDStripControl.git"

0 commit comments

Comments
 (0)