Merge branch 'master' of https://github.com/profezzorn/ProffieOS

profezzorn · Dec 30, 2024 · 1c0cf8e · 1c0cf8e
2 parents ec9a9f5 + ed595f7
commit 1c0cf8e
Show file tree

Hide file tree

Showing 4 changed files with 2,384 additions and 887 deletions.
diff --git a/common/saber_base.h b/common/saber_base.h
@@ -129,7 +129,7 @@ const char* EffectTypeName(EffectType effect) {
   switch (effect) {
     DEFINE_ALL_EFFECTS();
   }
-  return "unknown effeect";
+  return "unknown effect";
 }
 #undef DEFINE_EFFECT
 

diff --git a/display/spidisplay.h b/display/spidisplay.h
@@ -1,7 +1,7 @@
 #ifndef DISPLAY_SPIDISPLAY_H
 #define DISPLAY_SPIDISPLAY_H
 
-// Unfortunately, including SPI.h uses 3k even if if it's never actually used on Proffieboards.
+// Unfortunately, including SPI.h uses 3k even if it's never actually used on Proffieboards.
 #include <SPI.h>
 
 constexpr uint8_t encode_sleep_time(int millis) {

diff --git a/display/ssd1306.h b/display/ssd1306.h
@@ -67,7 +67,7 @@ struct BlasterDisplayConfigFile : public ConfigFile {
   float ProffieOSEmptyImageDuration;
   // for OLED displays, the time a jam.bmp will play
   float ProffieOSJamImageDuration;
-  // for OLED displays, the time a clipiin.bmp will play
+  // for OLED displays, the time a clipin.bmp will play
   float ProffieOSClipinImageDuration;
   // for OLED displays, the time a clipout.bmp will play
   float ProffieOSClipoutImageDuration;