Skip to content

Commit

Permalink
Merge pull request #2 from Tom-Hirschberger/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
Tom-Hirschberger committed Nov 24, 2023
2 parents 2c05add + 2f21012 commit 0811905
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 22 deletions.
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2019 Tom-Hirschberger

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
2 changes: 1 addition & 1 deletion MMM-LEDStripControl.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* global Module
/* Magic Mirror
/* MagicMirror²
* Module: LEDStripControl
*
* By Tom Hirschberger
Expand Down
36 changes: 18 additions & 18 deletions ledstripcontrol.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.lsc-rootWrapper{
.MMM-LEDStripControl .lsc-rootWrapper{
display: flex;
flex-direction: row;
flex-wrap: wrap;
Expand All @@ -8,88 +8,88 @@
text-align: center;
}

.lsc-output.lsc-icon{
.MMM-LEDStripControl .lsc-output.lsc-icon{
padding: 5px;
}

.lsc-hdwBtn.lsc-icon{
.MMM-LEDStripControl .lsc-hdwBtn.lsc-icon{
padding: 5px;
}

.lsc-color-header, .lsc-options-header {
.MMM-LEDStripControl .lsc-color-header, .MMM-LEDStripControl .lsc-options-header {
font-size: 20px;
}

.lsc-optionsInnerHeader {
.MMM-LEDStripControl .lsc-optionsInnerHeader {
font-size: 16px;
}

.lsc-totalColorWrapper, .lsc-totalOptionsWrapper{
.MMM-LEDStripControl .lsc-totalColorWrapper, .MMM-LEDStripControl .lsc-totalOptionsWrapper{
display: flex;
flex-direction: column;
margin: 5px;
}

.lsc-colorOuterWrapper, .lsc-optionsOuterWrapper{
.MMM-LEDStripControl .lsc-colorOuterWrapper, .MMM-LEDStripControl .lsc-optionsOuterWrapper{
display: flex;
flex-direction: row;
}

.lsc-up-down-wrapper, .lsc-optionsInnerWrapper{
.MMM-LEDStripControl .lsc-up-down-wrapper, .MMM-LEDStripControl .lsc-optionsInnerWrapper{
display:flex;
flex-direction: column;
align-items: center;
}

.lsc-left-right-wrapper {
.MMM-LEDStripControl .lsc-left-right-wrapper {
display:flex;
flex-direction: row;
align-items: center;
}

.lsc-colorIndicator {
.MMM-LEDStripControl .lsc-colorIndicator {
border-radius: 5px;
min-height: 20px;
width: 100%;
margin-bottom: 5px;
}

.lsc-icon, .lsc-value {
.MMM-LEDStripControl .lsc-icon, .MMM-LEDStripControl .lsc-value {
min-width: 65px;
font-size: 30px;
margin-left: auto;
margin-right: auto;
}

.lsc-selected {
.MMM-LEDStripControl .lsc-selected {
border : 5px solid red;
border-radius: 5px;
}

.lsc-unselected {
.MMM-LEDStripControl .lsc-unselected {
border : 5px solid black;
border-radius: 5px;
}

.lsc-outputWrapper, .lsc-brightnessWrapper {
.MMM-LEDStripControl .lsc-outputWrapper, .MMM-LEDStripControl .lsc-brightnessWrapper {
width: 100%;
}

.lsc-brightnessWrapper {
.MMM-LEDStripControl .lsc-brightnessWrapper {
display:flex;
flex-direction: column;
align-items: center;
}

.lsc-output-on {
.MMM-LEDStripControl .lsc-output-on {
color: rgb(228, 214, 19);
}

.lsc-output-off {
.MMM-LEDStripControl .lsc-output-off {
color: rgb(99, 95, 48);
}

.lsc-left, .lsc-fastLeft, .lsc-right, .lsc-fastRight {
.MMM-LEDStripControl .lsc-left, .MMM-LEDStripControl .lsc-fastLeft, .MMM-LEDStripControl .lsc-right, .MMM-LEDStripControl .lsc-fastRight {
min-width: 0px;
margin-left: 10px;
margin-right: 10px;
Expand Down
2 changes: 1 addition & 1 deletion node_helper.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Magic Mirror
/* MagicMirror²
* Module: LEDStripControl
*
* By Tom Hirschberger
Expand Down
14 changes: 12 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
{
"name": "MMM-LEDStripControl",
"version": "0.0.2",
"description": "",
"version": "0.0.3",
"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.",
"main": "MMM-LEDStripControl",
"dependencies": {},
"devDependencies": {},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 0"
},
"keywords": [
"MagicMirror",
"MM",
"LED",
"WS2801",
"WS2813",
"WS2812B",
"Pong",
"MQTT"
],
"repository": {
"type": "git",
"url": "[email protected]:Tom-Hirschberger/MMM-LEDStripControl.git"
Expand Down

0 comments on commit 0811905

Please sign in to comment.