Dashticz - General Discussions

Dashticz, alternative dashboard based on HTML, CSS, jQuery

Moderators: robgeerts, htilburgs

User avatar
Derik
Posts: 1628
Joined: Friday 18 October 2013 23:33
Target OS: Raspberry Pi
Domoticz version: BETA
Location: Arnhem/Nijmegen Nederland
Contact:

Re: Dashticz - General Discussions

Postby Derik » Saturday 20 May 2017 1:27

mmm
Domdbo here....
I try and try....
Looks everytime very ok
Did search wit komodo edit for errors [ founds some typo's]

Started again and again..
Only ones in a X time. some times after a hour, sometimes after ten minutes...
I get THE error:
ScreenShot248.jpg
ScreenShot248.jpg (57.66 KiB) Viewed 332 times


Spoiler: show
var _LANGUAGE = 'nl_NL'; //or: en_US, fr_FR, hu_HU
var _HOST_DOMOTICZ = 'http://192.168.5.10:8080';
var _DOMOTICZ_REFRESH = 2; //in seconds
var _DASHTICZ_REFRESH = 20; //in minutes 30 standard
var _THEME = 'default'; // default = dashticz default theme
var _APIKEY_WUNDERGROUND = '92be63aff68ae';
var _WEATHER_CITY = 'IOOST10';
var _WEATHER_CITYNAME = 'oost'; //show a different city name, leave empty if same as _WEATHER_CITY
var _WEATHER_COUNTRY = 'NL';
var _USE_AUTO_POSITIONING = false; // want to configure positions, use auto positioning
var _USE_FAVORITES = false; //only used when using auto positioning
var _HIDE_SECONDS_IN_CLOCK = true; //do not show the seconds in the clock
var _HIDE_MEDIAPLAYER_WHEN_OFF = true; //when you have a mediaplayer connected, hide it if nothing is playing
var _NEWS_RSSFEED = 'http://www.nu.nl/rss/algemeen';
var _USE_FAHRENHEIT = false;
var _USE_BEAUFORT = true; //Bft instead of m/s
var _TRANSLATE_SPEED = true; //windspeed, north northwest instead of NNW
var _STANDBY_AFTER_MINUTES = false; //enter amount of minutes like: 5 (5 minutes) niet op standby: false invullen
var _SCROLL_NEWS_AFTER = 7000; //milliseconds, so 7000 is 7 seconds
var _SHOW_LASTUPDATE = false;
var _LASTUPDATE_FORMAT = 'DD-MM-YY HH:mm';
var _USE_STATIC_WEATHERICONS = true; // Static or 'moving' weather icons
var _SCREENSLIDER_EFFECT = 'slide'; //'slide' or 'fade' or 'cube' or 'coverflow' or 'flip'
var _APIKEY_MAPS = 'AIzaSyB8UijMhtDse1S-YcmpJczjKrkMP0ik';
var _MAPS_LATITUDE = '51.879623';
var _MAPS_LONGITUDE = '11.825494';
var _MAPS_ZOOMLEVEL = 9;
var _AUTO_SWIPEBACK_TO = 1; //when no activity, swipe back to main screen after x seconds / standaard 1
var _AUTO_SWIPEBACK_TIME = 50; //seconds / standaard 10

/* var buttons */
var buttons = {}
buttons.nunl = {width:12, icon: 'fa-newspaper-o', title: 'Nu.nl', url: 'http://www.nu.nl'}
buttons.buienradar = {width:12, isimage:true, refreshimage:90000, image: 'http://api.buienradar.nl/image/1.0/RadarMapNL?w=506&h=454', url: 'http://www.weer.nl/verwachting/nederland/son/189656/'}
/*buttons.webcam = {width:12, isimage:true, refresh:2000, image: 'http://ip_url_to_webcam', url: 'http://ip_url_to_webcam'} */

var blocks = {}

/* temp */
blocks[2059] = {} // cb
blocks[2059]['width'] = 12; //1 to 12, remove this line if you want to use the default (4)
blocks[2059]['title'] = 'ÇB' //if you want change the name of switch different then domoticz
blocks[2059]['icon'] = 'fa-line-chart'; //if you want an other icon instead of the default, choose from: http://fontawesome.io/cheatsheet/
blocks[2059]['switch'] = false; //if you want to switch the title and data
blocks[2059]['hide_data'] = false; //if you want to hide the data of this block
blocks[2059]['show_lastupdate'] = true; //if you want to show the last update specific for this block

/* schakelaars */
blocks[9] = {} // D1 Kamer
blocks[9]['width'] = 12; //1 to 12, remove this line if you want to use the default (4)
blocks[9]['title'] = 'D1' //if you want change the name of switch different then domoticz
blocks[9]['icon'] = 'fa-lightbulb-o'; //if you want an other icon instead of the default, choose from: http://fontawesome.io/cheatsheet/
/*blocks[9]['image'] = ''; //if you want to show an image instead if icon, place image in img/ folder*/
blocks[9]['switch'] = true; //if you want to switch the title and data
blocks[9]['hide_data'] = true; //if you want to hide the data of this block
blocks[9]['show_lastupdate'] = true; //if you want to show the last update specific for this block
blocks[9]['playsound'] = 'sounds/ping.mp3'; //play a sound when a device changes
blocks[9]['protected'] = false; //protect switching manually in Dashticz

/*Scene blocks */
blocks['s5'] = {} // gaan slapen
blocks['s5']['width'] = 12; //1 to 12, remove this line if you want to use the default (4)
blocks['s5']['title'] = 'Slapen' //if you want change the name of switch different then domoticz
blocks['s5']['icon'] = 'fa-bed'; //if you want an other icon instead of the default, choose from: http://fontawesome.io/cheatsheet/
/*blocks['s5']['image'] = 'bulb_off.png'; //if you want to show an image instead if icon, place image in img/ folder*/
blocks['s5']['switch'] = true; //if you want to switch the title and data
blocks['s5']['hide_data'] = true; //if you want to hide the data of this block
blocks['s5']['show_lastupdate'] = true; //if you want to show the last update specific for this block
blocks['s5']['playsound'] = 'sounds/ping.mp3'; //play a sound when a device changes
blocks['s5']['protected'] = true; //protect switching manually in Dashticz


/* Groep Blocks moet ook met S beginnen */
blocks['s11'] = {} // Eetkamer Fel
blocks['s11']['width'] = 12; //1 to 12, remove this line if you want to use the default (4)
blocks['s11']['title'] = 'Tafel helder' //if you want change the name of switch different then domoticz
blocks['s11']['icon'] = 'fa-eye'; //if you want an other icon instead of the default, choose from: http://fontawesome.io/cheatsheet/
/*blocks['s11']['image'] = 'bulb_off.png'; //if you want to show an image instead if icon, place image in img/ folder*/
blocks['s11']['switch'] = true; //if you want to switch the title and data
blocks['s11']['hide_data'] = true; //if you want to hide the data of this block
blocks['s11']['show_lastupdate'] = true; //if you want to show the last update specific for this block
blocks['s11']['playsound'] = 'sounds/ping.mp3'; //play a sound when a device changes
blocks['s11']['protected'] = false; //protect switching manually in Dashticz

blocks['s12'] = {} // Eetkamer blocks['s11']
blocks['s12']['width'] = 12; //1 to 12, remove this line if you want to use the default (4)
blocks['s12']['title'] = 'Eettafel' //if you want change the name of switch different then domoticz
blocks['s12']['icon'] = 'fa-eye'; //if you want an other icon instead of the default, choose from: http://fontawesome.io/cheatsheet/
/*blocks['s11']['image'] = 'bulb_off.png'; //if you want to show an image instead if icon, place image in img/ folder*/
blocks['s12']['switch'] = true; //if you want to switch the title and data
blocks['s12']['hide_data'] = true; //if you want to hide the data of this block
blocks['s12']['show_lastupdate'] = true; //if you want to show the last update specific for this block
blocks['s12']['playsound'] = 'sounds/ping.mp3'; //play a sound when a device changes
blocks['s12']['protected'] = false; //protect switching manually in Dashticz


/* var bloktitels */

blocks['blocktitle_1'] = {}
blocks['blocktitle_1']['type'] = 'blocktitle';
blocks['blocktitle_1']['title'] = 'Verlichting';


blocks['blocktitle_2'] = {}
blocks['blocktitle_2']['type'] = 'blocktitle';
blocks['blocktitle_2']['title'] = 'Van alles';

var columns = {}

columns[1] = {}
columns[1]['blocks'] = ['blocktitle_1',9,'s11','s12','blocktitle_2','s5']
columns[1]['width'] = 6;

columns[2] = {}
columns[2]['blocks'] = [2059]
columns[2]['width'] = 2;

columns[3] = {}
columns[3]['blocks'] = [buttons.buienradar]
columns[3]['width'] = 6;


columns[4] = {}
columns[4]['blocks'] = ['blocktitle_2','clock','sunrise', buttons.nunl]
columns[4]['width'] = 6;



/*if you want to use multiple screens, use the code below: */

var screens = {}

screens[1] = {}
screens[1]['background'] = 'bg1.jpg';
screens[1]['background_morning'] = 'bg_morning.jpg';
screens[1]['background_noon'] = 'bg_noon.jpg';
screens[1]['background_afternoon'] = 'bg_afternoon.jpg';
screens[1]['background_night'] = 'bg_night.jpg';
screens[1]['columns'] = [1,3]


screens[2] = {}
screens[2]['background'] = 'bg2.jpg';
screens[2]['background_morning'] = 'bg_morning.jpg';
screens[2]['background_noon'] = 'bg_afternoon.jpg';
screens[2]['background_afternoon'] = 'bg_noon.jpg';
screens[2]['background_night'] = 'bg_night.jpg';
screens[2]['columns'] = [2,4]


Did have a setup with 5 screens, for my 13 inch tablet...
Started again with 2 :(
New setup all blocks and buttons..
Please some one...
Or what is the most of the time the greatest problem with this error?
CB 2: Beta Extreme antenna RFXcomE,WU Fi Ping ip P1 Gen5 PVOutput Harmony HUE SolarmanPv OTG Winddelen Alive ESP Buienradar MySensors WOL Winddelen counting RPi: Beta SMAspot RFlinkTest Domoticz ...Different backups

User avatar
htilburgs
Posts: 246
Joined: Tuesday 03 November 2015 12:01
Target OS: Raspberry Pi
Domoticz version: v3.7404
Location: Netherland
Contact:

Re: Dashticz - General Discussions

Postby htilburgs » Saturday 20 May 2017 1:38

Most of the time is that Domoticz or your RPI is too busy. I had the same problem. In my case it was python that was running from a previous Domoboard installation. It took 98% of my CPU. After killing Domoboard (I totaly forgot it was running) and removing it, my RPI came to a rest.
CPU became normal (3%), temperature went down from 50+ to 39 degree and Domoticz wasn't sluggy anymore.

Somethimes my Yeelight LUA script is running more than 10 seconds, what causes this error too.

There is a workaround on the forum (sorry, can find it right now), to handle this error (adding something to the custom.js).
Hardware:
Raspberry Pi 2B - Aeon Labs Z-Stick GEN5 - Fibaro Dimmer 2 - Fibaro Roller Shutter 2 - Yeelight RGBW Led

User avatar
HansieNL
Posts: 298
Joined: Monday 28 September 2015 15:13
Target OS: Raspberry Pi
Domoticz version: Beta
Location: Netherlands
Contact:

Re: Dashticz - General Discussions

Postby HansieNL » Saturday 20 May 2017 1:42

htilburgs wrote:There is a workaround on the forum (sorry, can find it right now), to handle this error (adding something to the custom.js).

You mean this one...? window.alert = function ( text ) { console.error( text ); return true; };
Domoticz on Raspberry Pi 2, Homey, Hue lights, Toon thermostat, Logitech Harmony Hub, Fibaro Wall Plug, Fibaro Push Buttons, LightWaveRF Mood Controller, Venz M9 running LibreELEC, Synology NAS

User avatar
htilburgs
Posts: 246
Joined: Tuesday 03 November 2015 12:01
Target OS: Raspberry Pi
Domoticz version: v3.7404
Location: Netherland
Contact:

Re: Dashticz - General Discussions

Postby htilburgs » Saturday 20 May 2017 1:44

Yop, that's the one....
Hardware:
Raspberry Pi 2B - Aeon Labs Z-Stick GEN5 - Fibaro Dimmer 2 - Fibaro Roller Shutter 2 - Yeelight RGBW Led

User avatar
Derik
Posts: 1628
Joined: Friday 18 October 2013 23:33
Target OS: Raspberry Pi
Domoticz version: BETA
Location: Arnhem/Nijmegen Nederland
Contact:

Re: Dashticz - General Discussions

Postby Derik » Saturday 20 May 2017 1:46

Only this in my css???
Or.. :roll: :arrow: :oops: :lol: :?

Pppffcff ....one hole. Day fior this peace of art...

Thanks guys...
CB 2: Beta Extreme antenna RFXcomE,WU Fi Ping ip P1 Gen5 PVOutput Harmony HUE SolarmanPv OTG Winddelen Alive ESP Buienradar MySensors WOL Winddelen counting RPi: Beta SMAspot RFlinkTest Domoticz ...Different backups

User avatar
htilburgs
Posts: 246
Joined: Tuesday 03 November 2015 12:01
Target OS: Raspberry Pi
Domoticz version: v3.7404
Location: Netherland
Contact:

Re: Dashticz - General Discussions

Postby htilburgs » Saturday 20 May 2017 1:53

Not in css, in your custom.js.....;-)
Hardware:
Raspberry Pi 2B - Aeon Labs Z-Stick GEN5 - Fibaro Dimmer 2 - Fibaro Roller Shutter 2 - Yeelight RGBW Led

User avatar
Derik
Posts: 1628
Joined: Friday 18 October 2013 23:33
Target OS: Raspberry Pi
Domoticz version: BETA
Location: Arnhem/Nijmegen Nederland
Contact:

Re: Dashticz - General Discussions

Postby Derik » Saturday 20 May 2017 1:56

Mmm

Thats the first time i open that part....

No virus :roll: :roll:

That do the tric??
No other settings needed??

Xxx
CB 2: Beta Extreme antenna RFXcomE,WU Fi Ping ip P1 Gen5 PVOutput Harmony HUE SolarmanPv OTG Winddelen Alive ESP Buienradar MySensors WOL Winddelen counting RPi: Beta SMAspot RFlinkTest Domoticz ...Different backups

User avatar
htilburgs
Posts: 246
Joined: Tuesday 03 November 2015 12:01
Target OS: Raspberry Pi
Domoticz version: v3.7404
Location: Netherland
Contact:

Re: Dashticz - General Discussions

Postby htilburgs » Saturday 20 May 2017 1:58

Yip
Hardware:
Raspberry Pi 2B - Aeon Labs Z-Stick GEN5 - Fibaro Dimmer 2 - Fibaro Roller Shutter 2 - Yeelight RGBW Led

User avatar
Derik
Posts: 1628
Joined: Friday 18 October 2013 23:33
Target OS: Raspberry Pi
Domoticz version: BETA
Location: Arnhem/Nijmegen Nederland
Contact:

Re: Dashticz - General Discussions

Postby Derik » Saturday 20 May 2017 10:53

mmm did place it to several places.

only did not the trick..

Where do place this script ..
ScreenShot252.jpg
ScreenShot252.jpg (21.94 KiB) Viewed 294 times


Can i remove the other code here?
I did'n place this.

I will try to keep it clean

Or do i need to restart the board?
CB 2: Beta Extreme antenna RFXcomE,WU Fi Ping ip P1 Gen5 PVOutput Harmony HUE SolarmanPv OTG Winddelen Alive ESP Buienradar MySensors WOL Winddelen counting RPi: Beta SMAspot RFlinkTest Domoticz ...Different backups

User avatar
htilburgs
Posts: 246
Joined: Tuesday 03 November 2015 12:01
Target OS: Raspberry Pi
Domoticz version: v3.7404
Location: Netherland
Contact:

Re: Dashticz - General Discussions

Postby htilburgs » Saturday 20 May 2017 11:19

I've put it here:

Code: Select all

//add custom javascript in here
function afterGetDevices(){
   
}

function getExtendedBlockTypes(blocktypes){
   //blocktypes.Type['Lighting 2'] = { icon: 'fa fa-lightbulb-o', title: '<Name>', value: 'ds' }
   return blocktypes;
}

window.alert = function ( text ) { console.error( text ); return true; };
Hardware:
Raspberry Pi 2B - Aeon Labs Z-Stick GEN5 - Fibaro Dimmer 2 - Fibaro Roller Shutter 2 - Yeelight RGBW Led

User avatar
Derik
Posts: 1628
Joined: Friday 18 October 2013 23:33
Target OS: Raspberry Pi
Domoticz version: BETA
Location: Arnhem/Nijmegen Nederland
Contact:

Re: Dashticz - General Discussions

Postby Derik » Saturday 20 May 2017 12:35

mmm still got the error..
Some times when i click on refresh...
CB 2: Beta Extreme antenna RFXcomE,WU Fi Ping ip P1 Gen5 PVOutput Harmony HUE SolarmanPv OTG Winddelen Alive ESP Buienradar MySensors WOL Winddelen counting RPi: Beta SMAspot RFlinkTest Domoticz ...Different backups

MsbS
Posts: 6
Joined: Friday 19 May 2017 14:00
Target OS: Raspberry Pi
Domoticz version:
Contact:

Re: Dashticz - General Discussions

Postby MsbS » Sunday 21 May 2017 12:23

So, is this the right forum for a noob dashticz question?

I just installed v2 on my RPi2 Domoticz machine. I copied the default config to CONFIG.js, edited it and I got blank screen (with only the background image, nothing on it).
When I added the wunderground API+location, I got the weather icons only (the language changes when I change the locale in CONFIG.js). Other than that - the dashticz page is totally empty (only background image).
Any ideas what I did wrong? I know it does connect to my domoticz - when I set favourites = false, I got two switches from my domoticz (two 'ping' switches).

User avatar
EdKo66
Posts: 481
Joined: Sunday 22 January 2017 22:46
Target OS: NAS (Synology & others)
Domoticz version: Beta
Location: Rhoon - Netherlands
Contact:

Re: Dashticz - General Discussions

Postby EdKo66 » Sunday 21 May 2017 14:39

Try first to set

Code: Select all

var _USE_AUTO_POSITIONING       = true;
var _USE_FAVORITES            = false;


and see if this gets you anything. Do you have anything set as favorite in Domoticz (yellow star)?
Running latest BETA on a NAS Synology 413j | Toon Thermostat | RFxcom | Dashticz V2 |

MsbS
Posts: 6
Joined: Friday 19 May 2017 14:00
Target OS: Raspberry Pi
Domoticz version:
Contact:

Re: Dashticz - General Discussions

Postby MsbS » Sunday 21 May 2017 18:10

EdKo66 wrote:Try first to set

Code: Select all

var _USE_AUTO_POSITIONING = true;
var _USE_FAVORITES = false;


and see if this gets you anything. Do you have anything set as favorite in Domoticz (yellow star)?


In Domoticz I have 5 items in myDashboard (with yellow star): 1 RPi motheboard temperature and 4 WUnderground sensors (T+H+B and wind - they are doubled, in Temperature and Weather sections).

When I set the vars as you suggested (auto positioning true, use faourites false), I get two switches from Domoticz on my Dashticz page - both are the 'ping' type (monitoring a web page availability), none of them is favorite in Domoticz.


After install - is there anything else I should do? I followed the wiki instructions: went to custom folder, copied the default config to CONFIG.js and edited it accordingly. Anything I should do with the layout or css perhaps?

User avatar
HansieNL
Posts: 298
Joined: Monday 28 September 2015 15:13
Target OS: Raspberry Pi
Domoticz version: Beta
Location: Netherlands
Contact:

Re: Dashticz - General Discussions

Postby HansieNL » Sunday 21 May 2017 18:16

MsbS wrote:
EdKo66 wrote:Try first to set

Code: Select all

var _USE_AUTO_POSITIONING = true;
var _USE_FAVORITES = false;


and see if this gets you anything. Do you have anything set as favorite in Domoticz (yellow star)?


In Domoticz I have 5 items in myDashboard (with yellow star): 1 RPi motheboard temperature and 4 WUnderground sensors (T+H+B and wind - they are doubled, in Temperature and Weather sections).

When I set the vars as you suggested (auto positioning true, use faourites false), I get two switches from Domoticz on my Dashticz page - both are the 'ping' type (monitoring a web page availability), none of them is favorite in Domoticz.


After install - is there anything else I should do? I followed the wiki instructions: went to custom folder, copied the default config to CONFIG.js and edited it accordingly. Anything I should do with the layout or css perhaps?


You have to set your auto positioning to false too and define your blocks, like described in the wiki. Just start with a few blocks to test.
Then you can add whatever block you want.
Domoticz on Raspberry Pi 2, Homey, Hue lights, Toon thermostat, Logitech Harmony Hub, Fibaro Wall Plug, Fibaro Push Buttons, LightWaveRF Mood Controller, Venz M9 running LibreELEC, Synology NAS

MsbS
Posts: 6
Joined: Friday 19 May 2017 14:00
Target OS: Raspberry Pi
Domoticz version:
Contact:

Re: Dashticz - General Discussions

Postby MsbS » Sunday 21 May 2017 18:21

Ah, OK, no problem. I understood from the wiki entry that dashticz will automatically create layout based on my favorites. If not - fine, it means I don't have an issue :)

User avatar
EdKo66
Posts: 481
Joined: Sunday 22 January 2017 22:46
Target OS: NAS (Synology & others)
Domoticz version: Beta
Location: Rhoon - Netherlands
Contact:

Re: Dashticz - General Discussions

Postby EdKo66 » Sunday 21 May 2017 18:23

HansieNL wrote:

You have to set your auto positioning to false too and define your blocks, like described in the wiki. Just start with a few blocks to test.
Then you can add whatever block you want.


I wanted to see if the script could get the favorites. Seems that worked. Next it's time to work the config and add stuff.
Running latest BETA on a NAS Synology 413j | Toon Thermostat | RFxcom | Dashticz V2 |

MsbS
Posts: 6
Joined: Friday 19 May 2017 14:00
Target OS: Raspberry Pi
Domoticz version:
Contact:

Re: Dashticz - General Discussions

Postby MsbS » Sunday 21 May 2017 21:01

Yay, it's slowly starting to take shape. It took me a while to grasp the blocks/columns concept and syntax, but now my dashboard is finally starting to look usable.
Dank u wel!

Trigun
Posts: 117
Joined: Wednesday 30 November 2016 12:58
Target OS: Raspberry Pi
Domoticz version: 3.5877
Contact:

Re: Dashticz - General Discussions

Postby Trigun » Sunday 21 May 2017 23:22

Hi Guys, I am new to the update process but can someone tell me what the errors re when I update?
when I do a git pull I get the following errors. This is also happening when I deleted the whole setup en put in the latest files.

Code: Select all

Updating e10e465..f071e29
error: Your local changes to the following files would be overwritten by merge:
        .gitignore
        README.md
        css/creative.css
        index.html
        js/blocks.js
        js/functions.js
        js/graphs.js
        js/main.js
        js/news.js
        js/ns.js
        js/sortable.js
        js/switches.js
        js/traffic.js
        js/trash.js
        lang/de_DE.js
        lang/en_US.js
        lang/fr_FR.js
        lang/hu_HU.js
        lang/it_IT.js
        lang/nl_NL.js
        lang/pt_PT.js
        lang/sv_SE.js
        vendor/ical-parser/ical_parser.js
        vendor/moment.js
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
        custom_2/CONFIG_DEFAULT.js
        img/kliko_black.png
        img/kliko_blue.png
        img/kliko_brown.png
        img/kliko_green.png
        img/kliko_grey.png
        img/kliko_orange.png
        img/kliko_red.png
        img/kliko_white.png
        img/kliko_yellow.png
        index2.html
        js/calendar.js
        js/publictransport.js
        js/thermostat.js
        sounds/airplane.aac
        sounds/airplane.mp3
        sounds/airplane.ogg
        sounds/beer_can_opening.aac
        sounds/beer_can_opening.mp3
        sounds/beer_can_opening.ogg
        sounds/bell_ring.aac
        sounds/bell_ring.mp3
        sounds/bell_ring.ogg
        sounds/branch_break.aac
        sounds/branch_break.mp3
        sounds/branch_break.ogg
        sounds/button_click.aac
        sounds/button_click.mp3
        sounds/button_click.ogg
        sounds/button_click_on.aac
        sounds/button_click_on.mp3
        sounds/button_click_on.ogg
        sounds/button_push.aac
        sounds/button_push.mp3
        sounds/button_push.ogg
        sounds/camera_flashing.aac
        sounds/camera_flashing.mp3
        sounds/camera_flashing.ogg
        sounds/computer_error.aac
        sounds/computer_error.mp3
        sounds/computer_error.ogg
        sounds/door_bell.aac
        sounds/door_bell.mp3
        sounds/door_bell.ogg
        sounds/door_bump.aac
        sounds/door_bump.mp3
        sounds/door_bump.ogg
        sounds/doorbell.aac
        sounds/doorbell.mp3
        sounds/doorbell.ogg
        sounds/glass.aac
        sounds/glass.mp3
        sounds/glass.ogg
        sounds/light_bulb_breaking.aac
        sounds/light_bulb_breaking.mp3
        sounds/light_bulb_breaking.ogg
        sounds/ping.aac
        sounds/ping.mp3
        sounds/ping.ogg
        sounds/pop_cork.aac
        sounds/pop_cork.mp3
        sounds/pop_cork.ogg
        sounds/snap.aac
        sounds/snap.mp3
        sounds/snap.ogg
        sounds/sonar.aac
        sounds/sonar.mp3
        sounds/sonar.ogg
        sounds/tap.aac
        sounds/tap.mp3
        sounds/tap.ogg
        sounds/water_droplet.aac
        sounds/water_droplet.mp3
        sounds/water_droplet.ogg
        vendor/ion.sound/ion.sound.js
        vendor/ion.sound/ion.sound.min.js
        vendor/mobiledetect/mobiledetect.js
Please move or remove them before you can merge.
Aborting


Thnx in advance!


Sent from my iPhone using Tapatalk

User avatar
HansieNL
Posts: 298
Joined: Monday 28 September 2015 15:13
Target OS: Raspberry Pi
Domoticz version: Beta
Location: Netherlands
Contact:

Re: Dashticz - General Discussions

Postby HansieNL » Monday 22 May 2017 0:36

Trigun wrote:Hi Guys, I am new to the update process but can someone tell me what the errors re when I update?
when I do a git pull I get the following errors. This is also happening when I deleted the whole setup en put in the latest files.
Spoiler: show

Code: Select all

Updating e10e465..f071e29
error: Your local changes to the following files would be overwritten by merge:
        .gitignore
        README.md
        css/creative.css
        index.html
        js/blocks.js
        js/functions.js
        js/graphs.js
        js/main.js
        js/news.js
        js/ns.js
        js/sortable.js
        js/switches.js
        js/traffic.js
        js/trash.js
        lang/de_DE.js
        lang/en_US.js
        lang/fr_FR.js
        lang/hu_HU.js
        lang/it_IT.js
        lang/nl_NL.js
        lang/pt_PT.js
        lang/sv_SE.js
        vendor/ical-parser/ical_parser.js
        vendor/moment.js
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
        custom_2/CONFIG_DEFAULT.js
        img/kliko_black.png
        img/kliko_blue.png
        img/kliko_brown.png
        img/kliko_green.png
        img/kliko_grey.png
        img/kliko_orange.png
        img/kliko_red.png
        img/kliko_white.png
        img/kliko_yellow.png
        index2.html
        js/calendar.js
        js/publictransport.js
        js/thermostat.js
        sounds/airplane.aac
        sounds/airplane.mp3
        sounds/airplane.ogg
        sounds/beer_can_opening.aac
        sounds/beer_can_opening.mp3
        sounds/beer_can_opening.ogg
        sounds/bell_ring.aac
        sounds/bell_ring.mp3
        sounds/bell_ring.ogg
        sounds/branch_break.aac
        sounds/branch_break.mp3
        sounds/branch_break.ogg
        sounds/button_click.aac
        sounds/button_click.mp3
        sounds/button_click.ogg
        sounds/button_click_on.aac
        sounds/button_click_on.mp3
        sounds/button_click_on.ogg
        sounds/button_push.aac
        sounds/button_push.mp3
        sounds/button_push.ogg
        sounds/camera_flashing.aac
        sounds/camera_flashing.mp3
        sounds/camera_flashing.ogg
        sounds/computer_error.aac
        sounds/computer_error.mp3
        sounds/computer_error.ogg
        sounds/door_bell.aac
        sounds/door_bell.mp3
        sounds/door_bell.ogg
        sounds/door_bump.aac
        sounds/door_bump.mp3
        sounds/door_bump.ogg
        sounds/doorbell.aac
        sounds/doorbell.mp3
        sounds/doorbell.ogg
        sounds/glass.aac
        sounds/glass.mp3
        sounds/glass.ogg
        sounds/light_bulb_breaking.aac
        sounds/light_bulb_breaking.mp3
        sounds/light_bulb_breaking.ogg
        sounds/ping.aac
        sounds/ping.mp3
        sounds/ping.ogg
        sounds/pop_cork.aac
        sounds/pop_cork.mp3
        sounds/pop_cork.ogg
        sounds/snap.aac
        sounds/snap.mp3
        sounds/snap.ogg
        sounds/sonar.aac
        sounds/sonar.mp3
        sounds/sonar.ogg
        sounds/tap.aac
        sounds/tap.mp3
        sounds/tap.ogg
        sounds/water_droplet.aac
        sounds/water_droplet.mp3
        sounds/water_droplet.ogg
        vendor/ion.sound/ion.sound.js
        vendor/ion.sound/ion.sound.min.js
        vendor/mobiledetect/mobiledetect.js
Please move or remove them before you can merge.
Aborting


Thnx in advance!

Have you first cloned? And are you sure you are running git pull from the right folder?
Domoticz on Raspberry Pi 2, Homey, Hue lights, Toon thermostat, Logitech Harmony Hub, Fibaro Wall Plug, Fibaro Push Buttons, LightWaveRF Mood Controller, Venz M9 running LibreELEC, Synology NAS


Return to “Dashticz”

Who is online

Users browsing this forum: No registered users and 2 guests