Tested version of differences generation
This commit is contained in:
parent
d33f6828a4
commit
e58acae19d
4 changed files with 377 additions and 87 deletions
2
.settings/org.eclipse.core.resources.prefs
Normal file
2
.settings/org.eclipse.core.resources.prefs
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
eclipse.preferences.version=1
|
||||
encoding//versionnumbering/versioninfo.py=utf-8
|
||||
|
|
@ -1,36 +1,26 @@
|
|||
'''
|
||||
Created on 2 Mar 2017
|
||||
showreleasedifferences -- shortdesc
|
||||
|
||||
@author: Dan
|
||||
showreleasedifferences generates a version folder with a common set of version information files in it
|
||||
|
||||
@author: dan
|
||||
|
||||
@copyright: 2017 Global Inkjet Systems Ltd. All rights reserved.
|
||||
'''
|
||||
import subprocess
|
||||
import os
|
||||
import sys
|
||||
import re
|
||||
|
||||
GIT_EXECUTABLE = os.getenv("GIT_EXECUTABLE")
|
||||
if GIT_EXECUTABLE == None:
|
||||
print("Please define the GIT_EXECUTABLE environment variable to the git executable path")
|
||||
sys.exit(1)
|
||||
from argparse import ArgumentParser
|
||||
from argparse import RawDescriptionHelpFormatter
|
||||
|
||||
WORKING_PATH = os.getenv("WORKING_PATH")
|
||||
if WORKING_PATH == None:
|
||||
print("Please define the WORKING_PATH environment variable to the git repository path to use")
|
||||
sys.exit(1)
|
||||
__all__ = []
|
||||
__version__ = 0.1
|
||||
__date__ = '2017-11-29'
|
||||
__updated__ = '2017-11-29'
|
||||
|
||||
CURRENT_RELEASE = os.getenv("CURRENT_RELEASE")
|
||||
if CURRENT_RELEASE == None:
|
||||
print("Please define the CURRENT_RELEASE version")
|
||||
sys.exit(1)
|
||||
|
||||
PREVIOUS_RELEASE = os.getenv("PREVIOUS_RELEASE")
|
||||
if PREVIOUS_RELEASE == None:
|
||||
print("Please define the PREVIOUS_RELEASE version")
|
||||
sys.exit(1)
|
||||
|
||||
DIFFERENCE_OPTIONS = os.getenv("DIFFERENCE_OPTIONS")
|
||||
if DIFFERENCE_OPTIONS == None:
|
||||
DIFFERENCE_OPTIONS = ""
|
||||
gitExecutable = os.getenv("GIT_EXECUTABLE", default="git")
|
||||
|
||||
class GitException(Exception):
|
||||
def __init__(self, message):
|
||||
|
|
@ -39,31 +29,34 @@ class GitException(Exception):
|
|||
def __repr__(self):
|
||||
return self.message
|
||||
|
||||
def printDivider(times = 1, length = 100):
|
||||
def makeFolder(versionfolder):
|
||||
print("Creating folder (if not already there): {0}".format(versionfolder))
|
||||
os.makedirs(versionfolder, exist_ok = True)
|
||||
|
||||
def printDivider(outfh, times = 1, length = 100):
|
||||
for _ in range(times):
|
||||
print("*" * length)
|
||||
outfh.write("{0}\n".format("*" * length))
|
||||
|
||||
TABSIZE = 4
|
||||
def printTabbed(string, tabs = 0):
|
||||
print("{0}{1}".format(" " * (TABSIZE * tabs), string))
|
||||
def printTabbed(outfh, string, tabs = 0):
|
||||
outfh.write("{0}{1}\n".format(" " * (TABSIZE * tabs), string))
|
||||
|
||||
def getGitLogDifferences(workingPath, previousRelease, currentRelease, tripledot = False):
|
||||
gitExecutable = GIT_EXECUTABLE
|
||||
def getGitLogDifferences(outfh, gitrootfolder, previousRelease, currentRelease, tripledot = False):
|
||||
if tripledot:
|
||||
releaseExpression = previousRelease + "..." + currentRelease
|
||||
else:
|
||||
releaseExpression = previousRelease + ".." + currentRelease
|
||||
currentdir = os.getcwd()
|
||||
os.chdir(workingPath)
|
||||
os.chdir(gitrootfolder)
|
||||
gitlog = []
|
||||
printTabbed("Executing: {0} {1} {2} {3}".format(gitExecutable, "log", "--oneline", releaseExpression))
|
||||
printTabbed(outfh, "Executing: {0} {1} {2} {3}".format(gitExecutable, "log", "--oneline", releaseExpression))
|
||||
proc = subprocess.Popen([gitExecutable, "log", "--oneline", releaseExpression], stdout=subprocess.PIPE)
|
||||
while True:
|
||||
line = proc.stdout.readline()
|
||||
if line:
|
||||
linestring = line.decode('utf-8').rstrip()
|
||||
gitlog.append(linestring)
|
||||
#printTabbed(linestring, 1)
|
||||
#printTabbed(outfh, linestring, 1)
|
||||
else:
|
||||
break
|
||||
proc.wait()
|
||||
|
|
@ -72,15 +65,23 @@ def getGitLogDifferences(workingPath, previousRelease, currentRelease, tripledot
|
|||
os.chdir(currentdir)
|
||||
return gitlog
|
||||
|
||||
expectedpattern = re.compile("^.* +(?:[gG][iI][sS][ _-]*|[tT]rac \#*|\#\s*)(\d+):*(.*)$")
|
||||
revertpattern = re.compile('^(\S*) Revert " *GIS-(\d+):* (.*)"$')
|
||||
jiraprojectpattern = {
|
||||
'GIS' : ( re.compile("^.* +(?:[gG][iI][sS][ _-]*|[tT]rac \#*|\#\s*)(\d+):*(.*)$"),
|
||||
re.compile('^(\S*) Revert " *GIS-(\d+):* (.*)"$'),
|
||||
),
|
||||
'IMB': ( re.compile("^.* +(?:[Ii][Mm][Bb][ _-]*|\#\s*)(\d+):*(.*)$"),
|
||||
re.compile('^(\S*) Revert " *IMB-(\d+):* (.*)"$'),
|
||||
),
|
||||
}
|
||||
|
||||
mergepattern = re.compile("^(.*)((?:Merge branch '.*'|Merge remote-tracking branch '.*'|Merge commit '.*'|Add '.*' from commit).*)$")
|
||||
|
||||
def processLog(gitlog):
|
||||
def processLog(gitlog, jirakeyprefix):
|
||||
reverts = []
|
||||
merges = {}
|
||||
other = []
|
||||
numbered = {}
|
||||
(expectedpattern, revertpattern) = jiraprojectpattern[jirakeyprefix]
|
||||
for line in gitlog:
|
||||
expectedmatch = expectedpattern.match(line)
|
||||
revertmatch = revertpattern.match(line)
|
||||
|
|
@ -88,7 +89,7 @@ def processLog(gitlog):
|
|||
if expectedmatch == None and revertmatch == None and mergematch == None:
|
||||
other.append(line)
|
||||
if revertmatch:
|
||||
gisnumber = "GIS-" + revertmatch.group(2)
|
||||
gisnumber = jirakeyprefix + "-" + revertmatch.group(2)
|
||||
description = revertmatch.group(3)
|
||||
reverts.append("Revert: {0} {1}".format(gisnumber, description))
|
||||
if mergematch:
|
||||
|
|
@ -98,54 +99,116 @@ def processLog(gitlog):
|
|||
else:
|
||||
merges[merge] += 1
|
||||
if expectedmatch:
|
||||
gisnumber = "GIS-" + expectedmatch.group(1)
|
||||
gisnumber = jirakeyprefix + "-" + expectedmatch.group(1)
|
||||
description = expectedmatch.group(2)
|
||||
if not gisnumber in numbered:
|
||||
numbered[gisnumber] = []
|
||||
numbered[gisnumber].append(description)
|
||||
return (reverts, merges, other, numbered)
|
||||
|
||||
def showDifferences(differences):
|
||||
def showDifferences(differences, jirakeyprefix, outfh):
|
||||
(revertslog, mergeslog, otherlog, numberedlog) = differences
|
||||
printDivider()
|
||||
printTabbed("GIS-Numbers Log:")
|
||||
printDivider(outfh)
|
||||
printTabbed(outfh, jirakeyprefix + "-Numbers Log:")
|
||||
for (gisnumber, descriptions) in sorted(numberedlog.items()):
|
||||
printTabbed(gisnumber, 1)
|
||||
printTabbed(outfh, gisnumber, 1)
|
||||
descriptions = numberedlog[gisnumber];
|
||||
for description in descriptions:
|
||||
printTabbed(description, 2)
|
||||
printDivider()
|
||||
printTabbed("Revert log:")
|
||||
printTabbed(outfh, description, 2)
|
||||
printDivider(outfh)
|
||||
printTabbed(outfh, "Revert log:")
|
||||
for reversion in sorted(revertslog):
|
||||
printTabbed(reversion, 1)
|
||||
printDivider()
|
||||
printTabbed("Merges log:")
|
||||
printTabbed(outfh, reversion, 1)
|
||||
printDivider(outfh)
|
||||
printTabbed(outfh, "Merges log:")
|
||||
for merge in sorted(mergeslog):
|
||||
printTabbed(merge, 1)
|
||||
printDivider()
|
||||
printTabbed("Other log:")
|
||||
printTabbed(outfh, merge, 1)
|
||||
printDivider(outfh)
|
||||
printTabbed(outfh, "Other log:")
|
||||
for other in sorted(otherlog):
|
||||
printTabbed(other, 1)
|
||||
printTabbed(outfh, other, 1)
|
||||
|
||||
def main():
|
||||
workingPath = WORKING_PATH
|
||||
previous = PREVIOUS_RELEASE
|
||||
now = CURRENT_RELEASE
|
||||
printDivider(times = 4)
|
||||
printTabbed("Looking for changes in {2} that are not in {1} of the repository at path: {0}".format(workingPath, previous, now))
|
||||
gitlog = getGitLogDifferences(workingPath, previous, now)
|
||||
showDifferences(processLog(gitlog))
|
||||
if 'opposite' in DIFFERENCE_OPTIONS.lower():
|
||||
printDivider(times = 4)
|
||||
printTabbed("Looking for changes in {2} that are not in {1} of the repository at path: {0}".format(workingPath, now, previous))
|
||||
gitlog = getGitLogDifferences(workingPath, now, previous)
|
||||
showDifferences(processLog(gitlog))
|
||||
if 'notcommon' in DIFFERENCE_OPTIONS.lower():
|
||||
printDivider(times = 4)
|
||||
printTabbed("Looking for changes that are not common to {1} or {2} at path: {0}".format(workingPath, now, previous))
|
||||
gitlog = getGitLogDifferences(workingPath, now, previous, tripledot = True)
|
||||
showDifferences(processLog(gitlog))
|
||||
sys.exit(0)
|
||||
def main(argv=None): # IGNORE:C0111
|
||||
'''Command line options.'''
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
if argv is None:
|
||||
argv = sys.argv
|
||||
else:
|
||||
sys.argv.extend(argv)
|
||||
|
||||
program_name = os.path.basename(sys.argv[0])
|
||||
program_version = "v%s" % __version__
|
||||
program_build_date = str(__updated__)
|
||||
program_version_message = '%%(prog)s %s (%s)' % (program_version, program_build_date)
|
||||
program_shortdesc = __import__('__main__').__doc__.split("\n")[1]
|
||||
program_license = '''%s
|
||||
|
||||
Created by dan on %s.
|
||||
Copyright 2017 Global Inkjet Systems Ltd. All rights reserved.
|
||||
|
||||
Distributed on an "AS IS" basis without warranties
|
||||
or conditions of any kind, either express or implied.
|
||||
|
||||
USAGE
|
||||
''' % (program_shortdesc, str(__date__))
|
||||
|
||||
try:
|
||||
# Setup argument parser
|
||||
parser = ArgumentParser(description=program_license, formatter_class=RawDescriptionHelpFormatter)
|
||||
parser.add_argument("-g", "--gitroot", dest="gitrootfolder", action="store", default="GitRepository", help="root path of source files [default: %(default)s]")
|
||||
parser.add_argument("-s", "--sourceversion", dest="sourceversion", action="store", default="origin/master", help="source version branch or tag to discover compare against [default: %(default)s]")
|
||||
parser.add_argument("-p", "--previousversion", dest="previousversion", action="store", default="origin/master", help="source branch or tag to compare with [default: %(default)s]")
|
||||
parser.add_argument("-j", "--jirakeyprefix", dest="jirakeyprefix", action="store", default="GIS", help="jira key prefix [default: %(default)s]")
|
||||
parser.add_argument("-o", "--outputoptions", dest="outputoptions", action="store", default="", help="output options: Can be: opposite notcommon [default: %(default)s]")
|
||||
parser.add_argument("-v", "--versionfolder", dest="versionfolder", action="store", default="", help="version folder where differences file stored [default: %(default)s]")
|
||||
|
||||
# Process arguments
|
||||
args = parser.parse_args()
|
||||
|
||||
try:
|
||||
gitrootfolder = args.gitrootfolder
|
||||
sourceversion = args.sourceversion
|
||||
previousversion = args.previousversion
|
||||
jirakeyprefix = args.jirakeyprefix
|
||||
outputoptions = args.outputoptions
|
||||
versionfolder = args.versionfolder
|
||||
|
||||
print("Git root:", gitrootfolder, "Source version:", sourceversion, "Previous source version:", previousversion)
|
||||
print("Jira key prefix:", jirakeyprefix, "Output options:", outputoptions, "Version folder:", versionfolder)
|
||||
|
||||
if versionfolder:
|
||||
makeFolder(versionfolder)
|
||||
outfh = open(os.path.join(versionfolder, "differences.txt"), 'w')
|
||||
else:
|
||||
outfh = sys.stdout
|
||||
|
||||
printDivider(outfh, times = 4)
|
||||
printTabbed(outfh, "Looking for changes in {2} that are not in {1} of the repository at path: {0}".format(gitrootfolder, previousversion, sourceversion))
|
||||
gitlog = getGitLogDifferences(outfh, gitrootfolder, previousversion, sourceversion)
|
||||
showDifferences(processLog(gitlog, jirakeyprefix), jirakeyprefix, outfh)
|
||||
if 'opposite' in outputoptions.lower():
|
||||
printDivider(outfh, times = 4)
|
||||
printTabbed(outfh, "Looking for changes in {2} that are not in {1} of the repository at path: {0}".format(gitrootfolder, sourceversion, previousversion))
|
||||
gitlog = getGitLogDifferences(outfh, gitrootfolder, sourceversion, previousversion)
|
||||
showDifferences(processLog(gitlog, jirakeyprefix), jirakeyprefix, outfh)
|
||||
if 'notcommon' in outputoptions.lower():
|
||||
printDivider(outfh, times = 4)
|
||||
printTabbed(outfh, "Looking for changes that are not common to {1} or {2} at path: {0}".format(gitrootfolder, sourceversion, previousversion))
|
||||
gitlog = getGitLogDifferences(outfh, gitrootfolder, sourceversion, previousversion, tripledot = True)
|
||||
showDifferences(processLog(gitlog, jirakeyprefix), jirakeyprefix, outfh)
|
||||
|
||||
if versionfolder:
|
||||
outfh.close()
|
||||
return 0
|
||||
except Exception as e:
|
||||
print("Error while determining differences:", e.__repr__())
|
||||
return 1
|
||||
|
||||
except Exception as e:
|
||||
indent = len(program_name) * " "
|
||||
print(program_name + ": " + repr(e) + "\n")
|
||||
print(indent + " for help use --help")
|
||||
return 2
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
|
|
|
|||
230
version/differences.txt
Normal file
230
version/differences.txt
Normal file
|
|
@ -0,0 +1,230 @@
|
|||
****************************************************************************************************
|
||||
****************************************************************************************************
|
||||
****************************************************************************************************
|
||||
****************************************************************************************************
|
||||
Looking for changes in origin/master that are not in origin/1.5.4 of the repository at path: /home/dan/home2/Development/inksystem
|
||||
Executing: git log --oneline origin/1.5.4..origin/master
|
||||
****************************************************************************************************
|
||||
IMB-Numbers Log:
|
||||
IMB-11
|
||||
Further minor change to tooltip
|
||||
Changed tooltip for PWN Frequency on ink pumps
|
||||
Changed the Tooltips for PWM frequency and duty cycle
|
||||
IMB-12
|
||||
Changed the order the events are generated in to prevent master from resetting slave
|
||||
When a vent command is sent to a slave, it will demand a vent from its master
|
||||
IMB-14
|
||||
Fixed state transition in Controlled Flow Master where it could get stuck in pre-flow
|
||||
IMB-4
|
||||
- Add more logging
|
||||
IMB-42
|
||||
Master sets the slaves to dormant when pre-idling
|
||||
IMB-43
|
||||
Added purge abort for HP Type 2
|
||||
Fixed shared controlled flow transition for purge all slaves
|
||||
Added Idle transitions from Purge
|
||||
Added missing definition
|
||||
Added explicit transitions for standby for all states for flowmode 1-3
|
||||
IMB-47
|
||||
- Tidied up checkStateR to be consistent with setValueR
|
||||
- The thermistor will only generate an event if a threshold has been crossed, or when "timeToSendAnotherEvent" is true.
|
||||
- The thermistor will only generate an event if a threshold has been crossed, or when "timeToSendAnotherEvent" is true.
|
||||
IMB-50
|
||||
Temperature setpoint set when entering flow configuration to ensure correct heater operation
|
||||
IMB-6
|
||||
Removed a white-space in the output
|
||||
IMB-7
|
||||
Changed the formatting of the output
|
||||
IMB-8
|
||||
When returning from a purge it now calls the same code as when going into idle, as they effectively were identical.
|
||||
Added pre-flow to post-flow transitions and vice-versa
|
||||
In gravity mode: removed the activation of the vacuum pump which speeds up ramps. This caused vent and pump to "fight" each other
|
||||
****************************************************************************************************
|
||||
Revert log:
|
||||
****************************************************************************************************
|
||||
Merges log:
|
||||
Merge branch '1.10023.j6221-Type2_Pneumatic' of hydra:gis/inksystem into 1.10023.j6221-Type2_Pneumatic
|
||||
Merge branch 'master' of hydra:gis/inksystem
|
||||
Merge remote-tracking branch 'remotes/origin/1.10025.j6416-EthernetCongestion' into 1.10023.j6221-Type2_Pneumatic
|
||||
Merge remote-tracking branch 'remotes/origin/1.5.2' into 1.10023.j6221-Type2_Pneumatic
|
||||
Merge remote-tracking branch 'remotes/origin/1.5.5'
|
||||
Merge remote-tracking branch 'remotes/origin/master' into 1.10023.j6221-Type2_Pneumatic
|
||||
****************************************************************************************************
|
||||
Other log:
|
||||
095290c GIS-1621 - Make compilation work in case-sensitive linux
|
||||
0a8505d GIS-1621 - Remove test code
|
||||
0e8ccce GIS-6380 Removed ambiguous "absolute pressure" terminology
|
||||
149e0bf GIS 6221: Added logging for gravity mode
|
||||
169125b GIS-6221: Corrected Typo
|
||||
23c37d0 GIS 43: System will abort purge in a safe manner if standby command is issued
|
||||
37dd24b GIS 6479: Controlled flow master now goes through pre-flow. Fixed ordering in controlevent.c and .h
|
||||
41ac373 GIS-6253: Fixed bugs
|
||||
45cdfbe GIS 6591: Fixed if statement which outputs ITPD and OTPD
|
||||
468798e Update release notes whitespace
|
||||
4c2badc GIS-1621 - 16 bit integer is not printing correctly
|
||||
4c9a1aa GIS-6221 Vent the outlet bottle when purging to prevent "kick" on return from idle
|
||||
541c3bb GIS-6253: Added gravity flowmode
|
||||
5562461 GIS-6570 - Handle 0 length buffers being sent for TCP transmission; Add some logging for diagnosis
|
||||
577444e Update release notes for 1.5.5
|
||||
5c6416b GIS-6416 - Instrument number of buffers on socket transmit queue and grapher empty buffer queue
|
||||
603de5a GIS-6221: Fixed more typos
|
||||
628b57d GIS 6221: Fixed typo
|
||||
6526df4 GIS-6221 Corrected behaviour at idle. When idling, the pressure is now only vacuum pump driven in one direction.
|
||||
6da6243 GIS-6221 Changed purge configuration, return from purge still to do
|
||||
7d263d0 GIS 6591: Change the output of the settings command on Telnet for clarity
|
||||
83f5517 Update 1.5.5 release notes with known issues
|
||||
85fc901 GIS-6570 - Handle condition when no bytes are consumed by sck_send (because the connection has died) for TCP transmission; Add some logging for diagnosis
|
||||
8a2db28 GIS-6221 Corrected behaviour at idle. When idling, the pressure is now only vacuum pump driven in one direction.
|
||||
8df4c1b GIS-1621 - Settings BSP files have changed unexpectedly from 1.5.4 - maybe causing a slow down
|
||||
92c135e GIS 6462 Fixed typo
|
||||
9400923 GIS-6516: Slave resets from vent when master is reset
|
||||
9964521 GIS 6253: Added methods for gravity mode logging in inkchannelinterface.cpp/h
|
||||
a1f0025 GIS 43: Added PreIdle with slaves in controlled flow master
|
||||
a900a24 GIS-6221: Changed Idle to be driven from Inlet Side
|
||||
b2f4383 GIS-1620 - Correct string print
|
||||
b42ea46 GIS-1621 - Handle version prefix
|
||||
b498cd5 GIS 6462 Added on the fly idle pressure change in shared pressure controlled flow
|
||||
b4e1b8c GIS 6221: Resolved merge conflicts and applied fixes from 1.5.3 to the Type 2 High Pressure mode
|
||||
bbc5e45 GIS 6221 - Changed High Pressure Type 2 to flowmode 6
|
||||
bd69b60 GIS-6253: Fixed typos
|
||||
c568789 GIS 6221 - Bug fixes High Pressure Type 2 Flow mode
|
||||
c666970 GIS-6570 - Add some logging for diagnosis
|
||||
c7bbf29 Fixed shared controlled flow transition for purge all slaves to standby
|
||||
c962c65 GIS-6221 Added Purge Return via Idle
|
||||
ca1e7b5 GIS-6253: Added the files for gravity flowmode
|
||||
ca4473b GIS-1621 - Only send pressure updates if there is a 4 point difference in value
|
||||
cb06440 GIS 6221: Changed descriptions of Flowmodes. Changed output of settings to show purge pressure for flowmode 5 and 6
|
||||
d4dd54d GIS 6462: Added on-the-fly pressure change for Shared Pressure Controlled Flow systems
|
||||
da69186 GIS 6492: Dumpconfig now outputs the software version
|
||||
df64abd Revert "GIS-1621 - Only send pressure updates if there is a 4 point difference in value"
|
||||
e51971f GIS 6379: The purge pressure is only shown on High Pressure systems (flowmode 4 and 5)
|
||||
e6b0227 GIS-6221 Corrected vent operation for outlet bottle
|
||||
ec13b60 GIS-6416 - Handle multiple writes to a TCP stream until it becomes busy
|
||||
f018a86 GIS 6479: Added an applysettings command to allow on the fly pressure and temperature changes
|
||||
f7109ff GIS 43: Added purge to idle transitions for Gravity Mode
|
||||
f87280b GIS 43: Fixed transition in cfm
|
||||
f999765 GIS-6253: Removed redundant function
|
||||
ff37df8 GIS-6253: Fixed typos
|
||||
ff92b79 GIS 6591: Added statement on Master settings
|
||||
****************************************************************************************************
|
||||
****************************************************************************************************
|
||||
****************************************************************************************************
|
||||
****************************************************************************************************
|
||||
Looking for changes in origin/1.5.4 that are not in origin/master of the repository at path: /home/dan/home2/Development/inksystem
|
||||
Executing: git log --oneline origin/master..origin/1.5.4
|
||||
****************************************************************************************************
|
||||
IMB-Numbers Log:
|
||||
****************************************************************************************************
|
||||
Revert log:
|
||||
****************************************************************************************************
|
||||
Merges log:
|
||||
****************************************************************************************************
|
||||
Other log:
|
||||
****************************************************************************************************
|
||||
****************************************************************************************************
|
||||
****************************************************************************************************
|
||||
****************************************************************************************************
|
||||
Looking for changes that are not common to origin/master or origin/1.5.4 at path: /home/dan/home2/Development/inksystem
|
||||
Executing: git log --oneline origin/master...origin/1.5.4
|
||||
****************************************************************************************************
|
||||
IMB-Numbers Log:
|
||||
IMB-11
|
||||
Further minor change to tooltip
|
||||
Changed tooltip for PWN Frequency on ink pumps
|
||||
Changed the Tooltips for PWM frequency and duty cycle
|
||||
IMB-12
|
||||
Changed the order the events are generated in to prevent master from resetting slave
|
||||
When a vent command is sent to a slave, it will demand a vent from its master
|
||||
IMB-14
|
||||
Fixed state transition in Controlled Flow Master where it could get stuck in pre-flow
|
||||
IMB-4
|
||||
- Add more logging
|
||||
IMB-42
|
||||
Master sets the slaves to dormant when pre-idling
|
||||
IMB-43
|
||||
Added purge abort for HP Type 2
|
||||
Fixed shared controlled flow transition for purge all slaves
|
||||
Added Idle transitions from Purge
|
||||
Added missing definition
|
||||
Added explicit transitions for standby for all states for flowmode 1-3
|
||||
IMB-47
|
||||
- Tidied up checkStateR to be consistent with setValueR
|
||||
- The thermistor will only generate an event if a threshold has been crossed, or when "timeToSendAnotherEvent" is true.
|
||||
- The thermistor will only generate an event if a threshold has been crossed, or when "timeToSendAnotherEvent" is true.
|
||||
IMB-50
|
||||
Temperature setpoint set when entering flow configuration to ensure correct heater operation
|
||||
IMB-6
|
||||
Removed a white-space in the output
|
||||
IMB-7
|
||||
Changed the formatting of the output
|
||||
IMB-8
|
||||
When returning from a purge it now calls the same code as when going into idle, as they effectively were identical.
|
||||
Added pre-flow to post-flow transitions and vice-versa
|
||||
In gravity mode: removed the activation of the vacuum pump which speeds up ramps. This caused vent and pump to "fight" each other
|
||||
****************************************************************************************************
|
||||
Revert log:
|
||||
****************************************************************************************************
|
||||
Merges log:
|
||||
Merge branch '1.10023.j6221-Type2_Pneumatic' of hydra:gis/inksystem into 1.10023.j6221-Type2_Pneumatic
|
||||
Merge branch 'master' of hydra:gis/inksystem
|
||||
Merge remote-tracking branch 'remotes/origin/1.10025.j6416-EthernetCongestion' into 1.10023.j6221-Type2_Pneumatic
|
||||
Merge remote-tracking branch 'remotes/origin/1.5.2' into 1.10023.j6221-Type2_Pneumatic
|
||||
Merge remote-tracking branch 'remotes/origin/1.5.5'
|
||||
Merge remote-tracking branch 'remotes/origin/master' into 1.10023.j6221-Type2_Pneumatic
|
||||
****************************************************************************************************
|
||||
Other log:
|
||||
095290c GIS-1621 - Make compilation work in case-sensitive linux
|
||||
0a8505d GIS-1621 - Remove test code
|
||||
0e8ccce GIS-6380 Removed ambiguous "absolute pressure" terminology
|
||||
149e0bf GIS 6221: Added logging for gravity mode
|
||||
169125b GIS-6221: Corrected Typo
|
||||
23c37d0 GIS 43: System will abort purge in a safe manner if standby command is issued
|
||||
37dd24b GIS 6479: Controlled flow master now goes through pre-flow. Fixed ordering in controlevent.c and .h
|
||||
41ac373 GIS-6253: Fixed bugs
|
||||
45cdfbe GIS 6591: Fixed if statement which outputs ITPD and OTPD
|
||||
468798e Update release notes whitespace
|
||||
4c2badc GIS-1621 - 16 bit integer is not printing correctly
|
||||
4c9a1aa GIS-6221 Vent the outlet bottle when purging to prevent "kick" on return from idle
|
||||
541c3bb GIS-6253: Added gravity flowmode
|
||||
5562461 GIS-6570 - Handle 0 length buffers being sent for TCP transmission; Add some logging for diagnosis
|
||||
577444e Update release notes for 1.5.5
|
||||
5c6416b GIS-6416 - Instrument number of buffers on socket transmit queue and grapher empty buffer queue
|
||||
603de5a GIS-6221: Fixed more typos
|
||||
628b57d GIS 6221: Fixed typo
|
||||
6526df4 GIS-6221 Corrected behaviour at idle. When idling, the pressure is now only vacuum pump driven in one direction.
|
||||
6da6243 GIS-6221 Changed purge configuration, return from purge still to do
|
||||
7d263d0 GIS 6591: Change the output of the settings command on Telnet for clarity
|
||||
83f5517 Update 1.5.5 release notes with known issues
|
||||
85fc901 GIS-6570 - Handle condition when no bytes are consumed by sck_send (because the connection has died) for TCP transmission; Add some logging for diagnosis
|
||||
8a2db28 GIS-6221 Corrected behaviour at idle. When idling, the pressure is now only vacuum pump driven in one direction.
|
||||
8df4c1b GIS-1621 - Settings BSP files have changed unexpectedly from 1.5.4 - maybe causing a slow down
|
||||
92c135e GIS 6462 Fixed typo
|
||||
9400923 GIS-6516: Slave resets from vent when master is reset
|
||||
9964521 GIS 6253: Added methods for gravity mode logging in inkchannelinterface.cpp/h
|
||||
a1f0025 GIS 43: Added PreIdle with slaves in controlled flow master
|
||||
a900a24 GIS-6221: Changed Idle to be driven from Inlet Side
|
||||
b2f4383 GIS-1620 - Correct string print
|
||||
b42ea46 GIS-1621 - Handle version prefix
|
||||
b498cd5 GIS 6462 Added on the fly idle pressure change in shared pressure controlled flow
|
||||
b4e1b8c GIS 6221: Resolved merge conflicts and applied fixes from 1.5.3 to the Type 2 High Pressure mode
|
||||
bbc5e45 GIS 6221 - Changed High Pressure Type 2 to flowmode 6
|
||||
bd69b60 GIS-6253: Fixed typos
|
||||
c568789 GIS 6221 - Bug fixes High Pressure Type 2 Flow mode
|
||||
c666970 GIS-6570 - Add some logging for diagnosis
|
||||
c7bbf29 Fixed shared controlled flow transition for purge all slaves to standby
|
||||
c962c65 GIS-6221 Added Purge Return via Idle
|
||||
ca1e7b5 GIS-6253: Added the files for gravity flowmode
|
||||
ca4473b GIS-1621 - Only send pressure updates if there is a 4 point difference in value
|
||||
cb06440 GIS 6221: Changed descriptions of Flowmodes. Changed output of settings to show purge pressure for flowmode 5 and 6
|
||||
d4dd54d GIS 6462: Added on-the-fly pressure change for Shared Pressure Controlled Flow systems
|
||||
da69186 GIS 6492: Dumpconfig now outputs the software version
|
||||
df64abd Revert "GIS-1621 - Only send pressure updates if there is a 4 point difference in value"
|
||||
e51971f GIS 6379: The purge pressure is only shown on High Pressure systems (flowmode 4 and 5)
|
||||
e6b0227 GIS-6221 Corrected vent operation for outlet bottle
|
||||
ec13b60 GIS-6416 - Handle multiple writes to a TCP stream until it becomes busy
|
||||
f018a86 GIS 6479: Added an applysettings command to allow on the fly pressure and temperature changes
|
||||
f7109ff GIS 43: Added purge to idle transitions for Gravity Mode
|
||||
f87280b GIS 43: Fixed transition in cfm
|
||||
f999765 GIS-6253: Removed redundant function
|
||||
ff37df8 GIS-6253: Fixed typos
|
||||
ff92b79 GIS 6591: Added statement on Master settings
|
||||
|
|
@ -21,6 +21,8 @@ __version__ = 0.1
|
|||
__date__ = '2017-11-29'
|
||||
__updated__ = '2017-11-29'
|
||||
|
||||
gitExecutable = os.getenv("GIT_EXECUTABLE", default="git")
|
||||
|
||||
def resetFolder(versionfolder):
|
||||
print("Removing folders and contents of: {0}".format(versionfolder))
|
||||
try:
|
||||
|
|
@ -38,29 +40,22 @@ def getGitRevision(gitrootpath, basenumber):
|
|||
print("Changing current working directory to: {0}".format(path))
|
||||
os.chdir(path)
|
||||
|
||||
gitvar = "GIT_EXECUTABLE"
|
||||
if gitvar in os.environ and os.environ[gitvar]:
|
||||
gitexecutable = os.environ[gitvar]
|
||||
else:
|
||||
print("Expecting GIT_EXECUTABLE environment variable to have path to git. Defaulting to 'git'")
|
||||
gitexecutable = "git"
|
||||
|
||||
print("Determining revision info using git command: {0}".format(gitexecutable))
|
||||
completed = subprocess.run([gitexecutable, "rev-list", "HEAD", "--count"], stdout=subprocess.PIPE)
|
||||
print("Determining revision info using git command: {0}".format(gitExecutable))
|
||||
completed = subprocess.run([gitExecutable, "rev-list", "HEAD", "--count"], stdout=subprocess.PIPE)
|
||||
print("Command {0} returned: {1}".format(completed.args, completed.returncode))
|
||||
changecount = completed.stdout.decode("utf-8").strip()
|
||||
print("Change count: {0}".format(changecount))
|
||||
adjustedchangecount = int(changecount) + int(basenumber)
|
||||
print("Adjusted change count: {0}".format(adjustedchangecount))
|
||||
|
||||
print("Determining current revision info using git command: {0}".format(gitexecutable))
|
||||
completed = subprocess.run([gitexecutable, "rev-parse", "HEAD"], stdout=subprocess.PIPE)
|
||||
print("Determining current revision info using git command: {0}".format(gitExecutable))
|
||||
completed = subprocess.run([gitExecutable, "rev-parse", "HEAD"], stdout=subprocess.PIPE)
|
||||
print("Command {0} returned: {1}".format(completed.args, completed.returncode))
|
||||
revision = completed.stdout.decode("utf-8").strip()
|
||||
print("Revision: {0}".format(revision))
|
||||
|
||||
print("Determining remote info using git command: {0}".format(gitexecutable))
|
||||
completed = subprocess.run([gitexecutable, "remote", "show", "origin"], stdout=subprocess.PIPE)
|
||||
print("Determining remote info using git command: {0}".format(gitExecutable))
|
||||
completed = subprocess.run([gitExecutable, "remote", "show", "origin"], stdout=subprocess.PIPE)
|
||||
print("Command {0} returned: {1}".format(completed.args, completed.returncode))
|
||||
remoteinfo = completed.stdout.decode("utf-8")
|
||||
print("Remote info: {0}".format(remoteinfo))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue