Remove redundant files

This commit is contained in:
Dan Hawkins 2017-12-02 21:48:37 +00:00
commit 2fab1a566e
3 changed files with 0 additions and 230 deletions

View file

View file

View file

@ -1,230 +0,0 @@
****************************************************************************************************
****************************************************************************************************
****************************************************************************************************
****************************************************************************************************
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