MagicMirror v2.1.0 Update error

lolobyte

How can i fix that?

pi@raspi3-MM2:~/MagicMirror $ sudo git pull
Aktualisiere b8167f8…8010e62
error: Your local changes to the following files would be overwritten by merge:
css/main.css
modules/default/clock/clock.js
modules/default/compliments/compliments.js
modules/default/currentweather/currentweather.css
modules/default/currentweather/currentweather.js
package.json
Please, commit your changes or stash them before you can merge.
Aborting

yawns

So you modified the original files which you should not do.

Look at the first answer here to see your possibilities: http://stackoverflow.com/questions/15745045/how-do-i-resolve-git-saying-commit-your-changes-or-stash-them-before-you-can-me

lolobyte

@yawns
Thank u.
Now i have this error!

npm WARN grunt-yamllint@0.2.0 requires a peer of grunt@~0.4.0 but none was installed.

lolobyte

Hello,

    ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],

I can’t insert my ip from my laptop.
I want to access MagicMirror from laptop with Remote Control, but it’s not possible now with this update.

Where i have to insert my ip address in the white-list?

PindaPower

If the original this is:

Blockquote ipWhitelist: [“127.0.0.1”, “::ffff:127.0.0.1”, “::1”],

Then I guess that the modifed can look like this:

Blockquote ipWhitelist: [“127.0.0.1”, “::ffff:127.0.0.1”, “::1”, “192.168.0.1”, “192.168.250.250”],

If you dont get the “::ffff:127.0.0.1” lookup “ipv4 to ipv6 translation” on google.

lolobyte

@PindaPower

Hi,

at this position i must insert my ip from the notebook?

ipWhitelist: [“127.0.0.1”, “::ffff:127.0.0.1”, “::1”, “XXX.XXX.XXX.XXX”, “192.168.250.250”],

And how to declare a range?

lolobyte

nobody can help.

I going to be crazy soon with this damn IP’s

ipWhitelist: [“127.0.0.1”, “::ffff:127.0.0.1”, “::1”],

Can somebody put a example of a running ip address with a virtual IP like 192.168.123.123 to give access to remote control module ?

Snille

This should do it. :)

For a B-network (192.168.x.x)
The last two “x”:es change.

ipWhitelist: [
	"127.0.0.1",
	"::ffff:127.0.0.1",
	"::1",
	"::ffff:192.168.0.1/16" 
],

Or for a C-network (192.168.123.x)
Only the last “x” change.

ipWhitelist: [
	"127.0.0.1",
	"::ffff:127.0.0.1",
	"::1",
	"::ffff:192.168.123.1/24" 
],

Good luck. :)

Steff

This post is deleted!

schlachtkreuzer6

@yawns so how do i change the comments if i should´t change the comments.js ? ^^

yawns

@schlachtkreuzer6 said in MagicMirror v2.1.0 Update error:

@yawns so how do i change the comments if i should´t change the comments.js ? ^^

I guess you are talking about compliments.js ?
The readme clearly states how to add own compliments: https://github.com/MichMich/MagicMirror/blob/master/modules/default/compliments/README.md

schlachtkreuzer6

@yawns oh sorry i mean the compliments… i don´t know why i wrote comments (maybe i need more coffee!)

but if i want the default compliments to be in german, what do i need to change? That the git pull is working?

yawns

@schlachtkreuzer6
The same approach. Add whatever you want to add, but do not modify the JavaScript module files.
Create a compliments file or add them to your config file.

Steff

@schlachtkreuzer6
After your question I understood what I personally had done wrong, so I lost my German compliments, still have to confess this to my 8 year old boy who wrote them. Please find here an example with German text how you could modify your local config.js to show German comments:

            {
                    module: 'compliments',
                    position: 'lower_third',

                    config:
                    {
                    compliments:
                       {
                       "morning" : [
                            "Du siehst aber gut aus heute !",
                            "Gut geschlafen ?",
                            "Moin, Moin...."
                            ],
                        "afternoon" : [
                            "Ab Fussball spielen !",
                            "Lass uns auf den Abend vorbereiten....",
                            "Musik hören ?"
                            ],
                        "evening" : [
                            "Einen Cocktail ?",
                            "Wow, Du bist aber heiss heute...",
                            "Wollen wir heute abend weggehen ?"
                            ]
                       }
                    }
            },

bhepler

@Steff Remove the " from around the array names (morning, afternoon, evening).

compliments:
             {
             morning : [
                  "Du siehst aber gut aus heute !",
                  "Gut geschlafen ?",
                  "Moin, Moin...."
                   ],
              afternoon : [
                 "Ab Fussball spielen !",
                 "Lass uns auf den Abend vorbereiten....",
                  "Musik hören ?"
                  ],
              evening : [
                  "Einen Cocktail ?",
                  "Wow, Du bist aber heiss heute...",
                  "Wollen wir heute abend weggehen ?"
                  ]
             }
          }

Steff

@bhepler
Thanks for your hint.
I know the doc does not show them. However I understood the documentation that I will need them for an external file. So I wanted to be prepared for the move to an external file. I tested it with them inside the config.js file and it worked. Do you see any specific reason to remove them ?

Steff

I did try to configure an external compliments.json file, however it seems that it is not interpreted, since I do get again the default compliments.
The file is located within the config directory.
My configuration:

{ module: 'compliments', position: 'lower_third', config: { remoteFile: 'compliments.json' } },

Do you have a hint what might be wrong ?

bhepler

@Steff Due to my own incompetence when dealing with javascript, the external file needs to have quotes around the array names. If you are expanding the arrays within the config.js file, then you must remove the quotes from around the names.
So this would work in the config.js file:

evening : [
        "Einen Cocktail ?",
        "Wow, Du bist aber heiss heute...",
        "Wollen wir heute abend weggehen ?"
        ]

and this should work in the external compliments file:

"evening" : [
        "Einen Cocktail ?",
        "Wow, Du bist aber heiss heute...",
        "Wollen wir heute abend weggehen ?"
         ]

It’s a bug. But I’m a Java programmer, not a Javascript programmer. I don’t know how to fix it.

ostfilinchen

Hi all,

After update my MM and want to open the mm via http://ip:8080 i get a blank Black screen. It comes on Win10 and also Android with Chrome.

The Majorfailure is, the rpi stop working. So i can only disconnect the power and connect again.

Has anybody else this issue?

Regals
Daniel

lolobyte

@ostfilinchen

No, not such a major issue with the pi.

Can you access your pi with ssh?

Take a look at

https://forum.magicmirror.builders/topic/1326/ipwhitelist-howto/