sync some commit errors

This commit is contained in:
Babz 2021-09-08 22:16:40 +02:00
parent aee32ef007
commit de083540c6
3 changed files with 16 additions and 3 deletions

View File

@ -1,7 +1,9 @@
#include <gint/cpu.h>
#include <gint/display.h>
#include <gint/drivers/r61524.h>
#include <gint/gint.h>
#include <gint/keyboard.h>
#include <gint/mpu/power.h>
#include <gint/timer.h>
#include "battery.h"
@ -10,6 +12,8 @@
#include <stdio.h>
#include "fe/fe.h"
static char *LOREM_IPSUM =
"Lorem ipsum dolor sit amet, consectetur adipiscing elit.\nNam vitae purus dolor.\nPraesent in ex tempus, auctor velit at, "
"vulputate sapien.\nAenean semper, dui vitae iaculis mattis, odio libero aliquet elit, nec tempor nisl turpis vel arcu.\n"
@ -75,6 +79,8 @@ int main(int isappli, int optnum) {
term_append(LOREM_IPSUM);
term_append("-----------------------------------------------------------------");
term_printf("isappli=%d optnum=%d\n", isappli, optnum);
set_statusbar(tick_ctr, shift_state, alpha_state, get_battery_voltage());
set_menubar();
tgrid_display();
@ -131,9 +137,11 @@ int main(int isappli, int optnum) {
gint_osmenu();
}
char buf[128];
sprintf(buf, "tick_ctr=%d key=0x%x mod=%d shift=%d alpha=%d\n", tick_ctr, kev.key, kev.mod, kev.shift, kev.alpha);
term_append(buf);
if (kev.key == KEY_MENU && shift_state && !alpha_state) {
return 1;
}
term_printf("tick_ctr=%d key=0x%x mod=%d shift=%d alpha=%d\n", tick_ctr, kev.key, kev.mod, kev.shift, kev.alpha);
set_statusbar(tick_ctr, shift_state, alpha_state, get_battery_voltage());
set_menubar();

View File

@ -2,6 +2,7 @@
.global __battery
.global __battery_type
.global __set_backlight
.global __set_quit_handler
.section ".text"
@ -34,6 +35,9 @@ __battery_type:
__set_backlight:
syscall(0x0199)
__set_quit_handler:
syscall(0x1E6E)
syscall_table:
.long 0x80020070

View File

@ -1,5 +1,6 @@
#include "term.h"
#include <ctype.h>
#include <gint/display.h>
#include <stdio.h>
#include <string.h>