diff --git a/Makefile b/Makefile
index c60550d..ce09ab3 100644
--- a/Makefile
+++ b/Makefile
@@ -29,8 +29,8 @@ TEMPLATES += db/masterMacs.db
 DBDS += sinqMotor/src/sinqMotor.dbd
 DBDS += src/masterMacs.dbd
 
-USR_CFLAGS += -Wall -Wextra -Weffc++ -Wunused-result -Wextra -Werror
+USR_CFLAGS += -Wall -Wextra -Wunused-result -Wextra -Werror
 
 # These flags define the expected firmware version. See README.md, section
 # "Firmware version checking" for details.
-USR_CXXFLAGS += -DFIRMWARE_MAJOR_VERSION=2 -DFIRMWARE_MINOR_VERSION=2
+USR_CXXFLAGS += -DFIRMWARE_MAJOR_VERSION=2 -DFIRMWARE_MINOR_VERSION=2 -Wall -Wextra -Weffc++ -Wunused-result -Wextra -Werror
diff --git a/sinqMotor b/sinqMotor
index 7a0de4e..3ab40a8 160000
--- a/sinqMotor
+++ b/sinqMotor
@@ -1 +1 @@
-Subproject commit 7a0de4e9d95423907f9ff8e5dc0a2c661e68f557
+Subproject commit 3ab40a8bf5bfd80c7e675333b662a8c7a850316c