wxcafe/Kaleidoscope
1
0
Fork 0
Code Releases Activity

Blindly pull all plugins up to current

Browse Source
This commit is contained in:
Jesse Vincent 2019-12-05 11:13:27 -08:00
parent da4c3e1b31
commit 8fe8470067
No known key found for this signature in database
GPG Key ID: CC228463465E40BC
7 changed files with 233 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
avr/libraries/Kaleidoscope

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

36
virtual/cores/virtual/Arduino.h
View File

@ -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 int8_t pgm_read_byte_near(const int8_t *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 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; }
inline uint8_t pgm_read_byte_near(const uint8_t *addr) {
return *addr;
}
inline int8_t pgm_read_byte_near(const int8_t *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 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))

207
virtual/cores/virtual/EEPROM.h
View File

@ -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 )
: index( index ) {}
EERef(const int index)
: index(index) {}
//Access/read members.
uint8_t operator*() const { return eeprom_[index]; }
operator uint8_t() const { return **this; }
//Access/read members.
uint8_t operator*() const {
return eeprom_[index];
}
operator uint8_t() const {
return **this;
}
//Assignment/write members.
EERef &operator=( const EERef &ref ) { return *this = *ref; }
EERef &operator=( uint8_t in ) { eeprom_[index] = 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 ) { 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; }
//Assignment/write members.
EERef &operator=(const EERef &ref) {
return *this = *ref;
}
EERef &operator=(uint8_t in) {
eeprom_[index] = 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) {
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 **/
EERef& operator++() { return *this += 1; }
EERef& operator--() { return *this -= 1; }
/** Prefix increment/decrement **/
EERef& operator++() {
return *this += 1;
}
EERef& operator--() {
return *this -= 1;
}
/** Postfix increment/decrement **/
uint8_t operator++ (int){
uint8_t ret = **this;
return ++(*this), ret;
}
/** Postfix increment/decrement **/
uint8_t operator++ (int) {
uint8_t ret = **this;
return ++(*this), ret;
}
uint8_t operator-- (int){
uint8_t ret = **this;
return --(*this), ret;
}
uint8_t operator-- (int) {
uint8_t ret = **this;
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 )
: index( index ) {}
EEPtr(const int index)
: index(index) {}
operator int() const { return index; }
EEPtr &operator=( int in ) { return index = in, *this; }
operator int() const {
return index;
}
EEPtr &operator=(int in) {
return index = in, *this;
}
//Iterator functionality.
bool operator!=( const EEPtr &ptr ) { return index != ptr.index; }
EERef operator*() { return index; }
//Iterator functionality.
bool operator!=(const EEPtr &ptr) {
return index != ptr.index;
}
EERef operator*() {
return index;
}
/** Prefix & Postfix increment/decrement **/
EEPtr& operator++() { return ++index, *this; }
EEPtr& operator--() { return --index, *this; }
EEPtr operator++ (int) { return index++; }
EEPtr operator-- (int) { return index--; }
/** Prefix & Postfix increment/decrement **/
EEPtr& operator++() {
return ++index, *this;
}
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.
EERef operator[]( const int idx ) { return idx; }
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 ); }
//Basic user access methods.
EERef operator[](const int idx) {
return idx;
}
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.
EEPtr begin() { return 0x00; }
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; }
//STL and C++11 iteration capability.
EEPtr begin() {
return 0x00;
}
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.
template< typename T > T &get( int idx, T &t ){
EEPtr e = idx;
uint8_t *ptr = (uint8_t*) &t;
for( int count = sizeof(T) ; count ; --count, ++e ) *ptr++ = *e;
return t;
}
//Functionality to 'get' and 'put' objects to and from EEPROM.
template< typename T > T &get(int idx, T &t) {
EEPtr e = idx;
uint8_t *ptr = (uint8_t*) &t;
for (int count = sizeof(T) ; count ; --count, ++e) *ptr++ = *e;
return t;
}
template< typename T > const T &put( int idx, const T &t ){
EEPtr e = idx;
const uint8_t *ptr = (const uint8_t*) &t;
for( int count = sizeof(T) ; count ; --count, ++e ) (*e).update( *ptr++ );
return t;
}
template< typename T > const T &put(int idx, const T &t) {
EEPtr e = idx;
const uint8_t *ptr = (const uint8_t*) &t;
for (int count = sizeof(T) ; count ; --count, ++e)(*e).update(*ptr++);
return t;
}
};
extern EEPROMClass EEPROM;

76
virtual/cores/virtual/PluggableUSB.h
View File

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

16
virtual/cores/virtual/main.cpp
View File

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

4
virtual/cores/virtual/mcu/atmega32u4.h
View File

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

2
virtual/cores/virtual/virtual_io.cpp
View File

@ -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;