lauchmelder/b15f
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

ui improved

Browse source
This commit is contained in:
Tristan Krause 2019-06-21 15:55:04 +02:00
parent 5401635968
commit fbf95edb58
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
control/src/cli.cpp
View file

@ -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));
}

2
control/src/ui/ui.cpp
View file

@ -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();

2
firmware/Makefile
View file

@ -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

2
firmware/requests.h
View file

@ -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 */,