you want git status in english i suppose?
Read the statement by Michael Teeuw here.
Posts made by satsatt
-
RE: new update/upgrade script, ready for testing
-
RE: new update/upgrade script, ready for testing
pi@raspberrypi:~/MagicMirror $ locale LANG=de_DE.UTF-8 LANGUAGE=de_DE.UTF-8 LC_CTYPE="de_DE.UTF-8" LC_NUMERIC="de_DE.UTF-8" LC_TIME="de_DE.UTF-8" LC_COLLATE="de_DE.UTF-8" LC_MONETARY="de_DE.UTF-8" LC_MESSAGES="de_DE.UTF-8" LC_PAPER="de_DE.UTF-8" LC_NAME="de_DE.UTF-8" LC_ADDRESS="de_DE.UTF-8" LC_TELEPHONE="de_DE.UTF-8" LC_MEASUREMENT="de_DE.UTF-8" LC_IDENTIFICATION="de_DE.UTF-8" LC_ALL=de_DE.UTF-8
-
RE: new update/upgrade script, ready for testing
@sdetweil ```
pi@raspberrypi:~/MagicMirror $ git status
Auf Branch master
Ihr Branch ist zu ‘origin/master’ um 2639 Commits hinterher, und kann vorgespult werden.
(benutzen Sie “git pull”, um Ihren lokalen Branch zu aktualisieren)
zum Commit vorgemerkte Änderungen:
(benutzen Sie “git reset HEAD …” zum Entfernen aus der Staging-Area)geändert: package-lock.json geändert: vendor/package-lock.json
Unversionierte Dateien:
(benutzen Sie “git add …”, um die Änderungen zum Commit vorzumerken)installers/dumpactivemodules.js
-
RE: new update/upgrade script, ready for testing
@sdetweil ```
Upgrade started - Sa Sep 14 09:01:30 CEST 2019
doing test run = true
downloading dumpactivemodules script
saving custom.css
remote name = origin
upgrading from version 2.6.0 to 2.8.0
fetching latest revisions
current branch = master
no files different from github versiontest merge result rc=‘’ if empty, no conflicts
skipping merge, only test run
processing dependency changes for active modules with package.json files
processing for module MMM-SystemStats . please waitskipped processing for MMM-SystemStats, doing test run
processing for module MMM-DWD-WarnWeather . please waitskipped processing for MMM-DWD-WarnWeather, doing test run
restoring custom.css
Upgrade ended - Sa Sep 14 09:01:33 CEST 2019Upgrade started - Sa Sep 14 09:02:16 CEST 2019
user requested to apply changes
doing test run = false
saving custom.css
remote name = origin
upgrading from version 2.6.0 to 2.8.0
fetching latest revisions
current branch = master
no files different from github versiontest merge result rc=‘’ if empty, no conflicts
executing merge, apply specified
merge result rc= 1 Aktualisiere de57daa…a31546b
restoring custom.css
Upgrade ended - Sa Sep 14 09:02:18 CEST 2019Upgrade started - Sa Sep 14 14:50:08 CEST 2019
user requested to apply changes
doing test run = false
saving custom.css
remote name = origin
upgrading from version 2.6.0 to 2.8.0
fetching latest revisions
current branch = master
no files different from github version -
RE: new update/upgrade script, ready for testing
@sdetweil Can You help me please with this, running Your script gives me this
doing test run = false update log will be in /home/pi/MagicMirror/installers/upgrade.log saving custom.css upgrading from version 2.6.0 to 2.8.0 fetching latest revisions error: Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge überschrieben werden: package-lock.json vendor/package-lock.json Bitte committen oder stashen Sie Ihre Änderungen, bevor sie mergen. Abbruch there were merge errors you should examine and resolve them using the command git log --oneline --decorate de57daa (grafted, HEAD ->
how do i commit or stash?
-
RE: MMM-MQTT module multiple Sensors 433Mhz
Ok i think now that i need to filter the MQTT stream with node-red and generate separate topics for MM. Can i run MM and node_red together on Pi 3B+ . Has anyone done this already?
-
RE: MMM-FRITZ-Box-Callmonitor throws an error after enabling phonebook sync
@sandy2503 said in MMM-FRITZ-Box-Callmonitor throws an error after enabling phonebook sync:
ted
I carefully made this corrections you suggested but now got more errors.
Whoops! There was an uncaught exception... SyntaxError: Unexpected token F in JSON at position 2 at JSON.parse (<anonymous>) at PythonShell.asJson (/home/pi/MagicMirror/modules/MMM-FRITZ-Box-Callmonitor/node_modules/python-shell/index.js:358:21) at /home/pi/MagicMirror/modules/MMM-FRITZ-Box-Callmonitor/node_modules/python-shell/index.js:310:42 at Array.forEach (<anonymous>) at PythonShell.recieveInternal (/home/pi/MagicMirror/modules/MMM-FRITZ-Box-Callmonitor/node_modules/python-shell/index.js:306:15) at PythonShell.receiveStderr (/home/pi/MagicMirror/modules/MMM-FRITZ-Box-Callmonitor/node_modules/python-shell/index.js:290:21) at Socket.<anonymous> (/home/pi/MagicMirror/modules/MMM-FRITZ-Box-Callmonitor/node_modules/python-shell/index.js:108:18) at emitOne (events.js:116:13) at Socket.emit (events.js:211:7) at addChunk (_stream_readable.js:263:12) MagicMirror will not quit, but it might be a good idea to check why this happened. Maybe no internet connection? If you think this really is an issue, please open an issue on GitHub: https://github.com/MichMich/MagicMirror/issues Whoops! There was an uncaught exception... TypeError: Cannot read property 'indexOf' of undefined at PythonShell._endCallback (/home/pi/MagicMirror/modules/MMM-FRITZ-Box-Callmonitor/node_helper.js:233:25) at terminateIfNeeded (/home/pi/MagicMirror/modules/MMM-FRITZ-Box-Callmonitor/node_modules/python-shell/index.js:148:39) at ChildProcess.<anonymous> (/home/pi/MagicMirror/modules/MMM-FRITZ-Box-Callmonitor/node_modules/python-shell/index.js:121:13) at emitTwo (events.js:126:13) at ChildProcess.emit (events.js:214:7) at Process.ChildProcess._handle.onexit (internal/child_process.js:198:12) MagicMirror will not quit, but it might be a good idea to check why this happened. Maybe no internet connection? If you think this really is an issue, please open an issue on GitHub: https://github.com/MichMich/MagicMirror/issues
git show Joseph Bethge 30.oct.2016
-
MMM-MQTT module multiple Sensors 433Mhz
I got this module running acepting MQTT/JSON from another Pi running rtl_433 with RTL_SDR receiver.
The problem ist that the topic is always “/home/rtl_433”, and the jsonpointer grabs “/temperature_C” or “/temperature” from all sending 433MHz Sensors.
They differ only in modelname or rollingcode or channel .
How do i separate them for Display in that module?I guess IF statements in config.js are not possible? I am a very beginner at JAVA.
Thanks for any help