i also get an error from git pull:
pi@magicmirror:~/MagicMirror $ sudo git pull && npm install
Updating 6db61b4..de57daa
error: Your local changes to the following files would be overwritten by merge:
package-lock.json
vendor/package-lock.json
Please commit your changes or stash them before you merge.
Aborting
and i dont know what to do…
Trying to use MMM-iFrame-Ping module to show the videostream from my out door ip camera.
i add to my config.js :
module: 'MMM-iFrame-Ping',
position: 'middle_center', // This can be any of the regions.
config: {
// See 'Configuration options' for more information.
url: "http://admin:xxxxxxxxx@ipcamera_address:port/videostream.cgi",
autoRefresh: false, //set to false for video
scrolling: "no",
}
},
and i always get “NOK PING” and no video.
What am i doing wrong?I tryied an alternative ip format that it is working fine to my openhab/habpanel frame widget :
http://ipcamera_address:port/videostream.cgi?user=admin&pwd=xxxxxxx
but no luck also…using both urls at chrome or vlc i get videostream.