Commit 3875f37b authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

add stdin for esp8266 and msp430 as well as preliminary shell app

parent c00a200c

Makefile

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ ifeq (${loop}, 1) 
	COMMON_FLAGS += -DWITH_LOOP

endif



ifeq (${wakeup}, 1)

	COMMON_FLAGS += -DWITH_WAKEUP

endif



include src/arch/${arch}/Makefile.inc



clean: arch_clean

include/esp8266/driver/stdin.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
#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

include/msp430fr5969lp/driver/stdin.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
#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

src/app/bench/main.cc

+0 −5
Original line number Diff line number Diff line
@@ -59,10 +59,5 @@ int main(void) 


	arch.idle_loop();



	//uart_setup();

	//uart_puts("\n" COL_YELLOW "dOS" COL_GREEN " > " COL_RESET);



	//arch_idle_loop();



	return 0;

}

src/app/ledblink/main.cc

+0 −88
Original line number Diff line number Diff line
@@ -7,89 +7,6 @@ 
#error makeflag timer_cycles=1 required

#endif



/*

void check_command(unsigned char argc, char** argv)

{

	unsigned char i2c_rxbuf[16];

	unsigned char i2c_txbuf[16];

	float buf = 0;

	int i;

	if (!strcmp(argv[0], "i2c")) {

		if (argc == 0) {

			uart_puterr("Usage: i2c <on|off|detect|gettemp> [-u]\n");

			return;

		}

		if (!strcmp(argv[1], "on")) {

			if ((argc >= 2) && !strcmp(argv[2], "-u")) {

				if (i2c_setup(1) < 0)

					uart_puterr("Error initializing I²C: Line is busy\n");

			} else {

				if (i2c_setup(0) < 0)

					uart_puterr("Error initializing I²C: Line is busy\n"

							"Do you have hardware pullups on SDA/SCL?\n");

			}

		} else if (!strcmp(argv[1], "off")) {

			uart_puterr("Error: not implemented yet\n");

		} else if (!strcmp(argv[1], "detect")) {

			i2c_scan();

		} else if (!strcmp(argv[1], "tc74")) {

			i2c_txbuf[0] = 0x00;

			i2c_xmit(0x4d, 1, 1, i2c_txbuf, i2c_rxbuf);

			uart_putint(i2c_rxbuf[0]);

			uart_puts("°C\n");

		} else if (!strcmp(argv[1], "lm75")) {

			i2c_txbuf[0] = 0x00;

			i2c_xmit(0x48, 1, 2, i2c_txbuf, i2c_rxbuf);

			uart_putfloat(i2c_rxbuf[0] + (i2c_rxbuf[1] / 256.0));

			uart_puts("°C\n");

		}

		else if (!strcmp(argv[1], "eepr")) {

			i2c_rxbuf[0] = 0;

			i2c_txbuf[0] = 0;

			i2c_txbuf[1] = argv[2][0];

			i2c_xmit(0x50, 2, 1, i2c_txbuf, i2c_rxbuf);

			uart_putint(i2c_rxbuf[0]);

			uart_puts("\n");

		}

		else if (!strcmp(argv[1], "eepw")) {

			i2c_txbuf[0] = 0;

			i2c_txbuf[1] = argv[2][0];

			i2c_txbuf[2] = argv[3][0];

			i2c_txbuf[3] = argv[3][1];

			i2c_txbuf[4] = argv[3][2];

			i2c_txbuf[5] = argv[3][3];

			i2c_txbuf[6] = argv[3][4];

			i2c_txbuf[7] = argv[3][5];

			i2c_xmit(0x50, 8, 0, i2c_txbuf, i2c_rxbuf);

		}

	} else if (!strcmp(argv[0], "sensors")) {

		for (i = 0; i < 32; i++) {

			buf += adc_gettemp();

			__delay_cycles(64000);

		}

		uart_puts("Temperature : ");

		uart_putfloat(buf / 32);

		uart_puts("°C avg / ");

		uart_putfloat(adc_gettemp());

		uart_puts("°C single\n    Voltage : ");

		uart_putfloat(adc_getvcc());

		uart_puts("V\n");

	} else if (!strcmp(argv[0], "spi")) {

		if (argc == 0) {

			uart_puterr("Usage: spi <on|off|sharp>\n");

			return;

		}

		if (!strcmp(argv[1], "on")) {

			spi_setup();

		}

	} else if (!strcmp(argv[0], "help")) {

		uart_puts("Supported commands: i2c sensors\n");

	} else {

		uart_puterr("Unknown command\n");

	}

}

*/



void loop(void)

{

	gpio.led_toggle(1);
@@ -114,10 +31,5 @@ int main(void) 


	arch.idle_loop();



	//uart_setup();

	//uart_puts("\n" COL_YELLOW "dOS" COL_GREEN " > " COL_RESET);



	//arch_idle_loop();



	return 0;

}