I need this one day: [WayBack] git – I ran into a merge conflict. How can I abort the merge? – Stack Overflow
–jeroen
Archive for December 18th, 2018
git – I ran into a merge conflict. How can I abort the merge? – Stack Overflow
Posted by jpluimers on 2018/12/18
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Links to help me monitor my Zeverlution PV converter locally
Posted by jpluimers on 2018/12/18
Since it’s my data, I’d rather be in control myself, so here are some links that will help me going around the Zevercloud solution I posted about yesterday.
- Raspberry Pi based:
- Parse RS485 data
- eversolar-monitor/Introduction.md at wiki · solmoller/eversolar-monitor (including suitable RS485 hardware)
- solmoller/eversolar-monitor: Script to capture data and create statistics from Eversolar/zeversolar Solar Inverters. Includes easy install image files for Raspberry Pi. Working edition since 2012 :-)
- Upload to Domoticz · Issue #14 · solmoller/eversolar-monitor
- Some merges still need to be done: Network Graph · solmoller/eversolar-monitor
- In case of connection trouble:
- The above started out as this:
- eversolar-monitor/Introduction.md at wiki · solmoller/eversolar-monitor (including suitable RS485 hardware)
- Parse Zeverlution web-server
- Parse RS485 data
- Arduino based:
Some other interesting links of software supporting Zeversolar devices:
Note that PVoutput.org does have native ZeverCloud updating using the ZeverSolar API key:
- [WayBack] Zeversolar auto Updater – Auto Uploader – PVOutput Community
- [WayBack] 2017-04-20 Zevercloud Auto Uploader – What’s New – PVOutput Community
But these might help me:
- [WayBack] GitHub – solmoller/eversolar-monitor: Script to capture data and create statistics from Eversolar/zeversolar Solar Inverters. Includes easy install image files for Raspberry Pi. Working edition since 2012 :-)
- [WayBack] GitHub – smeyn/ZeverSolar: Python reader from a Zever Solar web server
- [WayBack] Zeversolar pv inverter – Domoticz
- [Archive.is] Zeversolar auto Updater – Auto Uploader / Zevercloud – PVOutput Community
- https://www.dropbox.com/s/noya0yaf9suxs59/Solarcloud-API-guide_En_v20141114.pdf?dl=0
- [WayBack] PV statistics for ROI | Steve’s Blog
- [Archive.is] FAQ – Zeversolar
- of which I already bumped into
[WayBack] Jeroen Pluimers on Twitter: “We are sort of lucky: The @Zeversolar 3860 problem was cabling; one of the connectors had come loose, dropped to the ground, got moist and had a bit of DC current earth leaking. The safety mechanism in the converter found this, hence Error Code 38: … 1/2”[WayBack] Jeroen Pluimers on Twitter: “This must have happened between sunset and sunrise, where also the lightning strike happened. All connectors have been re-fastened on 60 cm height. If this ever happens again, I know what to check first. 2/2”
Error Code 38:
- Check the PV array’s insulation to ground and make sure that the insulation resistance to ground is greater than 1 MOhm. Otherwise, make a visual inspection of all PV cables and modules.
- Make sure the grounding connection of the inverter is reliable. If this fault occurs often, contact the service.
- of which I already bumped into
–jeroen
Share this:
Posted in Development, Hardware Interfacing, LifeHacker, Power User, Software Development, Solar Power, Zeverlution, Zeversolar | Leave a Comment »
Reminder to self: make a list of URL suffixes to show branch diagrams of repositories
Posted by jpluimers on 2018/12/18
One of the BitBucket features I like a lot is that in the commit history, you see the branches involved in a nice diagram on the left side of the commits: https://bitbucket.org/pypy/pypy/commits
BitBucket used to be popular to host public repositories, but from a public perspective, they are on the decline for that (they even removed the [once popular] bitbucket.org/explore page and [WayBack] will not re-introduce it).
Right now, only major git based hosters still have explore pages:
- https://gitlab.com/explore
- https://github.com/explore and https://github.com/trending (it [used to be called] https://github.com/repositories)
So it makes sense to see where they provide diagrams of branches, so here are some examples to go from a project to the graph:
- https://bitbucket.org/pypy/pypy
- https://gitlab.com/gitlab-org/gitlab-ce
- https://gitlab.com/gitlab-org/gitlab-ce/network/master (in the Web UI you click on Repository, then on Graph)
- https://github.com/gitlabhq/gitlabhq
- https://github.com/gitlabhq/gitlabhq/network (in the Web UI, click on Insights->Graphs, then wait and click on Network; if there are many branches, this page will not load)
- https://github.com/python/cpython
–jeroen
Share this:
Posted in BitBucket, Development, DVCS - Distributed Version Control, git, GitHub, GitLab, Mercurial/Hg, Software Development, Source Code Management | Leave a Comment »
Never ever put OutpugDebugString in code that is meant to run on production systems
Posted by jpluimers on 2018/12/18
I just saw this code in the Delphi RTL enabled for RELEASE builds of the procedure TThreadPool.TQueueWorkerThread.Execute; code:
{$IFDEF MSWINDOWS} OutputDebugString(PChar(Format('Thread Exiting: %d', [ThreadId]))); {$ENDIF}
Never, ever do this.
If you code review code that contains it: ensure it has some kind of compile time DEBUG conditional around it.
–jeroen
Share this:
Posted in Conference Topics, Conferences, Delphi, Development, Event, Software Development | 12 Comments »
The Wiert Corner - irregular stream of stuff 