Nut upsdev - Aug 2014 - Merging the DDL branch in nut-website

Hi Daniele and Arnaud,

While tracking down the Cyber Power voltage scaling issue, I found the DDL
repository extremely helpful. Instead of searching across all of the old mailing
list posts, I was able to run 'git grep' in the Cyber Power directory,
and the consistency of the data made it an easy task.

I had a motherboard failure on my main computer, and I was trying to recreate
the nut-website hierarchy on another machine. I realized that I was a little
confused as to how everything goes together. Is the most recent branch
"ddl-hll" in the ddl submodule?

Is this the current layout?

nut-website (branch: dll-hll)
 \__ nut submodule (branch: master)
 \__ ddl submodule (branch unknown?)

The "ddl" branch might be unknown since I have the nut-website master
branch checked out, and I wasn't sure whether to mess with that. I get the
following "git status" in ddl: "HEAD detached at bbfd79f".

I would like to merge the ddl-hll branch back into master (and add DDL to the
main "networkupstools" project), if it's ready. Is there anything
else needed?

Also, I would like to help add a few device dumps (such as the Eaton 5E), and it
would be good to do that on the master branch.

I still haven't had a chance to finish adjusting the Buildbot configuration
to automatically build the nut-website module when commits come in. But I would
like to do that soon, so that http://new.networkupstools.org/ includes the
latest DDL improvements.

Let me know if there is anything I can do to help.

Thanks,

-- 
Charles Lepple
clepple at gmail

> Is this the current layout?
>
> nut-website (branch: dll-hll)
>  \__ nut submodule (branch: master)
>  \__ ddl submodule (branch unknown?)
nut-website (branch: dll-hll)
 \__ nut submodule (branch: master @ abc0006 [not updated to avoid
conflicts when merging back to master])
 \__ ddl submodule (branch: master @ bbfd79f; now updated to ab6166c)
> The "ddl" branch might be unknown since I have the nut-website
master branch checked out, and I wasn't sure whether to mess with that. I
get the following "git status" in ddl: "HEAD detached at
bbfd79f".
I didn't grab the last updates from nut-ddl-raw, so it was still at
bbfd79f (master, 12 may); now it's updated: checking out ddl's master
should suffice.
> I would like to merge the ddl-hll branch back into master (and add DDL to
the main "networkupstools" project), if it's ready. Is there
anything else needed?
I vaguely recall I wanted to move (in nut-ddl-raw/README.adoc) the
detailed descriptions of 'special' comments and RW vars/instant
commands declaration from the 'nds' section to the 'dev/seq' one
and
then comment out the 'nds' section till we're ready with the
supporting software. Well, as I was there.. just did it.

Sorry for not being very supportive in the last months. Hopefully I'll
be back soon.

On Sun, Aug 10, 2014 at 6:48 PM, hyouko at gmail.com <hyouko at gmail.com>
wrote:
>> I would like to merge the ddl-hll branch back into master (and add DDL
to the main "networkupstools" project), if it's ready. Is there
anything else needed?
>
> I vaguely recall I wanted to move (in nut-ddl-raw/README.adoc) the
> detailed descriptions of 'special' comments and RW vars/instant
> commands declaration from the 'nds' section to the
'dev/seq' one and
> then comment out the 'nds' section till we're ready with the
> supporting software. Well, as I was there.. just did it.
OK. I may try to write up a README file for nut-website, and I will
probably ask for you to take a look to make sure I got it all
straight.
> Sorry for not being very supportive in the last months. Hopefully I'll
> be back soon.
Totally understood. Thanks for taking the time to answer questions.

-- 
- Charles Lepple