Kaleidoscope Style Guide conformance

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>

README.md

@@ -37,24 +37,24 @@ static struct {
 } testSettings;
 
 void setup () {
-  Kaleidoscope.setup ();
+  Kaleidoscope.setup();
   
-  USE_PLUGINS (&EEPROMSettings);
+  USE_PLUGINS(&EEPROMSettings);
 
   /* Use other plugins that make use of the EEPROM */
   
-  settingsBase = EEPROMSettings.requestSlice (sizeof (testSettings));
+  settingsBase = EEPROMSettings.requestSlice(sizeof(testSettings));
   
-  EEPROMSettings.seal ();
+  EEPROMSettings.seal();
   
-  if (!EEPROMSettings.isValid ()) {
+  if (!EEPROMSettings.isValid()) {
     // Handle the case where the settings are out of sync...
     // Flash LEDs, for example.
     
     return;
   }
   
-  EEPROM.get (settingsBase, testSettings);
+  EEPROM.get(settingsBase, testSettings);
 }
 ```
 
@@ -115,7 +115,7 @@ The plugin provides the `EEPROMSettings` object, which has the following methods
 >
 > Should only be used after calling `seal()`.
 
-## Focus Hooks
+## Focus commands
 
 The plugin provides two [Focus][focus] hooks: `FOCUS_HOOK_SETTINGS`, and
 `FOCUS_HOOK_EEPROM`, that register commands that allow one to work with the
@@ -123,6 +123,33 @@ settings, and with the contents of the `EEPROM` through Focus.
 
  [focus]: https://github.com/keyboardio/Kaleidoscope-Focus
  
+These provide the following `Focus` commands:
+
+### `settings.crc`
+
+> Returns the actual, and the expected checksum of the settings.
+
+### `settings.valid?`
+
+> Returns either `true` or `false`, depending on whether the sealed settings are
+> to be considered valid or not.
+
+### `settings.version`
+
+> Returns the (user-set) version of the settings.
+
+### `eeprom.contents`
+
+> Without argument, displays the full contents of the `EEPROM`, including the
+> settings header.
+>
+> With arguments, the command updates as much of the `EEPROM` as arguments are
+> provided. It will discard any unnecessary arguments.
+
+### `eeprom.free`
+
+> Returns the amount of free bytes in `EEPROM`.
+
 ## Dependencies
 
 * [Kaleidoscope-Focus][focus]

src/Kaleidoscope/EEPROM-Settings.cpp

@@ -19,92 +19,84 @@
 #include <Kaleidoscope-EEPROM-Settings.h>
 #include "crc.h"
 
-namespace KaleidoscopePlugins {
+namespace kaleidoscope {
-struct EEPROMSettings::settings EEPROMSettings::settings;
+
-bool EEPROMSettings::_isValid;
+struct EEPROMSettings::settings EEPROMSettings::settings_;
-bool EEPROMSettings::sealed;
+bool EEPROMSettings::is_valid_;
-uint16_t EEPROMSettings::nextStart = sizeof(EEPROMSettings::settings);
+bool EEPROMSettings::sealed_;
+uint16_t EEPROMSettings::next_start_ = sizeof(EEPROMSettings::settings);
 
 EEPROMSettings::EEPROMSettings(void) {
 }
 
-void
+void EEPROMSettings::begin(void) {
-EEPROMSettings::begin(void) {
+  EEPROM.get(0, settings_);
-  EEPROM.get(0, settings);
 }
 
-bool
+bool EEPROMSettings::isValid(void) {
-EEPROMSettings::isValid(void) {
+  return is_valid_;
-  return _isValid;
 }
 
-uint16_t
+uint16_t EEPROMSettings::crc(void) {
-EEPROMSettings::crc(void) {
+  if (sealed_)
-  if (sealed)
+    return settings_.crc;
-    return settings.crc;
   return 0;
 }
 
-void
+void EEPROMSettings::seal(void) {
-EEPROMSettings::seal(void) {
+  sealed_ = true;
-  sealed = true;
 
   CRC.finalize();
 
-  if (settings.magic[0] != 'K' || settings.magic[1] != 'S') {
+  if (settings_.magic[0] != 'K' || settings_.magic[1] != 'S') {
-    settings.magic[0] = 'K';
+    settings_.magic[0] = 'K';
-    settings.magic[1] = 'S';
+    settings_.magic[1] = 'S';
-    settings.version = 0;
+    settings_.version = 0;
-    settings.crc = CRC.crc;
+    settings_.crc = CRC.crc;
 
     return update();
   }
 
-  if (settings.crc != CRC.crc)
+  if (settings_.crc != CRC.crc)
-    _isValid = false;
+    is_valid_ = false;
 }
 
-uint16_t
+uint16_t EEPROMSettings::requestSlice(uint16_t size) {
-EEPROMSettings::requestSlice(uint16_t size) {
+  if (sealed_)
-  if (sealed)
     return 0;
 
-  uint16_t start = nextStart;
+  uint16_t start = next_start_;
-  nextStart += size;
+  next_start_ += size;
 
   CRC.update((const void *)&size, sizeof(size));
 
   return start;
 }
 
-void
+void EEPROMSettings::invalidate(void) {
-EEPROMSettings::invalidate(void) {
+  is_valid_ = false;
-  _isValid = false;
 }
 
-uint16_t
+uint16_t EEPROMSettings::used(void) {
-EEPROMSettings::used(void) {
+  return next_start_;
-  return nextStart;
 }
 
-void
+void EEPROMSettings::update(void) {
-EEPROMSettings::update(void) {
+  settings_.crc = CRC.crc;
-  settings.crc = CRC.crc;
 
-  EEPROM.put(0, settings);
+  EEPROM.put(0, settings_);
-  _isValid = true;
+  is_valid_ = true;
 }
 
-uint8_t
+uint8_t EEPROMSettings::version(void) {
-EEPROMSettings::version(void) {
+  return settings_.version;
-  return settings.version;
 }
 
-void
+void EEPROMSettings::version(uint8_t ver) {
-EEPROMSettings::version(uint8_t ver) {
+  settings_.version = ver;
-  settings.version = ver;
   update();
 }
-};
 
-KaleidoscopePlugins::EEPROMSettings EEPROMSettings;
+}
+
+kaleidoscope::EEPROMSettings EEPROMSettings;

src/Kaleidoscope/EEPROM-Settings.h

@@ -21,7 +21,7 @@
 #include <Kaleidoscope.h>
 #include <EEPROM.h>
 
-namespace KaleidoscopePlugins {
+namespace kaleidoscope {
 class EEPROMSettings : public KaleidoscopePlugin {
  public:
   EEPROMSettings(void);
@@ -40,16 +40,16 @@ class EEPROMSettings : public KaleidoscopePlugin {
   static uint16_t used(void);
 
  private:
-  static uint16_t nextStart;
+  static uint16_t next_start_;
-  static bool _isValid;
+  static bool is_valid_;
-  static bool sealed;
+  static bool sealed_;
 
   static struct settings {
     char magic[2];
     uint8_t version;
     uint16_t crc;
-  } settings;
+  } settings_;
 };
 };
 
-extern KaleidoscopePlugins::EEPROMSettings EEPROMSettings;
+extern kaleidoscope::EEPROMSettings EEPROMSettings;