Cosmetic (#851)

Author: olivierflying747-8

common/battery_monitor.h

@@ -69,9 +69,9 @@ BatteryMonitor() : reader_(batteryLevelPin,
       last_voltage_read_time_ = now;
       last_voltage_ = last_voltage_ * mul + v * (1 - mul);
       if (IsLow()) {
-	low_count_++;
+        low_count_++;
       } else {
-	low_count_ = 0;
+        low_count_ = 0;
       }
     }
     STATE_MACHINE_END();
@@ -83,7 +83,7 @@ BatteryMonitor() : reader_(batteryLevelPin,
 #endif
     // Battery isn't low if it's not connected at all.
     if (battery() < 0.5) return false;
-    
+
     return battery() < (loaded_ ? 2.6 : 3.0);
   }
 
@@ -159,4 +159,4 @@ class BatteryMonitor {
 
 BatteryMonitor battery_monitor;
 
-#endif
+#endif  // COMMON_BATTERY_MONITOR_H

common/errors.h

@@ -52,13 +52,13 @@ void ProffieOSErrors::font_directory_not_found() {
   talkie.Say(talkie_not_found_15, 15);
   DodgeSound(2000);
 #else
-  beeper.Beep(0.5, 261.63 * 2);   // C5 - Font
+  beeper.Beep(0.5,   261.63 * 2); // C5 - Font
   beeper.Beep(0.5/3, 246.94 * 2); // B4 - di
   beeper.Beep(0.5/3, 220.00 * 2); // A4 - rec
   beeper.Beep(0.5/3, 196.00 * 2); // G4 - tor
-  beeper.Beep(0.5, 174.61 * 2);   // F4 - y
-  beeper.Beep(0.5, 146.83 * 2);   // D4 - not
-  beeper.Beep(0.5, 130.81 * 2);   // C4 - found
+  beeper.Beep(0.5,   174.61 * 2); // F4 - y
+  beeper.Beep(0.5,   146.83 * 2); // D4 - not
+  beeper.Beep(0.5,   130.81 * 2); // C4 - found
   DodgeSound(2530);
 #endif
 #endif
@@ -99,10 +99,10 @@ void ProffieOSErrors::error_in_blade_array() {
   beeper.Beep(0.25, 196.00 * 2); // G4 - or
   beeper.Beep(0.25, 174.61 * 2); // F4 - in
   beeper.Beep(0.25, 164.81 * 2); // E4 - the
-  beeper.Beep(0.3, 146.83 * 2);  // D4 - blade
-  beeper.Beep(0.2, 0);           // Silence
-  beeper.Beep(0.5, 146.83 * 2);  // D4 - ar
-  beeper.Beep(1.0, 130.81 * 2);  // C4 - ray
+  beeper.Beep(0.3,  146.83 * 2); // D4 - blade
+  beeper.Beep(0.2,  0);          // Silence
+  beeper.Beep(0.5,  146.83 * 2); // D4 - ar
+  beeper.Beep(1.0,  130.81 * 2); // C4 - ray
   DodgeSound(3000);
 #endif
 #endif

common/saber_base.h

@@ -12,7 +12,6 @@
 class SaberBase;
 extern SaberBase* saberbases;
 
-
 // An effect is a one-shot trigger for something
 // Effects may have a location, but do not generally have a "duration".
 // However, durations may be derived from blade styles or sound effect durations
@@ -34,7 +33,7 @@ extern SaberBase* saberbases;
     DEFINE_EFFECT(IGNITION)                     \
     DEFINE_EFFECT(RETRACTION)                   \
     DEFINE_EFFECT(CHANGE)                       \
-    /* just for resetting things, not meant for triggering effects, use NEWFONT/BLADEIN/BLADEOUT instead */ \
+    /* just for resetting things, not meant for triggering effects, use NEWFONT/BLADEIN/BLADEOUT instead */        \
     DEFINE_EFFECT(CHDIR)                        \
     DEFINE_EFFECT(NEWFONT)                      \
     DEFINE_EFFECT(BLADEIN)                      \
@@ -46,13 +45,13 @@ extern SaberBase* saberbases;
     DEFINE_EFFECT(ACCENT_SWING)                 \
     DEFINE_EFFECT(ACCENT_SLASH)                 \
     DEFINE_EFFECT(SPIN)                         \
-    /* Allows style to turn blade ON for interactive effects if prop/style support, FAST_ON skips PREON. */         \
+    /* Allows style to turn blade ON for interactive effects if prop/style support, FAST_ON skips PREON. */        \
     DEFINE_EFFECT(ON)                           \
     DEFINE_EFFECT(FAST_ON)                      \
     DEFINE_EFFECT(QUOTE)                        \
     DEFINE_EFFECT(SECONDARY_IGNITION)           \
     DEFINE_EFFECT(SECONDARY_RETRACTION)         \
-    /* Allows style to turn blade OFF for interactive effects if prop/style support, FAST_OFF skips POSTOFF. */     \
+    /* Allows style to turn blade OFF for interactive effects if prop/style support, FAST_OFF skips POSTOFF. */    \
     DEFINE_EFFECT(OFF)                          \
     DEFINE_EFFECT(FAST_OFF)                     \
     DEFINE_EFFECT(OFF_CLASH)                    \
@@ -172,18 +171,23 @@ class BladeSet {
   constexpr BladeSet operator|(const BladeSet& other) const {
     return BladeSet(blades_ | other.blades_);
   }
+
   constexpr BladeSet operator&(const BladeSet& other) const {
     return BladeSet(blades_ & other.blades_);
   }
+
   constexpr BladeSet operator~() const {
     return BladeSet(~blades_);
   }
+
   constexpr bool operator[](int blade) const {
     return (blades_ & (1 << blade)) != 0;
   }
+
   constexpr bool off() const {
     return blades_ == 0;
   }
+
   // Should this be if "other" is on, or if anything is on?
   // Right now it's if anything is on.
   constexpr bool on() const {
@@ -196,6 +200,7 @@ class BladeSet {
   void operator|=(const BladeSet& other) {
     blades_ |= other.blades_;
   }
+
   void operator&=(const BladeSet& other) {
     blades_ &= other.blades_;
   }
@@ -229,9 +234,11 @@ class EffectLocation {
   static EffectLocation rnd() {
     return EffectLocation(65535 + random(22937), BladeSet::all());
   }
+
   static EffectLocation rnd(BladeSet blades) {
     return EffectLocation(65535 + random(22937), blades);
   }
+
   BladeSet blades() const { return blades_; }
   bool on_blade(int bladenum) const { return blades_[bladenum]; }
   uint16_t fixed() const { return location_; }
@@ -241,6 +248,7 @@ class EffectLocation {
     p.write('@');
     blades_.printTo(p);
   }
+
 private:
   friend class SaberBase;
   uint16_t location_;
@@ -256,7 +264,6 @@ struct BladeEffect {
   int wavnum;
 };
 
-
 extern int GetBladeNumber(BladeBase *blade);
 
 class SaberBase {
@@ -269,6 +276,7 @@ class SaberBase {
     interrupts();
     CHECK_LL(SaberBase, saberbases, next_saber_);
   }
+
   void Unlink(const SaberBase* x) {
     CHECK_LL(SaberBase, saberbases, next_saber_);
     for (SaberBase** i = &saberbases; *i; i = &(*i)->next_saber_) {
@@ -299,12 +307,14 @@ class SaberBase {
     // Right now it's if anything is on.
     return on_.on();
   }
+
   static bool BladeIsOn(int blade) { return on_[blade]; }
   static BladeSet OnBlades() { return on_; }
   static void TurnOn() {
     on_ = EffectLocation::ALL_BLADES;
     SaberBase::DoOn(0);
   }
+
   static void TurnOn(EffectLocation location) {
     PVLOG_DEBUG << "TurnOn " << location << "\n";
     // You can't turn on a blade that's already on.
@@ -315,11 +325,13 @@ class SaberBase {
     on_ |= location.blades();
     SaberBase::DoOn(location);
   }
+
   static void TurnOff(OffType off_type) {
     on_ = BladeSet();
     last_motion_request_ = millis();
     SaberBase::DoOff(off_type, 0);
   }
+
   static void TurnOff(OffType off_type, EffectLocation location) {
     PVLOG_DEBUG << "TurnOff " << location << "\n";
     location.blades_ &= on_; // can only turn off blades which are on
@@ -338,6 +350,7 @@ class SaberBase {
     return IsOn() || (millis() - last_motion_request_) < 20000;
 #endif
   }
+
   static void RequestMotion() {
     last_motion_request_ = millis();
   }
@@ -357,13 +370,15 @@ class SaberBase {
     LOCKUP_MELT,             // For cutting through doors...
     LOCKUP_LIGHTNING_BLOCK,  // Lightning block lockup
   };
+
   static LockupType lockup_;
   static BladeSet lockup_blades_;
   static LockupType Lockup() { return lockup_; }
   static LockupType LockupForBlade(int blade) {
     if (!lockup_blades_[blade]) return LOCKUP_NONE;
     return lockup_;
   }
+
   static void SetLockup(LockupType lockup, BladeSet blades = BladeSet::all()) {
     lockup_ = lockup;
     lockup_blades_ = blades;
@@ -422,22 +437,24 @@ public:                                                         \
 
   SABERBASEFUNCTIONS();
 
-
 private:
   static void DoEffectInternal2(EffectType effect, EffectLocation location) {
     DoEffectInternal(effect, location);
     PushEffect(effect, location);
   }
+
 public:
   static void DoEffect(EffectType effect, EffectLocation location) {
     ClearSoundInfo();
     DoEffectInternal2(effect, location);
   }
+
   static void DoOn(EffectLocation location) {
     ClearSoundInfo();
     DoOnInternal(location);
     DoEffectInternal2(EFFECT_IGNITION, location);
   }
+
   static void DoOff(OffType off_type, EffectLocation location) {
     ClearSoundInfo();
     DoOffInternal(off_type, location);
@@ -454,8 +471,8 @@ public:                                                         \
         // do nothing
         break;
     }
-
   }
+
   static void DoBladeDetect(bool detected) {
     ClearSoundInfo();
     if (detected) {
@@ -464,14 +481,17 @@ public:                                                         \
       DoEffect(EFFECT_BLADEOUT, 0);
     }
   }
+
   static void DoChange(ChangeType change_type) {
     ClearSoundInfo();
     DoChangeInternal(change_type);
   }
+
   static void DoTop(uint64_t total_cycles) {
     ClearSoundInfo();
     DoTopInternal(total_cycles);
   }
+
   static void DoIsOn(bool* on) {
     ClearSoundInfo();
     DoIsOnInternal(on);
@@ -482,6 +502,7 @@ public:                                                         \
     sound_number = N;
     DoEffectInternal2(e, location);
   }
+
   static void DoEffectR(EffectType e) { DoEffect(e, EffectLocation::rnd()); }
   static void DoBlast() { DoEffectR(EFFECT_BLAST); }
   static void DoForce() { DoEffectR(EFFECT_FORCE); }
@@ -509,12 +530,15 @@ public:                                                         \
   void SetClashStrength(float strength) {
     clash_strength_ = strength;
   }
+
   static void DoClash() {
     DoEffectR(EFFECT_CLASH);
   }
+
   static void DoStab() {
     DoEffect(EFFECT_STAB, 1.0f);
   }
+
   static void UpdateClashStrength(float strength) {
     if (strength > clash_strength_) {
       clash_strength_ = strength;
@@ -535,6 +559,7 @@ public:                                                         \
     }
     CHECK_LL(SaberBase, saberbases, next_saber_);
   }
+
   virtual void SB_Motion(const Vec3& gyro, bool clear) {}
 
   /* Acceleration in g */
@@ -548,6 +573,7 @@ public:                                                         \
     }
     CHECK_LL(SaberBase, saberbases, next_saber_);
   }
+
   virtual void SB_Accel(const Vec3& gyro, bool clear) {}
 
   static uint32_t GetCurrentVariation() {
@@ -559,6 +585,7 @@ public:                                                         \
     current_variation_ += delta;
     DoChange(CHANGE_COLOR);
   }
+
   // For smooth updates or restore.
   static void SetVariation(uint32_t v) {
     current_variation_ = v;
@@ -597,7 +624,6 @@ public:                                                         \
     return num_effects_;
   }
 
-
   // Not private for debugging purposes only.
   static uint32_t last_motion_request_;
 
@@ -644,7 +670,6 @@ public:                                                         \
     num_effects_ = std::min(num_effects_ + 1, NELEM(effects_));
   }
 
-
   static size_t num_effects_;
   static BladeEffect effects_[10];
   static BladeSet on_;
@@ -663,4 +688,4 @@ constexpr BladeSet const EffectLocation::ALL_BLADES;
 constexpr BladeSet const EffectLocation::MOST_BLADES;
 ONCEPERBLADE(DECLARE_BLADE_BITS);
 
-#endif
+#endif  // COMMON_SABER_BASE_H

props/prop_base.h

@@ -387,10 +387,10 @@ class PropBase : CommandParser, protected Looper, protected SaberBase, public Mo
 #else
 #define WRAP_BLADE_SHORTERNER(N)
 #endif
-#define SET_BLADE_STYLE(N) do {                                         \
+#define SET_BLADE_STYLE(N) do {                                           \
       BladeStyle* tmp = style_parser.Parse(current_preset_.GetStyle(N));  \
-    WRAP_BLADE_SHORTERNER(N)                                            \
-    current_config->blade##N->SetStyle(tmp);                            \
+    WRAP_BLADE_SHORTERNER(N)                                              \
+    current_config->blade##N->SetStyle(tmp);                              \
   } while (0);
 
     ONCEPERBLADE(SET_BLADE_STYLE)
@@ -434,7 +434,7 @@ class PropBase : CommandParser, protected Looper, protected SaberBase, public Mo
     TRACE(PROP, "end");
   }
 
-    // Set/Update Font & Style, skips Preon effect using FastOn (for use in Edit Mode and "fast" preset changes)
+  // Set/Update Font & Style, skips Preon effect using FastOn (for use in Edit Mode and "fast" preset changes)
   void SetPresetFast(int preset_num) {
     PVLOG_DEBUG << "SetPresetFast(" << preset_num << ")\n";
     SetPreset(preset_num, false);

sound/effect.h

@@ -802,10 +802,10 @@ EFFECT(endauto); // Doesn't exist in fonts, but I expect there may be use for au
 EFFECT(blast); // Not to be confused with "blst" and "blaster" as blocking sounds in sabers
 
 // battery low
-EFFECT(lowbatt);	// battery low
+EFFECT(lowbatt);    // battery low
 
 // TODO: Optimize this and make it possible
-// have the WAV reader use this.
+// to have the WAV reader use this.
 class EffectFileReader : public FileReader {
 public:
   EffectFileReader() : FileReader(), do_open_(0) {}