From ac5fb40730b388883ee395d01a81cffc3b9eb7e6 Mon Sep 17 00:00:00 2001 From: joeycastillo Date: Wed, 10 Jul 2024 06:49:56 -0400 Subject: [PATCH] remove dead code --- make.mk | 2 -- watch-library/shared/watch/watch_buzzer.h | 2 -- .../shared/watch/watch_private_buzzer.c | 36 ------------------- .../shared/watch/watch_private_buzzer.h | 2 -- 4 files changed, 42 deletions(-) delete mode 100644 watch-library/shared/watch/watch_private_buzzer.c diff --git a/make.mk b/make.mk index f4f796f72..055a4e9a5 100644 --- a/make.mk +++ b/make.mk @@ -166,7 +166,6 @@ SRCS += \ $(TOP)/watch-library/shared/driver/lis2dw.c \ $(TOP)/watch-library/shared/driver/opt3001.c \ $(TOP)/watch-library/shared/driver/spiflash.c \ - $(TOP)/watch-library/shared/watch/watch_private_buzzer.c \ $(TOP)/watch-library/shared/watch/watch_private_display.c \ $(TOP)/watch-library/shared/watch/watch_utility.c \ @@ -211,7 +210,6 @@ SRCS += \ $(TOP)/watch-library/simulator/watch/watch.c \ $(TOP)/watch-library/shared/driver/thermistor_driver.c \ $(TOP)/watch-library/shared/driver/opt3001.c \ - $(TOP)/watch-library/shared/watch/watch_private_buzzer.c \ $(TOP)/watch-library/shared/watch/watch_private_display.c \ $(TOP)/watch-library/shared/watch/watch_utility.c \ diff --git a/watch-library/shared/watch/watch_buzzer.h b/watch-library/shared/watch/watch_buzzer.h index 4c39475c2..7ba9a52ed 100644 --- a/watch-library/shared/watch/watch_buzzer.h +++ b/watch-library/shared/watch/watch_buzzer.h @@ -175,8 +175,6 @@ extern const uint16_t NotePeriods[108]; */ void watch_buzzer_play_sequence(int8_t *note_sequence, void (*callback_on_end)(void)); -uint16_t sequence_length(int8_t *sequence); - /** @brief Aborts a playing sequence. */ void watch_buzzer_abort_sequence(void); diff --git a/watch-library/shared/watch/watch_private_buzzer.c b/watch-library/shared/watch/watch_private_buzzer.c deleted file mode 100644 index dcdd27f81..000000000 --- a/watch-library/shared/watch/watch_private_buzzer.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2022 Joey Castillo - * - * 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. - */ -#include "driver_init.h" - -uint16_t sequence_length(int8_t *sequence); -uint16_t sequence_length(int8_t *sequence) { - uint16_t result = 0; - - while (*sequence != 0){ - result += *(sequence + 1); - sequence += 2; - } - - return result; -} diff --git a/watch-library/shared/watch/watch_private_buzzer.h b/watch-library/shared/watch/watch_private_buzzer.h index 3017bbb54..80d9e5985 100644 --- a/watch-library/shared/watch/watch_private_buzzer.h +++ b/watch-library/shared/watch/watch_private_buzzer.h @@ -28,6 +28,4 @@ // i.e. for a 440 Hz tone (A4 on the piano), 1MHz/440Hz = 2273 const uint16_t NotePeriods[108] = {18182,17161,16197,15288,14430,13620,12857,12134,11453,10811,10204,9631,9091,8581,8099,7645,7216,6811,6428,6068,5727,5405,5102,4816,4545,4290,4050,3822,3608,3405,3214,3034,2863,2703,2551,2408,2273,2145,2025,1911,1804,1703,1607,1517,1432,1351,1276,1204,1136,1073,1012,956,902,851,804,758,716,676,638,602,568,536,506,478,451,426,402,379,358,338,319,301,284,268,253,239,225,213,201,190,179,169,159,150,142,134,127}; -uint16_t sequence_length(int8_t *sequence); - #endif