From fbf95edb5804ca6aa761a4bd894faacb003b9080 Mon Sep 17 00:00:00 2001
From: Tristan Krause <tristan.krause@stud.htwk-leipzig.de>
Date: Fri, 21 Jun 2019 15:55:04 +0200
Subject: [PATCH] ui improved

---
 control/src/cli.cpp   | 5 ++++-
 control/src/ui/ui.cpp | 2 +-
 firmware/Makefile     | 2 +-
 firmware/requests.h   | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/control/src/cli.cpp b/control/src/cli.cpp
index 6abc7a2..32ae9ab 100644
--- a/control/src/cli.cpp
+++ b/control/src/cli.cpp
@@ -19,6 +19,9 @@
 #include "ui/view_monitor.h"
 #include "ui/view_promt.h"
 
+constexpr uint8_t WIN_WIDTH = 80;
+constexpr uint8_t WIN_HEIGHT = 24;
+
 volatile int win_changed_cooldown = 0;
 volatile bool t_refresh_active = false;
 
@@ -97,7 +100,7 @@ void init()
     signal(SIGINT, signal_handler);
 
     // set view context
-    View::setWinContext(newwin(25, 85, 0, 0));
+    View::setWinContext(newwin(WIN_HEIGHT, WIN_WIDTH, 0, 0));
 }
 
 
diff --git a/control/src/ui/ui.cpp b/control/src/ui/ui.cpp
index 0aee3ac..96d164a 100644
--- a/control/src/ui/ui.cpp
+++ b/control/src/ui/ui.cpp
@@ -272,7 +272,7 @@ void show_selftest_info(int)
 {
     ViewInfo* view = new ViewInfo();
     view->setTitle("Selbsttest");
-    view->setText("Bitte entfernen Sie jetzt alle Draehte von den Anschlussklemmen und bestaetigen\nmit Enter.");
+    view->setText("Bitte entfernen Sie jetzt alle Draehte von den Anschlussklemmen und\nbestätigen mit Enter.");
     view->setLabelClose("[ Weiter ]");
     view->setCall(&start_selftest);
     view->repaint();
diff --git a/firmware/Makefile b/firmware/Makefile
index ee97885..c8d79c2 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -18,7 +18,7 @@ OBJCOPY_PATH = avr-objcopy
 PROGRAMMER = avrispmkII
 OUTPUT     = b15f.elf
 HEX	   	   = b15f.hex
-MCU        = atmega1284
+MCU        = atmega1284p
 CFLAGS     = -Wall -Wextra -std=c++14 -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
diff --git a/firmware/requests.h b/firmware/requests.h
index ff4ea8d..4e21bf6 100644
--- a/firmware/requests.h
+++ b/firmware/requests.h
@@ -24,7 +24,7 @@ uint8_t const rq_len[] = {
 	1 /* RQ_DISCARD */,
 	1 /* RQ_TEST */ + 1 /* test byte */,
 	1 /* RQ_INFO */,
-	1 /* RQ_INFO */ + 1 /* test int high low */ + 1 /* test int high high */,
+	1 /* RQ_INT_TEST */ + 1 /* test int high low */ + 1 /* test int high high */,
 	1 /* RQ_SELF_TEST */,
 	1 /* RQ_DIGITAL_WRITE_0 */ + 1 /* port value */,
 	1 /* RQ_DIGITAL_WRITE_1 */ + 1 /* port value */,