Merge branch 'main' into releases/8.1.1

Author: craig8

examples/GridAPPS-D/requirements.txt

@@ -1,6 +1,6 @@
 git+https://github.com/GRIDAPPSD/gridappsd-python.git@develop
 stomp.py==6.0.0
-PyYAML==5.3
+PyYAML==5.4
 pytz==2019.3
 # psutil==5.4.7
 dateutils==0.6.7

examples/GridAPPS-DAgent/requirements.txt

@@ -1,6 +1,6 @@
 git+https://github.com/GRIDAPPSD/gridappsd-python.git@develop
 stomp.py==6.0.0
-PyYAML==5.3
+PyYAML==5.4
 pytz==2019.3
 # psutil==5.4.7
 dateutils==0.6.7

services/core/PlatformDriverAgent/platform_driver/interfaces/bacnet.py

@@ -176,6 +176,10 @@ def scrape_all(self):
                     self.max_per_request = max(int(self.register_count/self.register_count_divisor), 1)
                     _log.info("Device requires a lower max_per_request setting. Trying: "+str(self.max_per_request))
                     continue
+                elif e.message.endswith("rejected the request: 9") and self.use_read_multiple:
+                    _log.info("Device rejected request with 'unrecognized-service' error, attempting to access with use_read_multiple false")
+                    self.use_read_multiple = False
+                    continue
                 else:
                     raise
             except errors.Unreachable: