Move include/$arch to include/arch/$arch to be consistent with src/ hierarchy

20 files changed, 665 insertions, 0 deletions

diff --git a/include/arch/arduino-nano/driver/gpio.h b/include/arch/arduino-nano/driver/gpio.h
new file mode 100644
index 0000000..6acf977
--- /dev/null
+++ b/include/arch/arduino-nano/driver/gpio.h
@@ -0,0 +1,111 @@
+#ifndef GPIO_H
+#define GPIO_H
+
+#include <avr/io.h>
+
+class GPIO {
+	private:
+		GPIO(const GPIO &copy);
+
+	public:
+		GPIO () {}
+
+		enum Pin : unsigned char {
+			pb0 = 8,
+			pb1 = 9,
+			pb2 = 10,
+			pb3 = 11,
+			pb4 = 12,
+			pb5 = 13,
+			pb6 = 14,
+			pb7 = 15,
+			pc0 = 16,
+			pc1 = 17,
+			pc2 = 18,
+			pc3 = 19,
+			pc4 = 20,
+			pc5 = 21,
+			pc6 = 22,
+			pd0 = 24,
+			pd1 = 25,
+			pd2 = 26,
+			pd3 = 27,
+			pd4 = 28,
+			pd5 = 29,
+			pd6 = 30,
+			pd7 = 31
+		};
+
+		inline void setup() {
+			DDRB = _BV(PB5);
+		}
+		inline void led_on(unsigned char id) {
+			PORTB |= _BV(PB5);
+		}
+		inline void led_off(unsigned char id) {
+			PORTB &= ~_BV(PB5);
+		}
+		inline void led_toggle(unsigned char id) {
+			PINB = _BV(PB5);
+		}
+		inline void input(unsigned char const pin) {
+			if (pin < 8) {
+			} else if (pin < 16) {
+				DDRB &= ~_BV(pin - 8);
+			} else if (pin < 24) {
+				DDRC &= ~_BV(pin - 16);
+			} else if (pin < 32) {
+				DDRD &= ~_BV(pin - 24);
+			}
+		}
+		inline void output(unsigned char const pin) {
+			if (pin < 8) {
+			} else if (pin < 16) {
+				DDRB |= _BV(pin - 8);
+			} else if (pin < 24) {
+				DDRC |= _BV(pin - 16);
+			} else if (pin < 32) {
+				DDRD |= _BV(pin - 24);
+			}
+		}
+		inline unsigned char read(unsigned char const pin) {
+			if (pin < 8) {
+			}
+			if (pin < 16) {
+				return (PINB & _BV(pin - 8));
+			}
+			if (pin < 24) {
+				return (PINC & _BV(pin - 16));
+			}
+			if (pin < 32) {
+				return (PIND & _BV(pin - 24));
+			}
+			return 0;
+		}
+		inline void write(unsigned char const pin, unsigned char value) {
+			if (pin < 8) {
+			} else if (pin < 16) {
+				if (value) {
+					PORTB |= _BV(pin - 8);
+				} else {
+					PORTB &= ~_BV(pin - 8);
+				}
+			} else if (pin < 24) {
+				if (value) {
+					PORTB |= _BV(pin - 16);
+				} else {
+					PORTB &= ~_BV(pin - 16);
+				}
+			} else if (pin < 32) {
+				if (value) {
+					PORTB |= _BV(pin - 24);
+				} else {
+					PORTB &= ~_BV(pin - 24);
+				}
+			}
+		}
+};
+
+extern GPIO gpio;
+
+#endif
diff --git a/include/arch/arduino-nano/driver/i2c.h b/include/arch/arduino-nano/driver/i2c.h
new file mode 100644
index 0000000..6d6ea66
--- /dev/null
+++ b/include/arch/arduino-nano/driver/i2c.h
@@ -0,0 +1,19 @@
+#ifndef I2C_H
+#define I2C_H
+
+class I2C {
+	private:
+		I2C(const I2C &copy);
+
+	public:
+		I2C () {}
+		signed char setup();
+		void scan(unsigned int *results);
+		signed char xmit(unsigned char address,
+				unsigned char tx_len, unsigned char *tx_buf,
+				unsigned char rx_len, unsigned char *rx_buf);
+};
+
+extern I2C i2c;
+
+#endif
diff --git a/include/arch/arduino-nano/driver/stdin.h b/include/arch/arduino-nano/driver/stdin.h
new file mode 100644
index 0000000..6462e0c
--- /dev/null
+++ b/include/arch/arduino-nano/driver/stdin.h
@@ -0,0 +1,24 @@
+#ifndef STANDARDINPUT_H
+#define STANDARDINPUT_H
+
+class StandardInput {
+	private:
+		StandardInput(const StandardInput &copy);
+		char buffer[8];
+		unsigned char write_pos, read_pos;
+
+	public:
+		StandardInput() : write_pos(0), read_pos(0) {}
+		void setup();
+		bool hasKey();
+		char getKey();
+
+		inline void addKey(char key) {
+			buffer[write_pos++] = key;
+			write_pos %= 8;
+		}
+};
+
+extern StandardInput kin;
+
+#endif
diff --git a/include/arch/arduino-nano/driver/stdout.h b/include/arch/arduino-nano/driver/stdout.h
new file mode 100644
index 0000000..2eb669d
--- /dev/null
+++ b/include/arch/arduino-nano/driver/stdout.h
@@ -0,0 +1,19 @@
+#ifndef STANDARDOUTPUT_H
+#define STANDARDOUTPUT_H
+
+#include "object/outputstream.h"
+
+class StandardOutput : public OutputStream {
+	private:
+		StandardOutput(const StandardOutput &copy);
+
+	public:
+		StandardOutput () {}
+		void setup();
+
+		virtual void put(char c) override;
+};
+
+extern StandardOutput kout;
+
+#endif
diff --git a/include/arch/arduino-nano/driver/uptime.h b/include/arch/arduino-nano/driver/uptime.h
new file mode 100644
index 0000000..86a8bb5
--- /dev/null
+++ b/include/arch/arduino-nano/driver/uptime.h
@@ -0,0 +1,29 @@
+#ifndef UPTIME_H
+#define UPTIME_H
+
+#include <avr/io.h>
+
+class Uptime {
+	private:
+		Uptime(const Uptime &copy);
+#ifdef TIMER_S
+		uint8_t seconds;
+#endif
+
+	public:
+#ifdef TIMER_S
+		Uptime () : seconds(0) {}
+#else
+		Uptime () {}
+#endif
+		inline uint8_t get_cycles() { return TCNT0; }
+		inline uint8_t get_us() { return TCNT2/2; }
+#ifdef TIMER_S
+		inline uint8_t get_s() { return seconds; }
+		inline void tick_s() { seconds++; }
+#endif
+};
+
+extern Uptime uptime;
+
+#endif
diff --git a/include/arch/esp8266/driver/gpio.h b/include/arch/esp8266/driver/gpio.h
new file mode 100644
index 0000000..3db5d9d
--- /dev/null
+++ b/include/arch/esp8266/driver/gpio.h
@@ -0,0 +1,30 @@
+#ifndef GPIO_H
+#define GPIO_H
+
+class GPIO {
+	private:
+		GPIO(const GPIO &copy);
+
+	public:
+		GPIO () {}
+
+		enum Pin : unsigned char {
+			d3 = 0, tx, d4, rx, d2, d1,
+			d6 = 12, d7, d5, d8,
+			d0 = 16
+		};
+
+		void setup();
+		void led_on(unsigned char id);
+		void led_off(unsigned char id);
+		void led_toggle(unsigned char id);
+		void input(unsigned char const pin);
+		void input(unsigned char const pin, bool pullup);
+		void output(unsigned char const pin);
+		unsigned char read(unsigned char const pin);
+		void write(unsigned char const pin, unsigned char value);
+};
+
+extern GPIO gpio;
+
+#endif
diff --git a/include/arch/esp8266/driver/stdin.h b/include/arch/esp8266/driver/stdin.h
new file mode 100644
index 0000000..6462e0c
--- /dev/null
+++ b/include/arch/esp8266/driver/stdin.h
@@ -0,0 +1,24 @@
+#ifndef STANDARDINPUT_H
+#define STANDARDINPUT_H
+
+class StandardInput {
+	private:
+		StandardInput(const StandardInput &copy);
+		char buffer[8];
+		unsigned char write_pos, read_pos;
+
+	public:
+		StandardInput() : write_pos(0), read_pos(0) {}
+		void setup();
+		bool hasKey();
+		char getKey();
+
+		inline void addKey(char key) {
+			buffer[write_pos++] = key;
+			write_pos %= 8;
+		}
+};
+
+extern StandardInput kin;
+
+#endif
diff --git a/include/arch/esp8266/driver/stdout.h b/include/arch/esp8266/driver/stdout.h
new file mode 100644
index 0000000..038de2e
--- /dev/null
+++ b/include/arch/esp8266/driver/stdout.h
@@ -0,0 +1,61 @@
+#ifndef STANDARDOUTPUT_H
+#define STANDARDOUTPUT_H
+
+class StandardOutput {
+	private:
+		StandardOutput(const StandardOutput &copy);
+		char digit_buffer[sizeof(long long) * 8];
+		unsigned char base;
+
+	public:
+		StandardOutput ();
+		void setup();
+
+		void put(char c);
+		void write(const char *s);
+		void flush() {}
+		void printf_uint8(unsigned char num);
+		void printf_float(float num);
+
+		StandardOutput & operator<<(char c);
+		StandardOutput & operator<<(unsigned char c);
+		StandardOutput & operator<<(unsigned short number);
+		StandardOutput & operator<<(short number);
+		StandardOutput & operator<<(unsigned int number);
+		StandardOutput & operator<<(int number);
+		StandardOutput & operator<<(unsigned long number);
+		StandardOutput & operator<<(long number);
+		StandardOutput & operator<<(unsigned long long number);
+		StandardOutput & operator<<(long long number);
+		StandardOutput & operator<<(void *pointer);
+		StandardOutput & operator<<(const char *text);
+		StandardOutput & operator<<(StandardOutput & (*fun) (StandardOutput &));
+
+		void setBase(unsigned char b);
+};
+
+
+// ENDL: new line character (and flush)
+StandardOutput & endl(StandardOutput & os);
+
+// BIN: print numbers in binary form.
+StandardOutput & bin(StandardOutput & os);
+
+// OCT: print numbers in octal form.
+StandardOutput & oct(StandardOutput & os);
+
+// DEC: print numbers in decimal form.
+StandardOutput & dec(StandardOutput & os);
+
+// HEX: print numbers in hexadecimal form.
+StandardOutput & hex(StandardOutput & os);
+
+// FLUSH: flush StandardOutput buffer
+StandardOutput & flush(StandardOutput & os);
+
+// TERM: zero-termination
+StandardOutput & term(StandardOutput & os);
+
+extern StandardOutput kout;
+
+#endif
diff --git a/include/arch/esp8266/driver/uptime.h b/include/arch/esp8266/driver/uptime.h
new file mode 100644
index 0000000..21740c9
--- /dev/null
+++ b/include/arch/esp8266/driver/uptime.h
@@ -0,0 +1,28 @@
+#ifndef UPTIME_H
+#define UPTIME_H
+
+extern "C" {
+#include "osapi.h"
+#include "user_interface.h"
+}
+#include "c_types.h"
+
+class Uptime {
+	private:
+		Uptime(const Uptime &copy);
+
+	public:
+		Uptime () {}
+		inline uint32_t get_us() { return system_get_time(); }
+
+		inline uint32_t get_cycles()
+		{
+			uint32_t ccount;
+			asm volatile ("esync; rsr %0,ccount":"=a" (ccount));
+			return ccount;
+		}
+};
+
+extern Uptime uptime;
+
+#endif
diff --git a/include/arch/esp8266/user_config.h b/include/arch/esp8266/user_config.h
new file mode 100644
index 0000000..529fb46
--- /dev/null
+++ b/include/arch/esp8266/user_config.h
@@ -0,0 +1,5 @@
+/*
+ * required by ESP8266 SDK's osapi.h
+ *
+ * Intentionally left blank.
+ */
diff --git a/include/arch/msp430fr5969lp/driver/adc.h b/include/arch/msp430fr5969lp/driver/adc.h
new file mode 100644
index 0000000..d93aed4
--- /dev/null
+++ b/include/arch/msp430fr5969lp/driver/adc.h
@@ -0,0 +1,17 @@
+#ifndef ADC_H
+#define ADC_H
+
+class ADC {
+	private:
+		ADC(ADC const &copy);
+
+	public:
+		ADC() {}
+
+		float getTemp();
+		float getVCC();
+};
+
+extern ADC adc;
+
+#endif
diff --git a/include/arch/msp430fr5969lp/driver/gpio.h b/include/arch/msp430fr5969lp/driver/gpio.h
new file mode 100644
index 0000000..caed74a
--- /dev/null
+++ b/include/arch/msp430fr5969lp/driver/gpio.h
@@ -0,0 +1,130 @@
+#ifndef GPIO_H
+#define GPIO_H
+
+#include <msp430.h>
+
+class GPIO {
+	private:
+		GPIO(const GPIO &copy);
+
+	public:
+		GPIO () {}
+
+		enum Pin : unsigned char {
+			p1_0 = 0, p1_1, p1_2, p1_3, p1_4, p1_5, p1_6, p1_7,
+			p2_0, p2_1, p2_2, p2_3, p2_4, p2_5, p2_6, p2_7,
+			p3_0, p3_1, p3_2, p3_3, p3_4, p3_5, p3_6, p3_7,
+			p4_0, p4_1, p4_2, p4_3, p4_4, p4_5, p4_6, p4_7,
+			pj_0, pj_1, pj_2, pj_3, pj_4, pj_5, pj_6, pj_7,
+			PIN_INVALID
+		};
+
+		inline void setup() {
+			P1OUT = 0;
+			P2OUT = 0;
+			P3OUT = 0;
+			P4OUT = 0;
+			P1DIR = BIT0;
+			P2DIR = 0;
+			P3DIR = 0;
+			P4DIR = BIT6;
+		}
+		inline void led_on(unsigned char id) {
+			if (id == 0) {
+				P1OUT |= BIT0;
+			} else {
+				P4OUT |= BIT6;
+			}
+		}
+		inline void led_off(unsigned char id) {
+			if (id == 0) {
+				P1OUT &= ~BIT0;
+			} else {
+				P4OUT &= ~BIT6;
+			}
+		}
+		inline void led_toggle(unsigned char id) {
+			if (id == 0) {
+				P1OUT ^= BIT0;
+			} else {
+				P4OUT ^= BIT6;
+			}
+		}
+		inline void input(unsigned char const pin) {
+			if (pin < p2_0) {
+				P1DIR &= ~(1 << pin);
+			} else if (pin < p3_0) {
+				P2DIR &= ~(1 << (pin - p2_0));
+			} else if (pin < p4_0) {
+				P3DIR &= ~(1 << (pin - p3_0));
+			} else if (pin < pj_0) {
+				P4DIR &= ~(1 << (pin - p4_0));
+			} else if (pin < PIN_INVALID) {
+				PJDIR &= ~(1 << (pin - pj_0));
+			}
+		}
+		inline void output(unsigned char const pin) {
+			if (pin < p2_0) {
+				P1DIR |= (1 << pin);
+			} else if (pin < p3_0) {
+				P2DIR |= (1 << (pin - p2_0));
+			} else if (pin < p4_0) {
+				P3DIR |= (1 << (pin - p3_0));
+			} else if (pin < pj_0) {
+				P4DIR |= (1 << (pin - p4_0));
+			} else if (pin < PIN_INVALID) {
+				PJDIR |= (1 << (pin - pj_0));
+			}
+		}
+		inline unsigned char read(unsigned char const pin) {
+			if (pin < p2_0) {
+				return P1IN & (1 << pin);
+			} else if (pin < p3_0) {
+				return P2IN & (1 << (pin - p2_0));
+			} else if (pin < p4_0) {
+				return P3IN & (1 << (pin - p3_0));
+			} else if (pin < pj_0) {
+				return P4IN & (1 << (pin - p4_0));
+			} else if (pin < PIN_INVALID) {
+				return PJIN & (1 << (pin - pj_0));
+			}
+			return 0;
+		}
+		inline void write(unsigned char const pin, unsigned char value) {
+			if (pin < p2_0) {
+				if (value) {
+					P1OUT |= (1 << pin);
+				} else {
+					P1OUT &= ~(1 << pin);
+				}
+			} else if (pin < p3_0) {
+				if (value) {
+					P2OUT |= (1 << (pin - p2_0));
+				} else {
+					P2OUT &= ~(1 << (pin - p2_0));
+				}
+			} else if (pin < p4_0) {
+				if (value) {
+					P3OUT |= (1 << (pin - p3_0));
+				} else {
+					P3OUT &= ~(1 << (pin - p3_0));
+				}
+			} else if (pin < pj_0) {
+				if (value) {
+					P4OUT |= (1 << (pin - p4_0));
+				} else {
+					P4OUT &= ~(1 << (pin - p4_0));
+				}
+			} else if (pin < PIN_INVALID) {
+				if (value) {
+					PJOUT |= (1 << (pin - pj_0));
+				} else {
+					PJOUT &= ~(1 << (pin - pj_0));
+				}
+			}
+		}
+};
+
+extern GPIO gpio;
+
+#endif
diff --git a/include/arch/msp430fr5969lp/driver/i2c.h b/include/arch/msp430fr5969lp/driver/i2c.h
new file mode 100644
index 0000000..6d6ea66
--- /dev/null
+++ b/include/arch/msp430fr5969lp/driver/i2c.h
@@ -0,0 +1,19 @@
+#ifndef I2C_H
+#define I2C_H
+
+class I2C {
+	private:
+		I2C(const I2C &copy);
+
+	public:
+		I2C () {}
+		signed char setup();
+		void scan(unsigned int *results);
+		signed char xmit(unsigned char address,
+				unsigned char tx_len, unsigned char *tx_buf,
+				unsigned char rx_len, unsigned char *rx_buf);
+};
+
+extern I2C i2c;
+
+#endif
diff --git a/include/arch/msp430fr5969lp/driver/spi_b.h b/include/arch/msp430fr5969lp/driver/spi_b.h
new file mode 100644
index 0000000..4be7346
--- /dev/null
+++ b/include/arch/msp430fr5969lp/driver/spi_b.h
@@ -0,0 +1,18 @@
+#ifndef SPI_H
+#define SPI_H
+
+class SPI {
+	private:
+		SPI(const SPI &copy);
+
+	public:
+		SPI () {}
+		void setup();
+		signed char xmit(
+				unsigned char tx_len, unsigned char *tx_buf,
+				unsigned char rx_len, unsigned char *rx_buf);
+};
+
+extern SPI spi;
+
+#endif
diff --git a/include/arch/msp430fr5969lp/driver/stdin.h b/include/arch/msp430fr5969lp/driver/stdin.h
new file mode 100644
index 0000000..6462e0c
--- /dev/null
+++ b/include/arch/msp430fr5969lp/driver/stdin.h
@@ -0,0 +1,24 @@
+#ifndef STANDARDINPUT_H
+#define STANDARDINPUT_H
+
+class StandardInput {
+	private:
+		StandardInput(const StandardInput &copy);
+		char buffer[8];
+		unsigned char write_pos, read_pos;
+
+	public:
+		StandardInput() : write_pos(0), read_pos(0) {}
+		void setup();
+		bool hasKey();
+		char getKey();
+
+		inline void addKey(char key) {
+			buffer[write_pos++] = key;
+			write_pos %= 8;
+		}
+};
+
+extern StandardInput kin;
+
+#endif
diff --git a/include/arch/msp430fr5969lp/driver/stdout.h b/include/arch/msp430fr5969lp/driver/stdout.h
new file mode 100644
index 0000000..2eb669d
--- /dev/null
+++ b/include/arch/msp430fr5969lp/driver/stdout.h
@@ -0,0 +1,19 @@
+#ifndef STANDARDOUTPUT_H
+#define STANDARDOUTPUT_H
+
+#include "object/outputstream.h"
+
+class StandardOutput : public OutputStream {
+	private:
+		StandardOutput(const StandardOutput &copy);
+
+	public:
+		StandardOutput () {}
+		void setup();
+
+		virtual void put(char c) override;
+};
+
+extern StandardOutput kout;
+
+#endif
diff --git a/include/arch/msp430fr5969lp/driver/uptime.h b/include/arch/msp430fr5969lp/driver/uptime.h
new file mode 100644
index 0000000..3a52840
--- /dev/null
+++ b/include/arch/msp430fr5969lp/driver/uptime.h
@@ -0,0 +1,30 @@
+#ifndef UPTIME_H
+#define UPTIME_H
+
+#include <msp430.h>
+#include <stdint.h>
+
+class Uptime {
+	private:
+		Uptime(const Uptime &copy);
+#ifdef TIMER_S
+		uint16_t seconds;
+#endif
+
+	public:
+#ifdef TIMER_S
+		Uptime () : seconds(0) {}
+#else
+		Uptime () {}
+#endif
+		inline uint16_t get_us() { return TA0R; }
+		inline uint16_t get_cycles() { return TA2R; }
+#ifdef TIMER_S
+		inline uint16_t get_s() { return seconds; }
+		inline void tick_s() { seconds++; }
+#endif
+};
+
+extern Uptime uptime;
+
+#endif
diff --git a/include/arch/posix/driver/gpio.h b/include/arch/posix/driver/gpio.h
new file mode 100644
index 0000000..0995729
--- /dev/null
+++ b/include/arch/posix/driver/gpio.h
@@ -0,0 +1,19 @@
+#ifndef GPIO_H
+#define GPIO_H
+
+class GPIO {
+	private:
+		GPIO(const GPIO &copy);
+		unsigned char ledstate;
+
+	public:
+		GPIO () : ledstate(0) {}
+		void setup() {}
+		void led_on(unsigned char id);
+		void led_off(unsigned char id);
+		void led_toggle(unsigned char id);
+};
+
+extern GPIO gpio;
+
+#endif
diff --git a/include/arch/posix/driver/stdout.h b/include/arch/posix/driver/stdout.h
new file mode 100644
index 0000000..b21ad56
--- /dev/null
+++ b/include/arch/posix/driver/stdout.h
@@ -0,0 +1,20 @@
+#ifndef STANDARDOUTPUT_H
+#define STANDARDOUTPUT_H
+
+#include "object/outputstream.h"
+
+class StandardOutput : public OutputStream {
+	private:
+		StandardOutput(const StandardOutput &copy);
+
+	public:
+		StandardOutput () {}
+		void setup() {}
+
+		virtual void put(char c) override;
+		virtual void flush() override;
+};
+
+extern StandardOutput kout;
+
+#endif
diff --git a/include/arch/posix/driver/uptime.h b/include/arch/posix/driver/uptime.h
new file mode 100644
index 0000000..93711b9
--- /dev/null
+++ b/include/arch/posix/driver/uptime.h
@@ -0,0 +1,19 @@
+#ifndef UPTIME_H
+#define UPTIME_H
+
+#include <stdint.h>
+
+class Uptime {
+	private:
+		Uptime(const Uptime &copy);
+
+	public:
+		Uptime () {}
+		uint64_t get_s();
+		uint64_t get_us();
+		uint64_t get_cycles();
+};
+
+extern Uptime uptime;
+
+#endif