make astyle

pull/365/head
Jesse Vincent 8 years ago
parent 59c361e6c8
commit e3dc58f384
No known key found for this signature in database
GPG Key ID: 122F5DF7108E4046

@ -21,7 +21,7 @@
#include "crc.h"
namespace FocusHooks {
bool settings (const char *command) {
bool settings (const char *command) {
enum {
ISVALID,
GETVERSION,
@ -56,9 +56,9 @@ namespace FocusHooks {
}
return true;
}
}
bool eeprom (const char *command) {
bool eeprom (const char *command) {
enum {
CONTENTS,
FREE,
@ -95,5 +95,5 @@ namespace FocusHooks {
}
return true;
}
}
};

@ -21,8 +21,8 @@
#include <Kaleidoscope.h>
namespace FocusHooks {
bool settings (const char *command);
bool eeprom (const char *command);
bool settings (const char *command);
bool eeprom (const char *command);
};
#define FOCUS_HOOK_SETTINGS FOCUS_HOOK(FocusHooks::settings, \

@ -20,33 +20,33 @@
#include "crc.h"
namespace KaleidoscopePlugins {
struct EEPROMSettings::settings EEPROMSettings::settings;
bool EEPROMSettings::_isValid;
bool EEPROMSettings::sealed;
uint16_t EEPROMSettings::nextStart = sizeof (EEPROMSettings::settings);
struct EEPROMSettings::settings EEPROMSettings::settings;
bool EEPROMSettings::_isValid;
bool EEPROMSettings::sealed;
uint16_t EEPROMSettings::nextStart = sizeof (EEPROMSettings::settings);
EEPROMSettings::EEPROMSettings (void) {
}
EEPROMSettings::EEPROMSettings (void) {
}
void
EEPROMSettings::begin (void) {
void
EEPROMSettings::begin (void) {
EEPROM.get (0, settings);
}
}
bool
EEPROMSettings::isValid (void) {
bool
EEPROMSettings::isValid (void) {
return _isValid;
}
}
uint16_t
EEPROMSettings::crc (void) {
uint16_t
EEPROMSettings::crc (void) {
if (sealed)
return settings.crc;
return 0;
}
}
void
EEPROMSettings::seal (void) {
void
EEPROMSettings::seal (void) {
sealed = true;
CRC.finalize ();
@ -62,10 +62,10 @@ namespace KaleidoscopePlugins {
if (settings.crc != CRC.crc)
_isValid = false;
}
}
uint16_t
EEPROMSettings::requestSlice (uint16_t size) {
uint16_t
EEPROMSettings::requestSlice (uint16_t size) {
if (sealed)
return 0;
@ -75,36 +75,36 @@ namespace KaleidoscopePlugins {
CRC.update ((const void *)&size, sizeof (size));
return start;
}
}
void
EEPROMSettings::invalidate (void) {
void
EEPROMSettings::invalidate (void) {
_isValid = false;
}
}
uint16_t
EEPROMSettings::used (void) {
uint16_t
EEPROMSettings::used (void) {
return nextStart;
}
}
void
EEPROMSettings::update (void) {
void
EEPROMSettings::update (void) {
settings.crc = CRC.crc;
EEPROM.put (0, settings);
_isValid = true;
}
}
uint8_t
EEPROMSettings::version (void) {
uint8_t
EEPROMSettings::version (void) {
return settings.version;
}
}
void
EEPROMSettings::version (uint8_t ver) {
void
EEPROMSettings::version (uint8_t ver) {
settings.version = ver;
update ();
}
}
};
KaleidoscopePlugins::EEPROMSettings EEPROMSettings;

@ -22,7 +22,7 @@
#include <EEPROM.h>
namespace KaleidoscopePlugins {
class EEPROMSettings : public KaleidoscopePlugin {
class EEPROMSettings : public KaleidoscopePlugin {
public:
EEPROMSettings (void);
@ -49,7 +49,7 @@ namespace KaleidoscopePlugins {
uint8_t version;
uint16_t crc;
} settings;
};
};
};
extern KaleidoscopePlugins::EEPROMSettings EEPROMSettings;

@ -44,8 +44,7 @@ CRC_::reflect (uint8_t len) {
}
void
CRC_::update (const void *data, uint8_t len)
{
CRC_::update (const void *data, uint8_t len) {
const uint8_t *d = (const uint8_t *)data;
uint8_t i;
bool bit;

@ -38,7 +38,9 @@ class CRC_ {
CRC_ (void) {};
void update (const void *data, uint8_t len);
void finalize (void) { reflect (16); };
void finalize (void) {
reflect (16);
};
void reflect (uint8_t len);
};

Loading…
Cancel
Save