Commit ff2c23e3 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

esp8266: add counter driver

parent 463eea48

include/arch/esp8266/driver/stdout.h

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ class StandardOutput { 
		StandardOutput & operator<<(long number);

		StandardOutput & operator<<(unsigned long long number);

		StandardOutput & operator<<(long long number);

		StandardOutput & operator<<(float number);

		StandardOutput & operator<<(double number);

		StandardOutput & operator<<(void *pointer);

		StandardOutput & operator<<(const char *text);

		StandardOutput & operator<<(StandardOutput & (*fun) (StandardOutput &));

src/arch/esp8266/Makefile.inc

+5 −1
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ ifneq ($(findstring stdin,${arch_drivers}), ) 
	CXX_TARGETS += src/arch/esp8266/driver/stdin.cc

endif



ifneq ($(findstring counter,${arch_drivers}), )

	CXX_TARGETS += src/arch/esp8266/driver/counter.cc

endif



.cc.o:

	${QUIET}${CXX} ${INCLUDES} ${COMMON_FLAGS} ${CXXFLAGS} -c -o $@ ${@:.o=.cc}

	${QUIET}${OBJCOPY} --rename-section .text=.irom0.text --rename-section .literal=.irom0.literal $@
@@ -47,7 +51,7 @@ build/system.ar: ${OBJECTS} 
build/system.elf: build/system.ar

	${CC} -L${SDK_BASE}/lib -T${SDK_BASE}/lib/eagle.app.v6-derf.ld ${LDFLAGS} \

		-Wl,--start-group -lc -lgcc -lhal -lpp -lphy -lnet80211 -llwip -lwpa \

		-lmain $< -Wl,--end-group -o $@

		-lmain -flto $< -Wl,--end-group -o $@



build/0x00000.bin: build/system.elf

	${ESPTOOL} --chip esp8266 elf2image -o build/ $<

src/arch/esp8266/driver/stdout.cc

+14 −2
Original line number Diff line number Diff line
@@ -67,7 +67,19 @@ StandardOutput & StandardOutput::operator<<(long number) 
	return *this;

}



StandardOutput & StandardOutput::operator<<(unsigned long long number)

StandardOutput & StandardOutput::operator<<(float number)

{

	printf_float(number);

	return *this;

}



StandardOutput & StandardOutput::operator<<(double number)

{

	printf_float(number);

	return *this;

}



ICACHE_FLASH_ATTR StandardOutput & StandardOutput::operator<<(unsigned long long number)

{

	switch (base) {

	case 2:
@@ -164,7 +176,7 @@ void StandardOutput::printf_uint8(uint8_t num) 
	put(format_hex_nibble(num % 16));

}



void StandardOutput::printf_float(float num)

ICACHE_FLASH_ATTR void StandardOutput::printf_float(float num)

{

	if (num < 0) {

		put('-');