Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

All - Cleanup overridden functions #389

Merged
merged 64 commits into from
Aug 25, 2023
Merged

All - Cleanup overridden functions #389

merged 64 commits into from
Aug 25, 2023

Conversation

BlueTheKing
Copy link
Contributor

When merged this pull request will:

  • Move overridden GUI ace functions into GUI addon
  • Move commonly used overridden ace functions into misc addon
  • Move most macros into main

IMPORTANT

  • Development Guidelines are read, understood and applied.
  • Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

@BlueTheKing
Add WIP
262a8d2
@BlueTheKing
Fix placed AED-X interactions
fa22660
@BlueTheKing
Monitor view handling target
2b9ee11
@BlueTheKing
Fix volume toggle
d42fa64
@BlueTheKing
Merge branch 'dev-Tomcat' of https://github.com/KAT-Advanced-Medical/KAM
cc05506 
 into advancedRhythms
@BlueTheKing
Fix AED disconnecting twice
e8a072d
@BlueTheKing
stringtable
92d2685
@BlueTheKing
Make shock button glow when charged
49a94a8
@BlueTheKing
Add visual charging process for monitor
7a4669d
@BlueTheKing
Add sinus rhythms for varying heart rate
d26debc
@BlueTheKing
use objectParent
aca4460
@BlueTheKing
Handle selecting specific AED to connect
0a8c327
@BlueTheKing
Add ace interaction icons
22a36c7
@BlueTheKing
Fix nearObjects check not exiting properly
e570352
@BlueTheKing
Add setting for blood pressure measurement interval
7a711c8
@BlueTheKing
Fix PEA displaying wrong rhythm
26a64ae
@BlueTheKing
Merge branch 'dev-Tomcat' into advancedRhythms
df77595
@BlueTheKing
Properly reset cardiac arrest type on zeus heal
79db715
@BlueTheKing
Merge branch 'advancedRhythms' of https://github.com/BlueTheKing/KAM …
58d7c80 
…into advancedRhythms
@BlueTheKing
airway
b4b1171
@BlueTheKing
breathing
e25431b
@BlueTheKing
chemical
ee524a2
@BlueTheKing
circulation
6fc89f9
@BlueTheKing
pharmacy
bd27120
@BlueTheKing
zeus
bb67a05
@BlueTheKing
Move macros around
96c51fc
@BlueTheKing
Move missing chemical IDC
8d54503
@BlueTheKing
Add maximum time for rhythm deterioration
8123c79
@BlueTheKing
Merge branch 'advancedRhythms' of https://github.com/BlueTheKing/KAM …
a721493 
…into cleanupOverriddenFunctions
@BlueTheKing
Simulate pulseless period after defibrillation
0d49f6f
@BlueTheKing
Handle monitor HR display during CPR
d0cffef
@BlueTheKing
Merge branch 'advancedRhythms' of https://github.com/BlueTheKing/KAM …
a6249bd 
…into cleanupOverriddenFunctions
@BlueTheKing
Fix airway item missing in medical menu list
c436731
@BlueTheKing
Merge branch 'dev-Tomcat' of https://github.com/KAT-Advanced-Medical/KAM
2931b7b 
 into advancedRhythms
@BlueTheKing
Monitor actions requires AED-X medlvl
5bf60e2
@BlueTheKing
lazy eval
af99845
@BlueTheKing
Shock bystanders with medical menu open
f42361d
@BlueTheKing
Keep AED connected after picking up/placing down
5ddd42d
@BlueTheKing
Change max AED distance to 6m
a14e9a7
@BlueTheKing
Merge branch 'advancedRhythms' of https://github.com/BlueTheKing/KAM …
09a2921 
…into cleanupOverriddenFunctions
@BlueTheKing
Allow connecting vitals monitoring independently from AED pads
56ee666
@BlueTheKing
variable
202939d
@BlueTheKing
Merge branch 'dev-Tomcat' of https://github.com/KAT-Advanced-Medical/KAM
9e96ce4 
 into cleanupOverriddenFunctions
@BlueTheKing BlueTheKing added the ignore changelog Release Notes: Excluded label Aug 20, 2023
@BlueTheKing BlueTheKing added this to the 2.12.3 milestone Aug 20, 2023
@MiszczuZPolski MiszczuZPolski added area/compatibility Release Notes: **CHANGED:** and removed ignore changelog Release Notes: Excluded labels Aug 20, 2023
@MiszczuZPolski MiszczuZPolski changed the title Cleanup overridden functions All - Cleanup overridden functions Aug 23, 2023
@MiszczuZPolski MiszczuZPolski merged commit 0caeb42 into KAT-Advanced-Medical:dev-Tomcat Aug 25, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MiszczuZPolski MiszczuZPolski MiszczuZPolski approved these changes

Assignees
No one assigned
Labels
area/compatibility Release Notes: **CHANGED:** status/tested
Projects
None yet
Milestone
2.12.3
Development

Successfully merging this pull request may close these issues.
2 participants
@BlueTheKing @MiszczuZPolski