Merge branch 'test-3' into esi

# Conflicts: # requirements.txt
2018-02-11 23:17:50 -05:00
parent 7b0f672f04 5f0ce58c29
commit 33eccaa374
18 changed files with 109 additions and 112 deletions
--- a/service/port.py
+++ b/service/port.py
@@ -54,13 +54,14 @@ from collections import OrderedDict

 pyfalog = Logger(__name__)

-EFT_SLOT_ORDER = [Slot.LOW, Slot.MED, Slot.HIGH, Slot.RIG, Slot.SUBSYSTEM]
+EFT_SLOT_ORDER = [Slot.LOW, Slot.MED, Slot.HIGH, Slot.RIG, Slot.SUBSYSTEM, Slot.SERVICE]
 INV_FLAGS = {
    Slot.LOW: 11,
    Slot.MED: 19,
    Slot.HIGH: 27,
    Slot.RIG: 92,
-    Slot.SUBSYSTEM: 125
+    Slot.SUBSYSTEM: 125,
+    Slot.SERVICE: 164
 }

 INV_FLAG_CARGOBAY = 5