renamed lockout.* -> lockout-mode.*, moved user-configurable lockout options to config-default.h

4 files changed, 15 insertions, 13 deletions

diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index 11bfa4a..d508b3b 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -115,7 +115,7 @@
 #endif
 
 #ifdef USE_LOCKOUT_MODE
-#include "lockout.h"
+#include "lockout-mode.h"
 #endif
 
 #ifdef USE_MOMENTARY_MODE
@@ -231,7 +231,7 @@ uint8_t rgb_led_lockout_mode = RGB_LED_LOCKOUT_DEFAULT;
 #endif
 
 #ifdef USE_LOCKOUT_MODE
-#include "lockout.c"
+#include "lockout-mode.c"
 #endif
 
 #ifdef USE_MOMENTARY_MODE
diff --git a/spaghetti-monster/anduril/config-default.h b/spaghetti-monster/anduril/config-default.h
index 3576566..f055425 100644
--- a/spaghetti-monster/anduril/config-default.h
+++ b/spaghetti-monster/anduril/config-default.h
@@ -26,6 +26,8 @@
  * These settings can be overridden per build target, in cfg-*.h files...
  * ... but most are not.  So changing one here will make it change in
  * almost every build target.
+ *
+ * Some configurable settings are also in other *.h files.
  */
 
 /********* User-configurable options *********/
@@ -111,6 +113,10 @@
 
 // enable a mode for locking the light for safe carry
 #define USE_LOCKOUT_MODE
+// should lockout mode function as a momentary moon mode?
+#define MOON_DURING_LOCKOUT_MODE
+// if enabled, 2nd lockout click goes to the other ramp's floor level
+#define LOCKOUT_MOON_FANCY
 
 // enable momentary mode
 #define USE_MOMENTARY_MODE
diff --git a/spaghetti-monster/anduril/lockout.c b/spaghetti-monster/anduril/lockout-mode.c
index 56b1051..14739fe 100644
--- a/spaghetti-monster/anduril/lockout.c
+++ b/spaghetti-monster/anduril/lockout-mode.c
@@ -1,5 +1,5 @@
 /*
- * lockout.c: Lockout mode for Anduril.
+ * lockout-mode.c: Lockout mode for Anduril.
  *
  * Copyright (C) 2017 Selene ToyKeeper
  *
@@ -17,10 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LOCKOUT_C
-#define LOCKOUT_C
+#ifndef LOCKOUT_MODE_C
+#define LOCKOUT_MODE_C
 
-#include "lockout.h"
+#include "lockout-mode.h"
 
 uint8_t lockout_state(Event event, uint16_t arg) {
     #ifdef MOON_DURING_LOCKOUT_MODE
diff --git a/spaghetti-monster/anduril/lockout.h b/spaghetti-monster/anduril/lockout-mode.h
index 4268595..c933b30 100644
--- a/spaghetti-monster/anduril/lockout.h
+++ b/spaghetti-monster/anduril/lockout-mode.h
@@ -1,5 +1,5 @@
 /*
- * lockout.h: Lockout mode for Anduril.
+ * lockout-mode.h: Lockout mode for Anduril.
  *
  * Copyright (C) 2017 Selene ToyKeeper
  *
@@ -17,13 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LOCKOUT_H
-#define LOCKOUT_H
+#ifndef LOCKOUT_MODE_H
+#define LOCKOUT_MODE_H
 
-// should lockout mode function as a momentary moon mode?
-#define MOON_DURING_LOCKOUT_MODE
-// if enabled, 2nd lockout click goes to the other ramp's floor level
-#define LOCKOUT_MOON_FANCY
 // soft lockout
 uint8_t lockout_state(Event event, uint16_t arg);