diff --git a/uCNC/src/module.h b/uCNC/src/module.h
index c48f1bcf..8535a0d4 100644
--- a/uCNC/src/module.h
+++ b/uCNC/src/module.h
@@ -37,7 +37,8 @@ extern "C"
 #define LISTENER_NO_LOCK 0x00
 #define LISTENER_RUNNING_LOCK 0x01
 #define LISTENER_HWSPI_LOCK 0x02 // prevent multiple accesses to HWSPI by different modules
-#define LISTENER_HWI2C_LOCK 0x04 // for future use
+#define LISTENER_HWSPI2_LOCK 0x04 // prevent multiple accesses to HWSPI by different modules
+#define LISTENER_HWI2C_LOCK 0x08 // for future use
 #define LISTENER_SWSPI_LOCK 0x20 // prevent multiple accesses to any software emulated SPI by different modules
 #define LISTENER_SWI2C_LOCK 0x40 // prevent multiple accesses to any software emulated I2C by different modules
 	// other locks might be added latter
diff --git a/uCNC/src/modules/ic74hc595.h b/uCNC/src/modules/ic74hc595.h
index 5ed63c39..48e27ad4 100644
--- a/uCNC/src/modules/ic74hc595.h
+++ b/uCNC/src/modules/ic74hc595.h
@@ -1678,7 +1678,7 @@ extern "C"
 #undef DIO79
 #endif
 #define DOUT32 79
-#define DOUT32 -79
+#define DIO79 -79
 #define DOUT32_IO_BYTEOFFSET (DOUT32_IO_OFFSET >> 3)
 #define DOUT32_IO_BITMASK (1 << (DOUT32_IO_OFFSET & 0x7))
 #define DIO79_IO_BYTEOFFSET DOUT32_IO_BYTEOFFSET
@@ -1699,7 +1699,7 @@ extern "C"
 #undef DIO80
 #endif
 #define DOUT33 80
-#define DOUT33 -80
+#define DIO80 -80
 #define DOUT33_IO_BYTEOFFSET (DOUT33_IO_OFFSET >> 3)
 #define DOUT33_IO_BITMASK (1 << (DOUT33_IO_OFFSET & 0x7))
 #define DIO80_IO_BYTEOFFSET DOUT33_IO_BYTEOFFSET
@@ -1720,7 +1720,7 @@ extern "C"
 #undef DIO81
 #endif
 #define DOUT34 81
-#define DOUT34 -81
+#define DIO81 -81
 #define DOUT34_IO_BYTEOFFSET (DOUT34_IO_OFFSET >> 3)
 #define DOUT34_IO_BITMASK (1 << (DOUT34_IO_OFFSET & 0x7))
 #define DIO81_IO_BYTEOFFSET DOUT34_IO_BYTEOFFSET
@@ -1741,7 +1741,7 @@ extern "C"
 #undef DIO82
 #endif
 #define DOUT35 82
-#define DOUT35 -82
+#define DIO82 -82
 #define DOUT35_IO_BYTEOFFSET (DOUT35_IO_OFFSET >> 3)
 #define DOUT35_IO_BITMASK (1 << (DOUT35_IO_OFFSET & 0x7))
 #define DIO82_IO_BYTEOFFSET DOUT35_IO_BYTEOFFSET
@@ -1762,7 +1762,7 @@ extern "C"
 #undef DIO83
 #endif
 #define DOUT36 83
-#define DOUT36 -83
+#define DIO83 -83
 #define DOUT36_IO_BYTEOFFSET (DOUT36_IO_OFFSET >> 3)
 #define DOUT36_IO_BITMASK (1 << (DOUT36_IO_OFFSET & 0x7))
 #define DIO83_IO_BYTEOFFSET DOUT36_IO_BYTEOFFSET
@@ -1783,7 +1783,7 @@ extern "C"
 #undef DIO84
 #endif
 #define DOUT37 84
-#define DOUT37 -84
+#define DIO84 -84
 #define DOUT37_IO_BYTEOFFSET (DOUT37_IO_OFFSET >> 3)
 #define DOUT37_IO_BITMASK (1 << (DOUT37_IO_OFFSET & 0x7))
 #define DIO84_IO_BYTEOFFSET DOUT37_IO_BYTEOFFSET
@@ -1804,7 +1804,7 @@ extern "C"
 #undef DIO85
 #endif
 #define DOUT38 85
-#define DOUT38 -85
+#define DIO85 -85
 #define DOUT38_IO_BYTEOFFSET (DOUT38_IO_OFFSET >> 3)
 #define DOUT38_IO_BITMASK (1 << (DOUT38_IO_OFFSET & 0x7))
 #define DIO85_IO_BYTEOFFSET DOUT38_IO_BYTEOFFSET
@@ -1825,7 +1825,7 @@ extern "C"
 #undef DIO86
 #endif
 #define DOUT39 86
-#define DOUT39 -86
+#define DIO86 -86
 #define DOUT39_IO_BYTEOFFSET (DOUT39_IO_OFFSET >> 3)
 #define DOUT39_IO_BITMASK (1 << (DOUT39_IO_OFFSET & 0x7))
 #define DIO86_IO_BYTEOFFSET DOUT39_IO_BYTEOFFSET
@@ -1846,7 +1846,7 @@ extern "C"
 #undef DIO87
 #endif
 #define DOUT40 87
-#define DOUT40 -87
+#define DIO87 -87
 #define DOUT40_IO_BYTEOFFSET (DOUT40_IO_OFFSET >> 3)
 #define DOUT40_IO_BITMASK (1 << (DOUT40_IO_OFFSET & 0x7))
 #define DIO87_IO_BYTEOFFSET DOUT40_IO_BYTEOFFSET
@@ -1867,7 +1867,7 @@ extern "C"
 #undef DIO88
 #endif
 #define DOUT41 88
-#define DOUT41 -88
+#define DIO88 -88
 #define DOUT41_IO_BYTEOFFSET (DOUT41_IO_OFFSET >> 3)
 #define DOUT41_IO_BITMASK (1 << (DOUT41_IO_OFFSET & 0x7))
 #define DIO88_IO_BYTEOFFSET DOUT41_IO_BYTEOFFSET
@@ -1888,7 +1888,7 @@ extern "C"
 #undef DIO89
 #endif
 #define DOUT42 89
-#define DOUT42 -89
+#define DIO89 -89
 #define DOUT42_IO_BYTEOFFSET (DOUT42_IO_OFFSET >> 3)
 #define DOUT42_IO_BITMASK (1 << (DOUT42_IO_OFFSET & 0x7))
 #define DIO89_IO_BYTEOFFSET DOUT42_IO_BYTEOFFSET
@@ -1909,7 +1909,7 @@ extern "C"
 #undef DIO90
 #endif
 #define DOUT43 90
-#define DOUT43 -90
+#define DIO90 -90
 #define DOUT43_IO_BYTEOFFSET (DOUT43_IO_OFFSET >> 3)
 #define DOUT43_IO_BITMASK (1 << (DOUT43_IO_OFFSET & 0x7))
 #define DIO90_IO_BYTEOFFSET DOUT43_IO_BYTEOFFSET
@@ -1930,7 +1930,7 @@ extern "C"
 #undef DIO91
 #endif
 #define DOUT44 91
-#define DOUT44 -91
+#define DIO91 -91
 #define DOUT44_IO_BYTEOFFSET (DOUT44_IO_OFFSET >> 3)
 #define DOUT44_IO_BITMASK (1 << (DOUT44_IO_OFFSET & 0x7))
 #define DIO91_IO_BYTEOFFSET DOUT44_IO_BYTEOFFSET
@@ -1951,7 +1951,7 @@ extern "C"
 #undef DIO92
 #endif
 #define DOUT45 92
-#define DOUT45 -92
+#define DIO92 -92
 #define DOUT45_IO_BYTEOFFSET (DOUT45_IO_OFFSET >> 3)
 #define DOUT45_IO_BITMASK (1 << (DOUT45_IO_OFFSET & 0x7))
 #define DIO92_IO_BYTEOFFSET DOUT45_IO_BYTEOFFSET
@@ -1972,7 +1972,7 @@ extern "C"
 #undef DIO93
 #endif
 #define DOUT46 93
-#define DOUT46 -93
+#define DIO93 -93
 #define DOUT46_IO_BYTEOFFSET (DOUT46_IO_OFFSET >> 3)
 #define DOUT46_IO_BITMASK (1 << (DOUT46_IO_OFFSET & 0x7))
 #define DIO93_IO_BYTEOFFSET DOUT46_IO_BYTEOFFSET
@@ -1993,7 +1993,7 @@ extern "C"
 #undef DIO94
 #endif
 #define DOUT47 94
-#define DOUT47 -94
+#define DIO94 -94
 #define DOUT47_IO_BYTEOFFSET (DOUT47_IO_OFFSET >> 3)
 #define DOUT47_IO_BITMASK (1 << (DOUT47_IO_OFFSET & 0x7))
 #define DIO94_IO_BYTEOFFSET DOUT47_IO_BYTEOFFSET
@@ -2014,7 +2014,7 @@ extern "C"
 #undef DIO95
 #endif
 #define DOUT48 95
-#define DOUT48 -95
+#define DIO95 -95
 #define DOUT48_IO_BYTEOFFSET (DOUT48_IO_OFFSET >> 3)
 #define DOUT48_IO_BITMASK (1 << (DOUT48_IO_OFFSET & 0x7))
 #define DIO95_IO_BYTEOFFSET DOUT48_IO_BYTEOFFSET
@@ -2035,7 +2035,7 @@ extern "C"
 #undef DIO96
 #endif
 #define DOUT49 96
-#define DOUT49 -96
+#define DIO96 -96
 #define DOUT49_IO_BYTEOFFSET (DOUT49_IO_OFFSET >> 3)
 #define DOUT49_IO_BITMASK (1 << (DOUT49_IO_OFFSET & 0x7))
 #define DIO96_IO_BYTEOFFSET DOUT49_IO_BYTEOFFSET