Merge branch 'master' into pinecil

2020-11-01 14:16:00 +11:00
parent 7e4187e62d 0ffef8fd2d
commit 3aeab055bf
34 changed files with 1935 additions and 1297 deletions
--- a/workspace/TS100/configuration.h
+++ b/workspace/TS100/configuration.h
@@ -40,6 +40,16 @@
 */
 #define AUTO_START_MODE 0 // Default to none

+/**
+ * Locking Mode
+ * When in soldering mode a long press on both keys toggle the lock of the buttons
+ * Possible values are:
+ *  0 - Desactivated
+ *  1 - Lock except boost
+ *  2 - Full lock
+ */
+#define LOCKING_MODE           0         // Default to desactivated for safety
+
 /**
 * OLED Orientation
 *