Updated to Malcolm 4-0b1

CONFIG.example

@@ -3,14 +3,14 @@
 #
 # It doesn't need to be built, we just copy python files out of it
 #
-ANNOTYPES = /dls_sw/prod/common/python/RHEL6-x86_64/annotypes/0-10
+ANNOTYPES = /dls_sw/prod/common/python/RHEL7-x86_64/annotypes/0-17
 
 # A checked out version of:
 # https://github.com/dls-controls/pymalcolm
 #
 # It doesn't need to be built, we just copy python files out of it
 #
-PYMALCOLM = /dls_sw/prod/common/python/RHEL6-x86_64/pymalcolm/3-2
+PYMALCOLM = /dls_sw/prod/common/python/RHEL7-x86_64/pymalcolm/4-0b1
 
 # A checked out version of
 # https://github.com/dls-controls/malcolmjs

Makefile

@@ -31,6 +31,9 @@ WEB_ADMIN = $(PANDA_ROOTFS)/rootfs/web-admin
 # A tag for our zpkg suffix
 export GIT_VERSION := $(shell git describe --abbrev=7 --dirty --always --tags)
 
+# The zpkg file that will be built
+WEBSERVER_ZPKG = $(BUILD_DIR)/panda-webcontrol@$(GIT_VERSION).zpg
+
 # The .py files we depend on to build our cut down distribution
 MALCOLM_SOURCES := $(shell find $(PYMALCOLM)/malcolm -name \*.py)
 ANNOTYPES_SOURCES := $(shell find $(ANNOTYPES)/annotypes -name \*.py)
@@ -84,13 +87,15 @@ $(TEMPLATES): $(MALCOLM_BUILD) $(ANNOTYPES_BUILD) $(MALCOLMJS_BUILD)
 	cp $(PYMALCOLM)/malcolm/modules/web/www/index.html $@/withoutnav.html
 	./add_nav.sh $@/withoutnav.html > $@/index.html
 
-zpkg: $(SOURCES) $(TEMPLATES)
+$(WEBSERVER_ZPKG): $(SOURCES) $(TEMPLATES)
 	rm -f $(BUILD_DIR)/*.zpg
 	$(MAKE_ZPKG) -t $(TOP) -b $(BUILD_DIR) -d $(BUILD_DIR) \
 		$(TOP)/etc/panda-webcontrol.list $(GIT_VERSION)
 	$(MAKE_ZPKG) -t $(TOP) -b $(BUILD_DIR) -d $(BUILD_DIR) \
 		$(TOP)/etc/panda-webcontrol-no-subnet-validation.list $(GIT_VERSION)
 
+zpkg: $(WEBSERVER_ZPKG)
+
 # Push a github release
 github-release: $(BUILD_DIR)/*.zpg
 	$(MAKE_GITHUB_RELEASE) PandABlocks-webcontrol $(GIT_VERSION) $^

src/panda-webcontrol.py

@@ -114,10 +114,10 @@ class TemplatedGuiPart(web.parts.GuiServerPart):
 process.add_controller(controller)
 
 # Add the PandABox
-controller = pandablocks.controllers.PandABlocksManagerController(
+controller = pandablocks.controllers.PandAManagerController(
     config_dir=args.configdir, hostname=args.hostname,
     port=args.port, mri=args.mri, use_git=False,
-    doc_url_base="/fpga_docs/", poll_period=0.25)
+    doc_url_base="/fpga_docs/", poll_period=0.1)
 process.add_controller(controller)
 
 # Start the server