From ee76b25ba3a55cd3eef740c3a568aca1f68366fc Mon Sep 17 00:00:00 2001 From: Tristan Krause Date: Fri, 28 Jun 2019 16:10:22 +0200 Subject: [PATCH] raspberry pi fixes --- control/src/Makefile | 2 +- control/src/commit_hash.h | 4 ++++ control/src/ui/view_monitor.cpp | 7 +++++++ firmware/Makefile | 2 +- install | 2 +- 5 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 control/src/commit_hash.h diff --git a/control/src/Makefile b/control/src/Makefile index cd8c2b7..2aabfc2 100644 --- a/control/src/Makefile +++ b/control/src/Makefile @@ -26,7 +26,7 @@ OUT_PLOTTY = $(PATH_BIN)/plotty OUT_DOC = ../../docs/html # compiling & linking parameters -CFLAGS = -std=c++17 -O3 -Wall -Wextra -fPIC +CFLAGS = -std=c++14 -O3 -Wall -Wextra -fPIC LDFLAGS_DRV = -lcurses -lpthread LDFLAGS_CLI = $(LDFLAGS_DRV) -lb15fdrv diff --git a/control/src/commit_hash.h b/control/src/commit_hash.h new file mode 100644 index 0000000..e9bbe3e --- /dev/null +++ b/control/src/commit_hash.h @@ -0,0 +1,4 @@ +#ifndef COMMIT_HASH_H +#define COMMIT_HASH_H +const char COMMIT_HASH[] = "e016a52459314099549511bb1fed60b3e8f58fa3"; +#endif // COMMIT_HASH_H diff --git a/control/src/ui/view_monitor.cpp b/control/src/ui/view_monitor.cpp index 43c9f11..7b63702 100644 --- a/control/src/ui/view_monitor.cpp +++ b/control/src/ui/view_monitor.cpp @@ -78,7 +78,14 @@ void ViewMonitor::worker() { try { + +#ifdef __arm__ + // Raspberry Pi is much slower + std::this_thread::sleep_for(std::chrono::milliseconds(1000)); +#else + // normal PC is faster std::this_thread::sleep_for(std::chrono::milliseconds(100)); +#endif uint8_t be0 = drv.digitalRead0(); uint8_t be1 = drv.digitalRead1(); diff --git a/firmware/Makefile b/firmware/Makefile index d5b62ae..a1188d9 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -19,7 +19,7 @@ PROGRAMMER = avrispmkII OUTPUT = b15f.elf HEX = b15f.hex MCU = atmega1284p -CFLAGS = -Wall -Wextra -std=c++14 -O3 -mmcu=$(MCU) -DF_CPU=$(F_CPU) $(DEBUG) +CFLAGS = -Wall -Wextra -std=c++11 -O3 -mmcu=$(MCU) -DF_CPU=$(F_CPU) $(DEBUG) LDFLAGS = OBJECTS = main.o spi.o mcp23s17.o tlc5615.o adu.o selftest.o global_vars.o usart.o request_handlers.o interrupts.o pwm.o servo.o diff --git a/install b/install index 6b6190e..eead0e4 100755 --- a/install +++ b/install @@ -10,7 +10,7 @@ udev_rule="SUBSYSTEM!=\"usb_device\", ACTION!=\"add\", GOTO=\"avrisp_end\"\n\nAT udev_path="/etc/udev/rules.d/60-olimex.rules" mcu_cfg="/etc/b15f.mcu" declare -a known_mcus=("atmega1284" "atmega1284p") -declare -a known_users=("famulus") +declare -a known_users=("famulus" "pi") function hr1 {