- Messages : 11495
- Remerciements reçus 1059
Résolution de problème : merci de consulter la FAQ et le Wiki
Aidez-nous à améliorer le contenu du Wiki et de la FAQ en les consultant. Le Wiki est mis à jour régulièrement et la FAQ permet une résolution rapide des principales embûches rencontrées. N'hésitez pas à nous faire parvenir vos suggestions d'amélioration sur le forum ou à éditer directement le Wiki ou la FAQ .
intérêt pour l'application
- sl1200mk2
-
- Hors Ligne
I've added:
/sub/flashmaster
/sub/master
++
nicolas
Connexion pour participer à la conversation.
- colinc
- Hors Ligne
- Messages : 166
- Remerciements reçus 22
noelvd écrit: @ Nico,
I signed up for github, but I don't find how to upload a file. Can you help ?
To start, go here:
nathanj.github.com/gitguide/tour.html
Download and install Git-Gui. Follow the instructions for linking to your account. Edit your file on your local machine and then use Git-Gui to upload it to *your* Github account. Next, send a Pull Request from your account to the DLight account, and Nico can look at and then merge your file into the main repository if he wants.
Regards,
Colin
Connexion pour participer à la conversation.
- p.leijstra
- Auteur du sujet
- Hors Ligne
- Messages : 22
- Remerciements reçus 1
sl1200mk2 écrit: @p.leijstra
you can have a look to libftdi. it's plain C but their code is well commented
www.intra2net.com/en/developer/libftdi/repository.php
++
Hi, thanks for the reply. I looked at the link you send me, I see allot of different functions and library's I really don't understand. (I'm not a programmer or something) I thought the serial communication between
:light and the enttec device was quite simple, like just sendin an array of dmx vallues. But looking at the link you send me, this is not the case?Maybe you can tell me if it's easy to learn, or if it's really difficult? (with the small amount of knowledge I have)
When it is really difficult, I will stop wasting your time!
Tanks allot!
Connexion pour participer à la conversation.
- noelvd
- Hors Ligne
- Messages : 103
- Remerciements reçus 4
All done, except the last step. How do I send a 'Pull Request' to the DLight account ?
Thanks,
Noël
Connexion pour participer à la conversation.
- colinc
- Hors Ligne
- Messages : 166
- Remerciements reçus 22
noelvd écrit: Thanks, Colin.
All done, except the last step. How do I send a 'Pull Request' to the DLight account ?
Thanks,
Noël
First, from your account you need to search for the DLight-Tools repository. When you have that in your account, you need to fork from DLight-Tools to your account, creating a new master repository for yourself, with the DLight stuff in it. That is where your local edits should come to from your local computer (ie GitGui must specify the DLight-Tools repo in you account as the target for downloads, local edits, uploads, merges etc). Now, when you are ready, go to that repository in your Github account , and it will have a 'Pull Request' button on the page. Click that, and it will notify the DLight-Tools account that there is a fork waiting to be merged - then it's up to Nico to do the merge
Hope this helps
Connexion pour participer à la conversation.
- noelvd
- Hors Ligne
- Messages : 103
- Remerciements reçus 4
Sorry to be a pain, but I don't find such button.
I have downloaded and installed Github (I'm on a Mac with OS X 10.8.2, by the way), and 'forked' dlight-pad. I now have a folder on my HD with all the files. I have added the TouchOSC-templates that I created, and did 'sync'.
Could it be that 'sync' = 'pull0request' ?
Thanks again,
Noel
Connexion pour participer à la conversation.
- colinc
- Hors Ligne
- Messages : 166
- Remerciements reçus 22
noelvd écrit: Hello Colin,
Sorry to be a pain, but I don't find such button.
I have downloaded and installed Github (I'm on a Mac with OS X 10.8.2, by the way), and 'forked' dlight-pad. I now have a folder on my HD with all the files. I have added the TouchOSC-templates that I created, and did 'sync'.
Could it be that 'sync' = 'pull0request' ?
Thanks again,
Noel
From your Mac, you do a 'Commit' to send the edited files back up to the repository on GitHub
Then -
Hope this helps
Colin
Connexion pour participer à la conversation.
- noelvd
- Hors Ligne
- Messages : 103
- Remerciements reçus 4
Yep, I did a 'commit', so Nico should see this, and be able to merge, I guess ?
By the way, I noticed there is is "dlight-book' as well, but the folder 'English' only has a 'readme'. Or am I missing something ?
Thanks again,
Noel
Connexion pour participer à la conversation.
- colinc
- Hors Ligne
- Messages : 166
- Remerciements reçus 22
Connexion pour participer à la conversation.
- noelvd
- Hors Ligne
- Messages : 103
- Remerciements reçus 4
Connexion pour participer à la conversation.
- sl1200mk2
-
- Hors Ligne
- Messages : 11495
- Remerciements reçus 1059
I've track your gitHub account and the only thing you've merged are .DS_Strore files, I guess that's not what you want to share.
Commit is not enough as it commit to your account, you need to ask after for a pullRequest.
about dlight-book,
happily, there's enough people that know how to use DL to help others that do not. So it's more or less that the dlight-book will never emerge....
before dlight-tools on GitHub, there was an attempt with the wiki, but not enough take time to write stuff there to make it usefull.
it would be great to start it on gitHub, but I do not have enough free time to initiate it.
feel free to commit stuff if you have time and after we can discuss/improve/merge/write.
++
nicolas
Connexion pour participer à la conversation.
- noelvd
- Hors Ligne
- Messages : 103
- Remerciements reçus 4
I tried that, but -alas- it didn't work.did you tried to set the writer address wit 255 at the end?
x.x.x.255 means broadcast in wich case, all device registered on the network x.x.x should receive the information.
I have 'committed' my templates again. Can you please check it you can see them now ?also,
we have created a page to register DL tools here
github.com/dlight-tools
If you register an account on github, I think you should be able to ask for a pull-request to upload your work in the dlight-pad/touchosc section.
Merci,
Noel
Connexion pour participer à la conversation.
- colinc
- Hors Ligne
- Messages : 166
- Remerciements reçus 22
noelvd écrit:
...
I have 'committed' my templates again. Can you please check it you can see them now ?also,
we have created a page to register DL tools here
github.com/dlight-tools
If you register an account on github, I think you should be able to ask for a pull-request to upload your work in the dlight-pad/touchosc section.
Merci,
Noel
I think you still haven't sent a 'Pull Request' to the DLight-Tools account from which you fork. If you look at this Network graph screenshot from GitHub, you'll see that your fork (bottom, Yellow) only has an arrow going away from the DLight-Tools repo. If you hover the mouse over each 'point' in the graph it pops up the Commit number and any notes. (So the popup with your changes in it for the first point in your fork). When a Merge back to the master happens, the black lable is appended. So your 'Commit' has merged back to *your* master, but your master has not yet merged with the DL-Tools master, whereas mine(blue dots) has
You can check it out yourself by clicking the 'Network' button on your own repo, or on the DLight-Tools repo.
But as I say, you will still need to click the Pull Request button to get Nico to merge into his master
Hope this helps
Colin
Connexion pour participer à la conversation.
- sl1200mk2
-
- Hors Ligne
- Messages : 11495
- Remerciements reçus 1059
I do not received yet a pull request from your fork.
++
nicolas
Connexion pour participer à la conversation.
- noelvd
- Hors Ligne
- Messages : 103
- Remerciements reçus 4
Been too busy (with my new toy: the Electron Design Artnet node...)
So, I have just done a 'pull-request'. Fingers crossed that I got it right this time :ohmy:
Thanks !
Noël
Connexion pour participer à la conversation.
Français
English