aaron/discoverpixy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added more tft functions to common and emulator. Fixed eventloop.

Browse Source
This commit is contained in:
t-moe
2015-04-03 17:45:57 +02:00
parent 51089aaba1
commit 1f2af9f2fb
14 changed files with 194 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/app/app.c
View File

@@ -1,14 +1,27 @@
#include "app.h"
#include "tft.h"
#include "system.h"
#include <stdio.h>
void app_init() {
system_init();
tft_init();
tft_draw_line(10,10,30,40,0b11111);
//only testwise
tft_clear(WHITE);
tft_draw_pixel(0,0,GREEN);
tft_draw_pixel(320-1,240-1,GREEN);
tft_draw_line(10,10,30,40,RGB(0xFF,0,0xFF));
tft_draw_pixel(100,100,RED);
tft_draw_rectangle(120,120,20,30,BLUE);
tft_fill_rectangle(200,120,30,30,GREEN);
}
//app event loop
void app_process() {
/// printf("hello world\n");

2
common/lowlevel/ll_system.h Normal file
View File

@@ -0,0 +1,2 @@
bool ll_system_init();

14
common/lowlevel/ll_tft.h
View File

@@ -1,14 +1,10 @@
#include <stdint.h>
#ifdef __cplusplus
extern "C" {
#endif
bool ll_tft_init();
void ll_tft_clear(uint16_t color);
void ll_tft_draw_line(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t color);
#ifdef __cplusplus
}
#endif
void ll_tft_draw_pixel(uint16_t x,uint16_t y,uint16_t color);
void ll_tft_draw_rectangle(uint16_t x1,uint16_t y1,uint16_t x2,uint16_t y2, uint16_t color);
void ll_tft_fill_rectangle(uint16_t x1,uint16_t y1,uint16_t x2,uint16_t y2, uint16_t color);
void ll_tft_draw_bitmap_unscaled(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint8_t* dat);

8
common/system/system.c Normal file
View File

@@ -0,0 +1,8 @@
#include "system.h"
#include "ll_system.h"
bool system_init() {
return ll_system_init();
}

4
common/system/system.h Normal file
View File

@@ -0,0 +1,4 @@
#include <stdbool.h>
bool system_init();

24
common/tft/tft.c
View File

@@ -1,13 +1,35 @@
#include "tft.h"
#include "ll_tft.h"
//it might seems pointless to forward all the functions but we might also introduce functions which have some logic here
bool tft_init() {
return ll_tft_init();
}
void tft_clear(uint16_t color) {
ll_tft_clear(color);
}
void tft_draw_line(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t color) {
ll_tft_draw_line(x1,y1,x2,y2,color);
}
void tft_draw_pixel(uint16_t x,uint16_t y,uint16_t color) {
ll_tft_draw_pixel(x,y,color);
}
void tft_draw_rectangle(uint16_t x1,uint16_t y1,uint16_t x2,uint16_t y2, uint16_t color) {
//could be implemented with 4 lines instead of introducing a ll func
ll_tft_draw_rectangle(x1,y1,x2,y2,color);
}
void tft_fill_rectangle(uint16_t x1,uint16_t y1,uint16_t x2,uint16_t y2, uint16_t color) {
ll_tft_fill_rectangle(x1,y1,x2,y2,color);
}
void tft_draw_bitmap_unscaled(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint8_t* dat) {
ll_tft_draw_bitmap_unscaled(x,y,width,height,dat);
}

15
common/tft/tft.h
View File

@@ -1,5 +1,20 @@
#include<stdbool.h>
#include<stdint.h>
#define RGB(r,g,b) ((((r) & 0xF8) << 8) | (((g) & 0xFC) << 3) | (((b) & 0xF8) >> 3))
#define RED RGB(255,0,0)
#define GREEN RGB(0,255,0)
#define BLUE RGB(0,0,255)
#define WHITE RGB(255,255,255)
#define BLACK RGB(0,0,0)
#define HEX(h) (RGB(((h)>>16),((h)>>8),(h)))
bool tft_init();
void tft_clear(uint16_t color);
void tft_draw_line(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t color);
void tft_draw_pixel(uint16_t x,uint16_t y,uint16_t color);
void tft_draw_rectangle(uint16_t x1,uint16_t y1,uint16_t x2,uint16_t y2, uint16_t color);
void tft_fill_rectangle(uint16_t x1,uint16_t y1,uint16_t x2,uint16_t y2, uint16_t color);
void tft_draw_bitmap_unscaled(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint8_t* dat);

17
emulator/Makefile
View File

@@ -10,17 +10,20 @@ COMMON_DIR=../common
#Tools
CC=gcc
MAKE=make
MKDIR=mkdir -p
RM=rm -f
RMDIR=rm -rf
COMMON_INC=-I$(COMMON_DIR)/lowlevel -I$(COMMON_DIR)/tft
QT_LIB=$(QT_DIR)/libemulatorqt.a
CPPFLAGS= -march=x86-64 -mtune=generic -fPIC $(COMMON_INC)
CFLAGS= -O0 -g
LDFLAGS= -L$(QT_DIR) -lQt5Core -lQt5Gui -lQt5Widgets -lemulatorqt -lm -lstdc++ #--specs=nosys.specs -Wl,--gc-sections
LDFLAGS= -L$(QT_DIR) -lQt5Core -lQt5Gui -lQt5Widgets -lemulatorqt -lm -lstdc++
#Finding Input files
CFILES=$(shell find . -maxdepth 1 -name '*.c')
@@ -31,20 +34,17 @@ OBJS=$(patsubst ./%,$(OBJ_DIR)/%,$(CFILES:.c=.o))
COMMON_OBJS=$(patsubst $(COMMON_DIR)/%,$(OBJ_DIR)/%,$(COMMON_CFILES:.c=.o))
#Keep the objects files
.SECONDARY: $(OBJS)
#Mark targets which are not "file-targets"
.PHONY: all clean qt
.PHONY: all clean
# List of all binaries to build
all: $(BUILD_DIR)/$(TARGET)
all: $(BUILD_DIR)/$(TARGET) $(OBJS) $(QT_LIB)
qt:
$(QT_LIB):
cd $(QT_DIR) && qmake &&make
#objects to elf
$(BUILD_DIR)/$(TARGET): $(OBJS) $(COMMON_OBJS) |qt
$(BUILD_DIR)/$(TARGET): $(OBJS) $(COMMON_OBJS) $(QT_LIB)
@echo Linking...
$(MKDIR) $(BUILD_DIR)
$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $^ $(LDFLAGS)
@@ -66,6 +66,7 @@ $(OBJ_DIR)/%.o: $(COMMON_DIR)/%.c
#Clean Obj files and builded stuff
clean:
cd $(QT_DIR) && $(MAKE) clean && $(RM) Makefile && $(RM) *.a
$(RMDIR) $(BUILD_DIR) $(OBJ_DIR)

3
emulator/qt/emulatorqt.pro
View File

@@ -13,7 +13,8 @@ CONFIG += staticlib
SOURCES += \
mainwindow.cpp \
main.cpp \
ll_tft.cpp
ll_tft.cpp \
ll_system.cpp
HEADERS += \
mainwindow.h \

7
emulator/qt/ll_system.cpp Normal file
View File

@@ -0,0 +1,7 @@
extern "C" {
#include "ll_system.h"
}
bool ll_system_init() {
return true;
}

27
emulator/qt/ll_tft.cpp
View File

@@ -1,6 +1,10 @@
#include "mainwindow.h"
#include <QDebug>
extern "C" {
#include "ll_tft.h"
}
MainWindow* mainwindow;
@@ -15,3 +19,26 @@ bool ll_tft_init() {
void ll_tft_draw_line(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t color) {
mainwindow->draw_line(x1,y1,x2,y2,color);
}
void ll_tft_clear(uint16_t color) {
mainwindow->clear(color);
}
void ll_tft_draw_pixel(uint16_t x,uint16_t y,uint16_t color) {
mainwindow->draw_pixel(x,y,color);
}
void ll_tft_draw_rectangle(uint16_t x1,uint16_t y1,uint16_t x2,uint16_t y2, uint16_t color) {
mainwindow->draw_rectangle(x1,y1,x2,y2,color);
}
void ll_tft_fill_rectangle(uint16_t x1,uint16_t y1,uint16_t x2,uint16_t y2, uint16_t color) {
mainwindow->fill_rectangle(x1,y1,x2,y2,color);
}
void ll_tft_draw_bitmap_unscaled(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint8_t* dat) {
mainwindow->draw_bitmap_unscaled(x,y,width,height,dat);
}

20
emulator/qt/main.cpp
View File

@@ -3,29 +3,29 @@
extern "C" {
void qt_init(int argc, char* argv[]);
int qt_execute();
void app_init();
void app_process();
void qt_init(int argc, char* argv[]); //Will be called at the top of the main() function
int qt_execute(); //Will be called after calling qt_execute
void app_init(); //Initializes the app
void app_process(); //Processes one eventloop of the app
}
QApplication* app_ptr;
QApplication* app_ptr=NULL;
void qt_init(int argc, char* argv[]) {
static QApplication app(argc,argv);
app_ptr = &app;
app_ptr = new QApplication(argc,argv);
app_init();
}
void app_loop() {
while(1) {
while(QApplication::activeWindow()!=NULL) {
app_process();
QApplication::processEvents();
}
}
int qt_execute() {
QtConcurrent::run(&app_loop);
return app_ptr->exec();
int ret= app_ptr->exec();
delete app_ptr;
return ret;
}

64
emulator/qt/mainwindow.cpp
View File

@@ -4,22 +4,26 @@
#include <QPainter>
#include <math.h>
#define DISPLAY_WIDTH 320
#define DISPLAY_HEIGHT 240
#define DISPLAY_X 100
#define DISPLAY_Y 100
QColor colorFromRGB565(uint16_t color) {
int R8 = (int) floor( (color>>(5+6)) * 255.0 / 31.0 + 0.5);
int G8 = (int) floor( ((color>>5)&0x2F) * 255.0 / 63.0 + 0.5);
int B8 = (int) floor( (color&0x1F) * 255.0 / 31.0 + 0.5);
return QColor::fromRgb(R8,G8,B8);
}
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
pixmap(320,240),
pixmap(DISPLAY_WIDTH,DISPLAY_HEIGHT),
ui(new Ui::MainWindow)
{
ui->setupUi(this);
}
void MainWindow::draw_line(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t color)
@@ -32,14 +36,61 @@ void MainWindow::draw_line(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, u
render_mutex.unlock();
}
void MainWindow::draw_pixel(uint16_t x, uint16_t y, uint16_t color)
{
render_mutex.lock();
QPainter painter(&(pixmap));
painter.setPen(colorFromRGB565(color));
painter.drawPoint(x,y);
render_mutex.unlock();
}
void MainWindow::clear(uint16_t color)
{
render_mutex.lock();
pixmap.fill(colorFromRGB565(color));
render_mutex.unlock();
}
void MainWindow::draw_rectangle(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t color)
{
render_mutex.lock();
QPainter painter(&(pixmap));
painter.setPen(colorFromRGB565(color));
painter.drawRect(x1,y1,x2,y2);
render_mutex.unlock();
}
void MainWindow::fill_rectangle(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t color)
{
render_mutex.lock();
QPainter painter(&(pixmap));
painter.fillRect(x1,y1,x2,y2,colorFromRGB565(color));
render_mutex.unlock();
}
void MainWindow::draw_bitmap_unscaled(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint8_t *dat)
{
render_mutex.lock();
QPainter painter(&(pixmap));
for(int yi=0; yi<height; yi++) {
for(int xi=0; xi<width; xi++) {
painter.setPen(colorFromRGB565(dat[yi*width+xi]));
painter.drawPoint(x+xi,y+yi);
}
}
render_mutex.unlock();
}
void MainWindow::paintEvent(QPaintEvent *)
{
render_mutex.lock();
QPainter painter(this);
painter.drawPixmap(100,100,pixmap);
painter.setPen(Qt::green);
painter.drawRect(100-1,100-1,320+2,240+2);
painter.drawPixmap(DISPLAY_X,DISPLAY_Y,pixmap);
painter.setPen(QPen(Qt::green,2));
painter.drawRect(DISPLAY_X-1,DISPLAY_Y-1,DISPLAY_WIDTH+2,DISPLAY_HEIGHT+2);
render_mutex.unlock();
}
@@ -48,3 +99,4 @@ MainWindow::~MainWindow()
{
delete ui;
}

9
emulator/qt/mainwindow.h
View File

@@ -16,9 +16,15 @@ class MainWindow : public QMainWindow
public:
explicit MainWindow(QWidget *parent = 0);
void draw_line(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t color);
void draw_pixel(uint16_t x,uint16_t y,uint16_t color);
void clear(uint16_t color);
void draw_rectangle(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t color);
void fill_rectangle(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t color);
void draw_bitmap_unscaled(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint8_t* dat);
protected:
void paintEvent(QPaintEvent * evt);
~MainWindow();
private:
@@ -26,5 +32,6 @@ private:
QPixmap pixmap;
Ui::MainWindow *ui;
};
#endif // MAINWINDOW_H