silence warnings around morsecalc

4 files changed, 28 insertions, 56 deletions

diff --git a/movement/lib/morsecalc/morsecode.c b/movement/lib/morsecalc/morsecode.c
deleted file mode 100644
index 6b85e82c..00000000
--- a/movement/lib/morsecalc/morsecode.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2023 Christian Chapman
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
- 
-#ifndef MORSECODE_
-#define MORSECODE_ 
-
-/*
- * MC International Morse Code binary tree
- * Levels of the tree are concatenated.
- * '.' = 0 and '-' = 1. 
- *
- * Capitals denote special characters:
- * C = Ch digraph
- * V = VERIFY (ITU-R "UNDERSTOOD")
- * R = REPEAT
- * W = WAIT
- * S = START TRANSMISSION
- * E = END OF WORK
- */
-static const char MORSECODE_TREE[] = " etianmsurwdkgohvf\0l\0pjbxcyzq\0C\x35\x34V\x33\0R\0\x32W\0+\0\0\0\0\x31\x36=/\0\0S(\0\x37\0\0\0\x38\0\x39\x30\0\0\0\0\0E\0\0\0\0\0\0?_\0\0\0\0\"\0\0.\0\0\0\0@\0\0\0'\0\0-\0\0\0\0\0\0\0\0;!\0)\0\0\0\0\0,\0\0\0\0:\0\0\0\0\0\0";
-
-/* mc_input Read an input into a morse code buffer 
- * Input: mc = index of MORSECODE_TREE[]
- *        len = max morse code char length
- *        in = character to read into buffer (0='.', 1='-', ignored otherwise).
- * If the buffer is full, reset it instead of entering the new character.
- */
-static void morsecode_input(unsigned int *mc, unsigned int len, char in) {
-    if(*mc >= (unsigned int) ((1<<len)-1)) *mc = 0;
-    else if((in == 0) | (in == 1)) *mc = (*mc)*2+in+1;
-    return;
-}
-#endif
diff --git a/movement/make/Makefile b/movement/make/Makefile
index 50ba05cf..2d6584fd 100644
--- a/movement/make/Makefile
+++ b/movement/make/Makefile
@@ -41,7 +41,6 @@ SRCS += \
   ../lib/sunriset/sunriset.c \
   ../lib/vsop87/vsop87a_milli.c \
   ../lib/astrolib/astrolib.c \
-  ../lib/morsecalc/morsecode.c \
   ../lib/morsecalc/calc.c \
   ../lib/morsecalc/calc_fns.c \
   ../lib/morsecalc/calc_strtof.c \
diff --git a/movement/watch_faces/complication/morsecalc_face.c b/movement/watch_faces/complication/morsecalc_face.c
index cb9367bb..ca03a1a9 100644
--- a/movement/watch_faces/complication/morsecalc_face.c
+++ b/movement/watch_faces/complication/morsecalc_face.c
@@ -116,6 +116,19 @@ To see all the calculator operations and their token aliases, see the `calc_dict
 #include "morsecalc_face.h"
 #include "morsecalc_display.h"
 
+/* mc_input Read an input into a morse code buffer 
+ * Input: mc = index of MORSECODE_TREE[]
+ *        len = max morse code char length
+ *        in = character to read into buffer (0='.', 1='-', ignored otherwise).
+ * If the buffer is full, reset it instead of entering the new character.
+ */
+static void morsecode_input(unsigned int *mc, unsigned int len, char in) {
+    if(*mc >= (unsigned int) ((1<<len)-1)) *mc = 0;
+    else if((in == 0) | (in == 1)) *mc = (*mc)*2+in+1;
+    return;
+}
+
+
 // Clear token buffer
 void morsecalc_reset_token(morsecalc_state_t *mcs) { 
     memset(mcs->token, '\0', MORSECALC_TOKEN_LEN*sizeof(mcs->token[0]));
diff --git a/movement/watch_faces/complication/morsecalc_face.h b/movement/watch_faces/complication/morsecalc_face.h
index 2bab5959..2ee18622 100644
--- a/movement/watch_faces/complication/morsecalc_face.h
+++ b/movement/watch_faces/complication/morsecalc_face.h
@@ -30,7 +30,21 @@
 
 #include "movement.h"
 #include "calc.h"
-#include "morsecode.c"
+
+/*
+ * MC International Morse Code binary tree
+ * Levels of the tree are concatenated.
+ * '.' = 0 and '-' = 1. 
+ *
+ * Capitals denote special characters:
+ * C = Ch digraph
+ * V = VERIFY (ITU-R "UNDERSTOOD")
+ * R = REPEAT
+ * W = WAIT
+ * S = START TRANSMISSION
+ * E = END OF WORK
+ */
+static const char MORSECODE_TREE[] = " etianmsurwdkgohvf\0l\0pjbxcyzq\0C\x35\x34V\x33\0R\0\x32W\0+\0\0\0\0\x31\x36=/\0\0S(\0\x37\0\0\0\x38\0\x39\x30\0\0\0\0\0E\0\0\0\0\0\0?_\0\0\0\0\"\0\0.\0\0\0\0@\0\0\0'\0\0-\0\0\0\0\0\0\0\0;!\0)\0\0\0\0\0,\0\0\0\0:\0\0\0\0\0\0";
 
 void morsecalc_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr);
 void morsecalc_face_activate(movement_settings_t *settings, void *context);