diff --git a/firmware/svnversion.h b/firmware/svnversion.h
index 3af1c38b1c..a76f31ca11 100644
--- a/firmware/svnversion.h
+++ b/firmware/svnversion.h
@@ -1,5 +1,5 @@
 // This file was generated by Version2Header
-// Sat Oct 13 15:00:07 EDT 2018
+// Fri Nov 02 13:17:56 EDT 2018
 #ifndef VCS_VERSION
-#define VCS_VERSION "15908"
+#define VCS_VERSION "15945"
 #endif
diff --git a/simulator/Makefile b/simulator/Makefile
index d78d3bdb02..6871725967 100644
--- a/simulator/Makefile
+++ b/simulator/Makefile
@@ -133,6 +133,8 @@ CPPSRC = $(UTILSRC_CPP) \
 	$(PROJECT_DIR)/development/sensor_chart.cpp \
 	$(PROJECT_DIR)/development/trigger_emulator.cpp \
 	$(PROJECT_DIR)/hw_layer/stepper.cpp \
+		  $(PROJECT_DIR)/hw_layer/HIP9011.cpp \
+		  $(PROJECT_DIR)/hw_layer/sensors/CJ125.cpp \
 	$(TRIGGER_SRC_CPP) \
 	$(TRIGGER_DECODERS_SRC_CPP) \
 	$(SYSTEMSRC_CPP) \
@@ -169,6 +171,7 @@ INCDIR = . \
           $(PROJECT_DIR)/controllers \
           $(PROJECT_DIR)/hw_layer \
           $(PROJECT_DIR)/hw_layer/algo \
+          $(PROJECT_DIR)/hw_layer/sensors/ \
           $(PROJECT_DIR)/development \
           $(PROJECT_DIR)/controllers/algo \
           $(PROJECT_DIR)/controllers/core \
diff --git a/simulator/simulator/boards.h b/simulator/simulator/boards.h
index 3db5e6faf7..dfdf4178a1 100644
--- a/simulator/simulator/boards.h
+++ b/simulator/simulator/boards.h
@@ -20,6 +20,25 @@
 #define EFI_CONSOLE_UART_DEVICE (&testStream)
 
 int getAdcValue(const char *msg, int channel);
+#define getSlowAdcCounter() 0
+#define waitForSlowAdc(x) {}
+
+
+// mock SPI
+#define SPIDriver void
+typedef uint16_t adcsample_t;
+#define spiStart(x, y) {}
+#define spiStop(x) {}
+#define spiSelect(x) {}
+#define spiSelectI(x) {}
+#define spiSend(x, y, z) {}
+#define spiReceive(x, y, z) {}
+#define spiExchange(x,y,w,z) {}
+#define spiExchangeI(x,y,w,z) {}
+#define spiStartExchangeI(x,y,w,z) {}
+#define spiUnselect(x) {}
+#define spiUnselectI(x) {}
+// end of mock SPI
 
 #ifdef __cplusplus
 extern "C"
diff --git a/simulator/simulator/efifeatures.h b/simulator/simulator/efifeatures.h
index 22fa99aec5..d67a55df27 100644
--- a/simulator/simulator/efifeatures.h
+++ b/simulator/simulator/efifeatures.h
@@ -61,8 +61,8 @@
 
 #define EFI_IDLE_INCREMENTAL_PID_CIC FALSE
 #define EFI_MAIN_RELAY_CONTROL FALSE
-#define EFI_HIP_9011 FALSE
-#define EFI_CJ125 FALSE
+#define EFI_HIP_9011 TRUE
+#define EFI_CJ125 TRUE
 #define EFI_CAN_SUPPORT FALSE
 #define EFI_ELECTRONIC_THROTTLE_BODY FALSE
 #define EFI_AUX_PID FALSE