Comments (6)
I've started this process in a separate branch, caiwan:dev
from python-dali.
I see the first thing you did in this branch was merge from my master. Can I suggest you rebase on my master instead? That'll make the history look a lot more understandable, and give me the possibility of using your commits as they are without merging or cherry-picking.
from python-dali.
I don't really know how to do so, that is the problem. I'm using git for years, and I'm still a newbie.
Anyway, I changed things a bit around: commands/
and interface/
also goes into dali/
folder.
from python-dali.
Hmm. Looking at the history at the moment, I think it's probably best if you start again from my current master - it has all the changes you made apart from the __unicode__
/ __str__
ones that we're not keeping, and which you got rid of when you merged from my master.
On the command line it'll be something like this (starting in your branch 'dev'):
git fetch upstream
git checkout -b newdev upstream/master
git cherry-pick dev
You are now in a branch "newdev" with your commit from dev applied on top of my current master.
You could then do:
git branch -d dev
git checkout -b dev
Then you can push it to github. The first time you push you have to force it, because you're not pushing on top of what github currently sees as the dev branch.
from python-dali.
I suggest you don't work on moving things around at the moment, though, because that will make the other changes that you make difficult to compare to my tree.
The "device.py" file definitely doesn't belong with the device driver and daliserver interface; ultimately it will go in its own subpackage along with "bus.py".
I'm not sure about "address.py" yet. Some of the addressing concepts are shared between control gear and control devices, although the address spaces are separate; it may still make sense to have this shared between the two.
Before each commit, please would you check that the unit tests still pass with python -m unittest discover
.
from python-dali.
I guess this issue can be closed in favour of #21
from python-dali.
Related Issues (20)
- As of python 3.10, the *loop* parameter was removed from Event() and BoundedSemaphore() of asyncio HOT 2
- Managing DALI gear through abstractions HOT 7
- TypeError: __init__() got an unexpected keyword argument 'loop' HOT 7
- dali.tests.test_dummy.DummyDriverFixtureParts.log HOT 1
- LUBA USB driver query HOT 16
- Device commisioning HOT 3
- Tridonic Connection in Windows HOT 2
- No module named 'dali.interface' HOT 1
- Lunatone HID: occasional stuck communication, and `assert current_command == None` in `dali/driver/hid.py:592`
- Using python-dali as a slave, not a master HOT 1
- Device instance type HOT 4
- ConnectionRefusedError: [WinError 10061] No connection could be made because the target machine actively refused it HOT 1
- ERROR: AttributeError: 'TridonicDALIUSBNoResponse' object has no attribute 'value' HOT 9
- Lunatone DALI MC4L HOT 2
- Getting error ConnectionRefusedError: [Errno 111] Connection refused HOT 10
- How to use the Commissioning sequence with SyncHassebDALIUSBDriver? HOT 7
- Advise request for a dali illumination sensor
- Who is relying on the exceptions raised by dali.frame? HOT 2
- Schedule for dropping support for Python 3.6 HOT 3
- Bug in querying scene levels using Hasseb interface HOT 9
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from python-dali.