Blindly pull all plugins up to current

avr/libraries/Kaleidoscope

@@ -1 +1 @@
-Subproject commit 54ec4d63cf214db6d73245d5aa4cb98d78d46f79
+Subproject commit eb52795c799e5da66c6b45965b2281c7dd374662

virtual/cores/virtual/Arduino.h

@@ -282,15 +282,33 @@ long map(long, long, long, long, long);
 
 #ifdef __cplusplus
 // Not sure if these are acceptable substitute definitions in our context or not
-inline uint8_t pgm_read_byte_near(const uint8_t *addr) { return *addr; }
+inline uint8_t pgm_read_byte_near(const uint8_t *addr) {
-inline int8_t pgm_read_byte_near(const int8_t *addr) { return *addr; }
+  return *addr;
-inline char pgm_read_byte_near(const char *addr) { return *addr; }
+}
-inline uint16_t pgm_read_word_near(const uint16_t *addr) { return *addr; }
+inline int8_t pgm_read_byte_near(const int8_t *addr) {
-inline int16_t pgm_read_word_near(const int16_t *addr) { return *addr; }
+  return *addr;
-inline uint32_t pgm_read_dword_near(const uint32_t *addr) { return *addr; }
+}
-inline int32_t pgm_read_dword_near(const int32_t *addr) { return *addr; }
+inline char pgm_read_byte_near(const char *addr) {
-inline float pgm_read_float_near(const float *addr) { return *addr; }
+  return *addr;
-inline const void *pgm_read_ptr_near(const void **addr) { return *addr; }
+}
+inline uint16_t pgm_read_word_near(const uint16_t *addr) {
+  return *addr;
+}
+inline int16_t pgm_read_word_near(const int16_t *addr) {
+  return *addr;
+}
+inline uint32_t pgm_read_dword_near(const uint32_t *addr) {
+  return *addr;
+}
+inline int32_t pgm_read_dword_near(const int32_t *addr) {
+  return *addr;
+}
+inline float pgm_read_float_near(const float *addr) {
+  return *addr;
+}
+inline const void *pgm_read_ptr_near(const void **addr) {
+  return *addr;
+}
 #else
 #define pgm_read_byte_near(addr) (*(const byte*)(addr))
 #define pgm_read_word_near(addr) (*(const word*)(addr))

virtual/cores/virtual/EEPROM.h

@@ -35,49 +35,84 @@
     This class has an overhead of two bytes, similar to storing a pointer to an EEPROM cell.
 ***/
 
-struct EERef{
+struct EERef {
 
-    EERef( const int index )
+  EERef(const int index)
-        : index( index )                 {}
+    : index(index)                 {}
 
-    //Access/read members.
+  //Access/read members.
-    uint8_t operator*() const            { return eeprom_[index]; }
+  uint8_t operator*() const            {
-    operator uint8_t() const             { return **this; }
+    return eeprom_[index];
+  }
+  operator uint8_t() const             {
+    return **this;
+  }
 
-    //Assignment/write members.
+  //Assignment/write members.
-    EERef &operator=( const EERef &ref ) { return *this = *ref; }
+  EERef &operator=(const EERef &ref) {
-    EERef &operator=( uint8_t in )       { eeprom_[index] = in; return *this;  }
+    return *this = *ref;
-    EERef &operator +=( uint8_t in )     { return *this = **this + in; }
+  }
-    EERef &operator -=( uint8_t in )     { return *this = **this - in; }
+  EERef &operator=(uint8_t in)       {
-    EERef &operator *=( uint8_t in )     { return *this = **this * in; }
+    eeprom_[index] = in;
-    EERef &operator /=( uint8_t in )     { return *this = **this / in; }
+    return *this;
-    EERef &operator ^=( uint8_t in )     { return *this = **this ^ in; }
+  }
-    EERef &operator %=( uint8_t in )     { return *this = **this % in; }
+  EERef &operator +=(uint8_t in)     {
-    EERef &operator &=( uint8_t in )     { return *this = **this & in; }
+    return *this = **this + in;
-    EERef &operator |=( uint8_t in )     { return *this = **this | in; }
+  }
-    EERef &operator <<=( uint8_t in )    { return *this = **this << in; }
+  EERef &operator -=(uint8_t in)     {
-    EERef &operator >>=( uint8_t in )    { return *this = **this >> in; }
+    return *this = **this - in;
+  }
+  EERef &operator *=(uint8_t in)     {
+    return *this = **this * in;
+  }
+  EERef &operator /=(uint8_t in)     {
+    return *this = **this / in;
+  }
+  EERef &operator ^=(uint8_t in)     {
+    return *this = **this ^ in;
+  }
+  EERef &operator %=(uint8_t in)     {
+    return *this = **this % in;
+  }
+  EERef &operator &=(uint8_t in)     {
+    return *this = **this & in;
+  }
+  EERef &operator |=(uint8_t in)     {
+    return *this = **this | in;
+  }
+  EERef &operator <<=(uint8_t in)    {
+    return *this = **this << in;
+  }
+  EERef &operator >>=(uint8_t in)    {
+    return *this = **this >> in;
+  }
 
-    EERef &update( uint8_t in )          { return  in != *this ? *this = in : *this; }
+  EERef &update(uint8_t in)          {
+    return  in != *this ? *this = in : *this;
+  }
 
-    /** Prefix increment/decrement **/
+  /** Prefix increment/decrement **/
-    EERef& operator++()                  { return *this += 1; }
+  EERef& operator++()                  {
-    EERef& operator--()                  { return *this -= 1; }
+    return *this += 1;
+  }
+  EERef& operator--()                  {
+    return *this -= 1;
+  }
 
-    /** Postfix increment/decrement **/
+  /** Postfix increment/decrement **/
-    uint8_t operator++ (int){ 
+  uint8_t operator++ (int) {
-        uint8_t ret = **this;
+    uint8_t ret = **this;
-        return ++(*this), ret;
+    return ++(*this), ret;
-    }
+  }
 
-    uint8_t operator-- (int){ 
+  uint8_t operator-- (int) {
-        uint8_t ret = **this;
+    uint8_t ret = **this;
-        return --(*this), ret;
+    return --(*this), ret;
-    }
+  }
 
-    int index; //Index of current EEPROM cell.
+  int index; //Index of current EEPROM cell.
 
-    static uint8_t eeprom_[kaleidoscope::hardware::mcu::eeprom_size];
+  static uint8_t eeprom_[kaleidoscope::hardware::mcu::eeprom_size];
 };
 
 /***
@@ -88,25 +123,41 @@ struct EERef{
     increment/decrement operators.
 ***/
 
-struct EEPtr{
+struct EEPtr {
 
-    EEPtr( const int index )
+  EEPtr(const int index)
-        : index( index )                {}
+    : index(index)                {}
 
-    operator int() const                { return index; }
+  operator int() const                {
-    EEPtr &operator=( int in )          { return index = in, *this; }
+    return index;
+  }
+  EEPtr &operator=(int in)          {
+    return index = in, *this;
+  }
 
-    //Iterator functionality.
+  //Iterator functionality.
-    bool operator!=( const EEPtr &ptr ) { return index != ptr.index; }
+  bool operator!=(const EEPtr &ptr) {
-    EERef operator*()                   { return index; }
+    return index != ptr.index;
+  }
+  EERef operator*()                   {
+    return index;
+  }
 
-    /** Prefix & Postfix increment/decrement **/
+  /** Prefix & Postfix increment/decrement **/
-    EEPtr& operator++()                 { return ++index, *this; }
+  EEPtr& operator++()                 {
-    EEPtr& operator--()                 { return --index, *this; }
+    return ++index, *this;
-    EEPtr operator++ (int)              { return index++; }
+  }
-    EEPtr operator-- (int)              { return index--; }
+  EEPtr& operator--()                 {
+    return --index, *this;
+  }
+  EEPtr operator++ (int)              {
+    return index++;
+  }
+  EEPtr operator-- (int)              {
+    return index--;
+  }
 
-    int index; //Index of current EEPROM cell.
+  int index; //Index of current EEPROM cell.
 };
 
 /***
@@ -117,33 +168,47 @@ struct EEPtr{
     This class is also 100% backwards compatible with earlier Arduino core releases.
 ***/
 
-struct EEPROMClass{
+struct EEPROMClass {
 
-    //Basic user access methods.
+  //Basic user access methods.
-    EERef operator[]( const int idx )    { return idx; }
+  EERef operator[](const int idx)    {
-    uint8_t read( int idx )              { return EERef( idx ); }
+    return idx;
-    void write( int idx, uint8_t val )   { (EERef( idx )) = val; }
+  }
-    void update( int idx, uint8_t val )  { EERef( idx ).update( val ); }
+  uint8_t read(int idx)              {
+    return EERef(idx);
+  }
+  void write(int idx, uint8_t val)   {
+    (EERef(idx)) = val;
+  }
+  void update(int idx, uint8_t val)  {
+    EERef(idx).update(val);
+  }
 
-    //STL and C++11 iteration capability.
+  //STL and C++11 iteration capability.
-    EEPtr begin()                        { return 0x00; }
+  EEPtr begin()                        {
-    EEPtr end()                          { return length(); } //Standards requires this to be the item after the last valid entry. The returned pointer is invalid.
+    return 0x00;
-    uint16_t length()                    { return kaleidoscope::hardware::mcu::eeprom_size; }
+  }
+  EEPtr end()                          {
+    return length();  //Standards requires this to be the item after the last valid entry. The returned pointer is invalid.
+  }
+  uint16_t length()                    {
+    return kaleidoscope::hardware::mcu::eeprom_size;
+  }
 
-    //Functionality to 'get' and 'put' objects to and from EEPROM.
+  //Functionality to 'get' and 'put' objects to and from EEPROM.
-    template< typename T > T &get( int idx, T &t ){
+  template< typename T > T &get(int idx, T &t) {
-        EEPtr e = idx;
+    EEPtr e = idx;
-        uint8_t *ptr = (uint8_t*) &t;
+    uint8_t *ptr = (uint8_t*) &t;
-        for( int count = sizeof(T) ; count ; --count, ++e )  *ptr++ = *e;
+    for (int count = sizeof(T) ; count ; --count, ++e)  *ptr++ = *e;
-        return t;
+    return t;
-    }
+  }
 
-    template< typename T > const T &put( int idx, const T &t ){
+  template< typename T > const T &put(int idx, const T &t) {
-        EEPtr e = idx;
+    EEPtr e = idx;
-        const uint8_t *ptr = (const uint8_t*) &t;
+    const uint8_t *ptr = (const uint8_t*) &t;
-        for( int count = sizeof(T) ; count ; --count, ++e )  (*e).update( *ptr++ );
+    for (int count = sizeof(T) ; count ; --count, ++e)(*e).update(*ptr++);
-        return t;
+    return t;
-    }
+  }
 };
 
 extern EEPROMClass EEPROM;

virtual/cores/virtual/PluggableUSB.h

@@ -36,53 +36,53 @@ struct EndpointDescriptor {
 struct USBSetup;
 
 class PluggableUSBModule {
-  public:
+ public:
-    PluggableUSBModule(uint8_t numEps, uint8_t numIfs, uint8_t *epType) :
+  PluggableUSBModule(uint8_t numEps, uint8_t numIfs, uint8_t *epType) :
-      numEndpoints(numEps), numInterfaces(numIfs), endpointType(epType)
+    numEndpoints(numEps), numInterfaces(numIfs), endpointType(epType)
-    { }
+  { }
 
-  protected:
+ protected:
-    virtual bool setup(USBSetup &setup) = 0;
+  virtual bool setup(USBSetup &setup) = 0;
-    virtual int getInterface(uint8_t *interfaceCount) = 0;
+  virtual int getInterface(uint8_t *interfaceCount) = 0;
-    virtual int getDescriptor(USBSetup &setup) = 0;
+  virtual int getDescriptor(USBSetup &setup) = 0;
-    virtual uint8_t getShortName(char *name) {
+  virtual uint8_t getShortName(char *name) {
-      name[0] = 'A'+pluggedInterface;
+    name[0] = 'A' + pluggedInterface;
-      return 1;
+    return 1;
-    }
+  }
 
-    uint8_t pluggedInterface = 0;
+  uint8_t pluggedInterface = 0;
-    uint8_t pluggedEndpoint;
+  uint8_t pluggedEndpoint;
 
-    const uint8_t numEndpoints;
+  const uint8_t numEndpoints;
-    const uint8_t numInterfaces;
+  const uint8_t numInterfaces;
-    const uint8_t *endpointType;
+  const uint8_t *endpointType;
 
-    PluggableUSBModule *next = nullptr;
+  PluggableUSBModule *next = nullptr;
 
-    friend class PluggableUSB_;
+  friend class PluggableUSB_;
 };
 
 class PluggableUSB_ {
-  public:
+ public:
-    PluggableUSB_() {}
+  PluggableUSB_() {}
-    bool plug(PluggableUSBModule *node) {
+  bool plug(PluggableUSBModule *node) {
-      return true;
+    return true;
-    }
+  }
-    int getInterface(uint8_t *interfaceCount) {
+  int getInterface(uint8_t *interfaceCount) {
-      return 1;
+    return 1;
-    }
+  }
-    int getDescriptor(USBSetup &setup) {
+  int getDescriptor(USBSetup &setup) {
-      return 1;
+    return 1;
-    }
+  }
-    bool setup(USBSetup &setup) {
+  bool setup(USBSetup &setup) {
-      return true;
+    return true;
-    }
+  }
-    void getShortName(char *iSerialNum) {}
+  void getShortName(char *iSerialNum) {}
 
-  private:
+ private:
-    uint8_t lastIf;
+  uint8_t lastIf;
-    uint8_t lastEp;
+  uint8_t lastEp;
-    PluggableUSBModule *rootNode;
+  PluggableUSBModule *rootNode;
 };
 
 // Replacement for global singleton.

virtual/cores/virtual/main.cpp

@@ -45,17 +45,17 @@ void init(void) {
 
 int main(int argc, char* argv[]) {
 
-   // Enable consumer code to read command line args.
+  // Enable consumer code to read command line args.
-   //
+  //
-   parseCommandLine(argc, argv);
+  parseCommandLine(argc, argv);
 
   if (!initVirtualInput(argc, argv)) return 1;
 
-  if(testFunctionExecutionRequested()) {
+  if (testFunctionExecutionRequested()) {
-     if(executeTestFunction) {
+    if (executeTestFunction) {
-        executeTestFunction();
+      executeTestFunction();
-     }
+    }
-     return 0;
+    return 0;
   }
 
   init();

virtual/cores/virtual/mcu/atmega32u4.h

@@ -24,9 +24,9 @@ namespace mcus {
 
 class atmega32u4 {
 
-  public:
+ public:
 
-    static constexpr int eeprom_size = 1024;
+  static constexpr int eeprom_size = 1024;
 };
 
 } // namespace mcus

virtual/cores/virtual/virtual_io.cpp

@@ -63,7 +63,7 @@ bool initVirtualInput(int argc, char* argv[]) {
   if (strcmp(argv[1], "-i") == 0) {
     interactive = true;
     input = &std::cin;
-  } else if(strcmp(argv[1], "-t") == 0) {
+  } else if (strcmp(argv[1], "-t") == 0) {
     test_function = true;
   } else {
     interactive = false;