From a27f183cf48a61344219b7074330742e30369f78 Mon Sep 17 00:00:00 2001
From: Zachary Lentz <zlentz@slac.stanford.edu>
Date: Fri, 6 Dec 2024 17:17:29 -0800
Subject: [PATCH 1/2] FIX: override velocity_base in MMC100, it doesn't have
 one

---
 pcdsdevices/epics_motor.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pcdsdevices/epics_motor.py b/pcdsdevices/epics_motor.py
index b43937ce17e..1257c526019 100644
--- a/pcdsdevices/epics_motor.py
+++ b/pcdsdevices/epics_motor.py
@@ -1235,6 +1235,8 @@ class MMC100(PCDSMotorBase):
     home_forward = Cpt(EpicsSignal, '.MLP', kind='omitted')
     home_reverse = Cpt(EpicsSignal, '.MLN', kind='omitted')
 
+    velocity_base = Cpt(Signal, kind='omitted')
+
 
 class BeckhoffAxisPLC(Device):
     """

From b4163e0b5da803b218a898dc9d8f830106a9f9be Mon Sep 17 00:00:00 2001
From: Zachary Lentz <zlentz@slac.stanford.edu>
Date: Wed, 11 Dec 2024 10:16:54 -0800
Subject: [PATCH 2/2] DOC: add pre-release notes for 1312

---
 .../1312-fix_mmc100_sig.rst                   | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 docs/source/upcoming_release_notes/1312-fix_mmc100_sig.rst

diff --git a/docs/source/upcoming_release_notes/1312-fix_mmc100_sig.rst b/docs/source/upcoming_release_notes/1312-fix_mmc100_sig.rst
new file mode 100644
index 00000000000..071af16444f
--- /dev/null
+++ b/docs/source/upcoming_release_notes/1312-fix_mmc100_sig.rst
@@ -0,0 +1,34 @@
+1312 fix_mmc100_sig
+###################
+
+API Breaks
+----------
+- N/A
+
+Library Features
+----------------
+- N/A
+
+Device Features
+---------------
+- N/A
+
+New Devices
+-----------
+- N/A
+
+Bugfixes
+--------
+- Replace the ``velocity_base`` (``.VBAS``) signal in the `MMC100` class
+  with a base `Signal` to avoid a PV disconnected error
+  that was preventing moves.
+  The `MMC100` record does not have this field.
+  With this fix, `MMC100` devices can move again.
+
+Maintenance
+-----------
+- N/A
+
+Contributors
+------------
+- zllentz