Charles Lepple
2013-Nov-01 13:03 UTC
[Nut-upsdev] Merging blzr as blazer (and un-merging voltronic?)
Daniele, Thanks again for your work on both the voltronic and blzr drivers. To get the most exposure to new drivers, what we have typically done in the past is to rename the existing driver as *-old, so that users get the new driver by default when they upgrade (but the old driver is still available if there are regressions). This is how we are incorporating Michal's apcsmart updates. On your recommendation, I merged voltronic into master for the upcoming 2.7.x release. But if blzr supersedes both voltronic and blazer, I propose we rename blazer_{ser,usb} to blazer_{ser,usb}_old, then rename blzr* to blazer*, and revert the voltronic merge. Does that sound reasonable? (I'm not sure how different the configurations would be for these various drivers.) -- Charles Lepple clepple at gmail
hyouko at gmail.com
2013-Nov-01 18:01 UTC
[Nut-upsdev] Merging blzr as blazer (and un-merging voltronic?)
It's ok with me. There are just a couple of differences (already signaled in the manual) against the blazer drivers: - 'test.battery.start' instant command - 'ondelay' ups.conf option now they both expect seconds while before they wanted a value expressed in minutes. Plus, the order in which the protocols are tested on startup if no one has been chosen is different: - now it is: voltronic, mustek, megatec-old, megatec, mecer and zinto - before it was: megatec, mustek, megatec-old and zinto but I think this shouldn't cause any problem. Against the voltronic drivers the differences (already signaled in the manual) are: - ups.conf options changed: * 'ondelay': it wanted minutes, now it expects seconds, plus now it defaults to 3 minutes while before it had a default value of 0 * 'battnumb' renamed to 'battery_number' - ups.conf options moved to settable vars and therefore no longer supported: * 'battpacks' -> battery.packs * 'battlow' -> battery.voltage.low * 'auto_reboot' -> ups.start.auto * 'battery_protection' -> battery.protection * 'energy_saving' -> battery.energysave * 'cold_start' -> ups.start.battery * 'outlet_control' -> outlet.0.switchable * 'max_eco_volt' -> input.transfer.high * 'min_eco_volt' -> input.transfer.low * 'max_eco_freq' -> input.frequency.high * 'min_eco_freq' -> input.frequency.low * 'outlet{1,2,3,4}_delay' -> outlet.{1,2,3,4}.delay.shutdown * 'batt_type' -> battery.type
Charles Lepple
2013-Nov-06 14:09 UTC
[Nut-upsdev] Merging blzr as blazer (and un-merging voltronic?)
On Nov 1, 2013, at 9:03 AM, Charles Lepple wrote:> But if blzr supersedes both voltronic and blazer, I propose we rename blazer_{ser,usb} to blazer_{ser,usb}_old, then rename blzr* to blazer*, and revert the voltronic merge.Dan, The pull request against master looks good - thanks! What do you think about the renaming of blazer to blazer_old, and making blzr the new blazer driver? I still have some cleanup to do on the HCL because the filtering code assumes that a driver can only be serial or USB, but that will need to be done regardless of the name change. -- Charles Lepple clepple at gmail
hyouko at gmail.com
2013-Nov-06 15:21 UTC
[Nut-upsdev] Merging blzr as blazer (and un-merging voltronic?)
In my opinion, there might be just one problem: the blzr driver doesn't provide anymore two splitted drivers (serial and usb), so this isn't going to be a 'silent update' for those using these drivers (should we provide symlinks or the like?). If this doesn't sound like a problem to you, I'll take care of the rename. Plus, if you could take a look to the blazer-fix pull request and merge it, if it's ok, into master before the rename, we may avoid some conflicts.