aboutsummaryrefslogtreecommitdiff
path: root/spaghetti-monster
diff options
context:
space:
mode:
authorSelene ToyKeeper2020-07-22 15:43:53 -0600
committerSelene ToyKeeper2020-07-22 15:43:53 -0600
commit2dec055dc5303ec8f66b4adbac366454c2147920 (patch)
tree5f29b993ffa69b5cdd146c61af5ca1fd52d427ec /spaghetti-monster
parentrenamed cfg-default.h to config-default.h, cleaned up some comments, organize... (diff)
downloadanduril-2dec055dc5303ec8f66b4adbac366454c2147920.tar.gz
anduril-2dec055dc5303ec8f66b4adbac366454c2147920.tar.bz2
anduril-2dec055dc5303ec8f66b4adbac366454c2147920.zip
renamed beacon.* -> beacon-mode.*
Diffstat (limited to 'spaghetti-monster')
-rw-r--r--spaghetti-monster/anduril/anduril.c4
-rw-r--r--spaghetti-monster/anduril/beacon-mode.c (renamed from spaghetti-monster/anduril/beacon.c)8
-rw-r--r--spaghetti-monster/anduril/beacon-mode.h (renamed from spaghetti-monster/anduril/beacon.h)8
3 files changed, 10 insertions, 10 deletions
diff --git a/spaghetti-monster/anduril/anduril.c b/spaghetti-monster/anduril/anduril.c
index e568b5e..11bfa4a 100644
--- a/spaghetti-monster/anduril/anduril.c
+++ b/spaghetti-monster/anduril/anduril.c
@@ -107,7 +107,7 @@
#endif
#ifdef USE_BEACON_MODE
-#include "beacon.h"
+#include "beacon-mode.h"
#endif
#ifdef USE_THERMAL_REGULATION
@@ -223,7 +223,7 @@ uint8_t rgb_led_lockout_mode = RGB_LED_LOCKOUT_DEFAULT;
#endif
#ifdef USE_BEACON_MODE
-#include "beacon.c"
+#include "beacon-mode.c"
#endif
#ifdef USE_THERMAL_REGULATION
diff --git a/spaghetti-monster/anduril/beacon.c b/spaghetti-monster/anduril/beacon-mode.c
index ac56632..28ff0bd 100644
--- a/spaghetti-monster/anduril/beacon.c
+++ b/spaghetti-monster/anduril/beacon-mode.c
@@ -1,5 +1,5 @@
/*
- * beacon.c: Beacon mode for Anduril.
+ * beacon-mode.c: Beacon 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 BEACON_C
-#define BEACON_C
+#ifndef BEACON_MODE_C
+#define BEACON_MODE_C
-#include "beacon.h"
+#include "beacon-mode.h"
inline void beacon_mode_iter() {
// one iteration of main loop()
diff --git a/spaghetti-monster/anduril/beacon.h b/spaghetti-monster/anduril/beacon-mode.h
index ba885c7..752918e 100644
--- a/spaghetti-monster/anduril/beacon.h
+++ b/spaghetti-monster/anduril/beacon-mode.h
@@ -1,5 +1,5 @@
/*
- * beacon.h: Beacon mode for Anduril.
+ * beacon-mode.h: Beacon mode for Anduril.
*
* Copyright (C) 2017 Selene ToyKeeper
*
@@ -17,11 +17,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef BEACON_H
-#define BEACON_H
+#ifndef BEACON_MODE_H
+#define BEACON_MODE_H
// beacon timing
-volatile uint8_t beacon_seconds = 2;
+uint8_t beacon_seconds = 2;
// beacon mode
uint8_t beacon_state(Event event, uint16_t arg);