89 Commits

Author SHA1 Message Date
b4623992ef b cmake
fix minimum version
2026-01-11 14:54:09 +01:00
b8553067d1 b tcp cmd docs 2026-01-11 14:53:50 +01:00
c0b4a014f5 b tcp cmd
fix error only showing when 1 param is provided
2026-01-11 14:49:23 +01:00
fffbf6e8db tcp_cmd
fix the tests
2023-12-27 13:00:21 +01:00
d627da2999 tcp_cnd
fix warning of casting const to non const
2023-12-27 13:00:21 +01:00
1ec27e9ee3 tcp_cmd
0 is alpha ff is opaque
2023-12-27 13:00:21 +01:00
6bc074a033 tcp_cmd
add capability of using ls as well as listfiles
2023-12-27 13:00:21 +01:00
87b6fecfd0 tcp_cmd
Doxygen: Add in, out
Move some stuff around to have a nicer ordering
2023-12-27 13:00:21 +01:00
3a745af9bf tcp_cmd
change the name of the define/ifdef to make it more obvious what it does
2023-12-27 13:00:21 +01:00
2a4de4fe34 tcp_cmd
split common code for colour conversion into a separate function
2023-12-27 13:00:21 +01:00
86f0a3bedc tcp_cmd
fix bug of tcp_cmd_bg_color writing to color_txt when in argb mode
2023-12-27 13:00:21 +01:00
a37213b128 tcp_cmd
add shift_args and use it in the parser function
2023-12-27 13:00:21 +01:00
992b9f3063 tcp_cmd
fix tests
2023-12-27 13:00:21 +01:00
589f56ecbd tcp_cmd
split parser into separate functions that handle specific commands
2023-12-27 13:00:21 +01:00
bd89deceb6 tcp_cmd
- Add putty compatibility
- Fix debug message with garbage cmd string if you press enter twice by zero initialising variables and checking when printing
2023-12-27 13:00:21 +01:00
5c5fda62e6 tcp_cmd
fix second message of unknown command
2023-12-27 13:00:21 +01:00
76f3044d21 tcp_cmd
fix p->len to p->total_len
2023-12-27 13:00:21 +01:00
f3818e805a tcp_cmd
make default color white text on black background
2023-12-27 13:00:21 +01:00
6ee9e305cc tcp_cmd
update casting of lcd_display_text following the standardisation of the lcd_api
2023-12-27 13:00:21 +01:00
f7dc10c7bb tcp_cmd
Remove author because I rewrote this thing from the tcp_echo example
2023-12-27 13:00:21 +01:00
b9a6566267 tcp_cmd
remove tcp_cmd_get_filename_ext and move over to llfs variant
2023-12-27 13:00:05 +01:00
2d526b899a tcp_cmd
fix some log strings
2023-12-27 13:00:05 +01:00
f8251a3e74 tcp_cmd
fix some usage strings
2023-12-27 13:00:05 +01:00
e42cbc31ba tcp_cmd
add text help for x y mode
2023-12-27 13:00:05 +01:00
a1add6b61b tcp_cmd
add argb capability to color and bgcolor
2023-12-27 13:00:05 +01:00
21a0207873 tcp_cmd
use tcp_cmd_remove_leading_space
2023-12-27 13:00:05 +01:00
b1f952ec58 tcp_cmd
fix tcp_cmd_remove_leading_space if str is null
2023-12-27 13:00:05 +01:00
d5495e2e84 tcp_cmd
fix casting issue
2023-12-27 13:00:05 +01:00
414e53e6e9 tcp_cmd
Add tcp_cmd_remove_leading_space + tests
2023-12-27 13:00:05 +01:00
35656af040 tcp_cmd
fix all tests
2023-12-27 13:00:05 +01:00
8a9df4d883 tcp_cmd
add tcp_cmd_ prefix
2023-12-27 13:00:05 +01:00
12a7221a2e mocs
fix moc of lcd_display_text to match function in lcd_api.h
2023-12-27 13:00:05 +01:00
55ea5b31e1 tcp_cmd
add functions that need to be tested to header file
2023-12-27 13:00:05 +01:00
6a0be6e469 tcp_cmd
fix remove_newline function
2023-12-27 12:59:48 +01:00
5268ad0b7a tcp_cmd
remove \r
2023-12-27 12:59:48 +01:00
1072e349c0 tcp_cmd
After testing
2023-12-27 12:59:48 +01:00
2d345b04c3 tcp_cmd
add error checking to init function
2023-12-27 12:59:48 +01:00
3d51fde427 tcp_cmd
Add doxygen documentation to the functions
2023-12-27 12:59:48 +01:00
9f48f4eef1 tcp_cmd
make some functions static
add static function declaration
2023-12-27 12:59:48 +01:00
d3d6cada0a tcp_cmd
Add doxygen headers
2023-12-27 12:59:22 +01:00
40662b33aa tcp_cmd
add testing of stdout both if moc's in DEBUG mode or not
2023-12-27 12:59:07 +01:00
b7a924719e tcp_cmd
move functions from test file to project
2023-12-27 12:59:07 +01:00
5bc3250c15 tcp_cmd
Move next ptr to the top
2023-12-27 12:57:57 +01:00
ed2e7ef650 tcp_cmd
add return parameter to tcp_cmd_parser to keep the connection open or closed
2023-12-27 12:57:57 +01:00
0f1f041cbf tcp_cmd
format
remove dangling else if when every other thing is if
use Lorenz's way of tcp_recv_cb
2023-12-27 12:57:57 +01:00
9aa53db35f modbus_tcp
add lwip_strerr
fix tcp_close
2023-12-27 12:57:57 +01:00
84f5a61ddf tcp_cmd
found out that my atoi converter didn't work, so I switched back to strtol
2023-12-27 12:57:57 +01:00
9885971549 tcp_cmd
Remov some casting warnings
2023-12-27 12:57:57 +01:00
7c86563242 tcp_cmd
add more dprint in the mocs
2023-12-27 12:57:57 +01:00
edc60bafb8 tcp_cmd
add some unused tags back, when in normal mode this gave some warnings
2023-12-27 12:57:57 +01:00
d7ff0010bd tcp_cmd
add pbuf_copy_partial moc so I don't need if TESTING preprocessor directive
2023-12-27 12:57:48 +01:00
f16e92b7d8 tcp_cmd
Move over to internal (small) buffer because pbuf data is not null terminated
2023-12-27 12:57:30 +01:00
16c40ce7fe tcp_cmd
change null termination from realloc to internal array
2023-12-27 12:57:30 +01:00
6ceee577de tcp_cmd
Make sure p->payload is null terminated
2023-12-27 12:57:30 +01:00
56846b7643 tcp_cmd
fix spacing in print help
2023-12-27 12:57:30 +01:00
2508d365c3 tcp_cmd
Add docs for the version in test/
2023-12-27 12:57:30 +01:00
42675a5fe1 testing for tcp_cmd
add testing files
2023-12-27 12:57:30 +01:00
843c234bcf tcp_cmd
add testing capabilities to header file
2023-12-27 12:57:30 +01:00
e9bcf0e712 tcp_cmd
change include from <> to ""
fix some aligning of the tcp_cmd_print_help
remove endptr
cast strtoul
cast lcd_display_text
2023-12-27 12:57:11 +01:00
2baa820683 tcp_cmd
convert text to english
2023-12-27 12:57:11 +01:00
a784f3c33f tcp_cmd
create wrapper for tcp_write function
create print header and help function
2023-12-27 12:57:11 +01:00
9cc94f25f2 tcp_cmd
remove tcp_buffer
2023-12-27 12:56:45 +01:00
Roelandts_Gert
3cfb22f590 Added flags to tcp_write 2023-12-27 12:56:45 +01:00
Roelandts_Gert
e924f2b82d Update tcp_cmd.c 2023-12-27 12:56:23 +01:00
Roelandts_Gert
31e761300a Update tcp_cmd.c 2023-12-27 12:56:23 +01:00
Roelandts_Gert
fb44367da7 Fixed lcd_display_text 2023-12-27 12:56:23 +01:00
Roelandts_Gert
6de8684d89 renamed files from cmd to tcp_cmd 2023-12-27 12:56:23 +01:00
Roelandts_Gert
61d2994e40 Update code to Styleguide 2023-12-27 12:55:52 +01:00
Roelandts_Gert
8be959eefd Clear in exit command
clears screen if application is terminated
2023-12-27 12:55:52 +01:00
Roelandts_Gert
e852d29824 Added clear support and cleaned up code 2023-12-27 12:55:52 +01:00
Roelandts_Gert
f11f71020d includes from cmd.c to cmd.h 2023-12-27 12:55:52 +01:00
Roelandts_Gert
1bcd9f1113 Added clear functionality
Added lcd_clear_text and lcd_clear_images infront of each write function to the screen
2023-12-27 12:55:52 +01:00
Roelandts_Gert
398bb2efde Update to setImage command
Added checks to see if file exist in filesystem and if extension is supported (bmp of gif)
2023-12-27 12:55:52 +01:00
Roelandts_Gert
26f2655e3f Added support for setImage command for .bmp files
Implemented code for displaying .bmp images with the steImage command.
2023-12-27 12:55:52 +01:00
Roelandts_Gert
e34b2855ba Implementation of llfs and display API
Implementation of llfs and display API. Using the functions from the llfs and display API in my code
2023-12-27 12:55:52 +01:00
Roelandts_Gert
9f25995c82 Added cmd.c and cmd.h
Functions in main copied to cmd.c
2023-12-27 12:55:52 +01:00
e5273c7012 clangformat everything 2023-12-23 21:37:08 +01:00
e19e7c9253 website backend
fix warning
2023-12-23 16:25:16 +01:00
50fe918561 tests
fix tftp tests
2023-12-23 16:17:36 +01:00
9d18c40a43 tests
Change sources and include to cmake path instead of relative path
2023-12-23 16:17:21 +01:00
Roelandts_Gert
fc87693d64 Merge pull request #35 from Sani7/website_02
Website 02
2023-12-11 14:57:16 +01:00
TeunBugwood
5279b14975 img 0 0 2023-12-11 14:45:27 +01:00
TeunBugwood
af0c6ad421 data file 2023-12-11 14:43:09 +01:00
TeunBugwood
ebd0479cd9 img 2023-12-11 14:40:50 +01:00
TeunBugwood
d1991d9abc updated tabs etc 2023-12-11 14:03:42 +01:00
TeunBugwood
5b0666920c Update main.c 2023-12-11 14:01:24 +01:00
TeunBugwood
cd2839e6ca Update website_backend.c 2023-12-11 13:34:47 +01:00
TeunBugwood
dd176256bb WBE update
Fixed some things that made the site not work. This is not the final version, just for the demo.
2023-12-11 13:31:46 +01:00
TeunBugwood
ec09cb9625 New website branch
previous was doomed, that is why I made a new brench that was updated with the main.
2023-12-11 13:20:19 +01:00
44 changed files with 253299 additions and 47092 deletions

View File

@@ -1,15 +1,11 @@
#include "about.h"
#include "ui_about.h"
About::About(QWidget *parent) :
QDialog(parent),
ui(new Ui::About)
{
About::About(QWidget* parent) : QDialog(parent), ui(new Ui::About) {
ui->setupUi(this);
ui->lblVersion->setText(ui->lblVersion->text() + " " + __DATE__ + " " + __TIME__);
}
About::~About()
{
About::~About() {
delete ui;
}

View File

@@ -7,8 +7,7 @@ namespace Ui {
class About;
}
class About : public QDialog
{
class About : public QDialog {
Q_OBJECT
public:

View File

@@ -2,8 +2,7 @@
#include <QApplication>
int main(int argc, char *argv[])
{
int main(int argc, char* argv[]) {
QApplication a(argc, argv);
MainWindow w;
w.show();

View File

@@ -1,17 +1,13 @@
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include "QUdpSocket"
#include "ui_mainwindow.h"
MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent)
, ui(new Ui::MainWindow)
{
MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWindow) {
ui->setupUi(this);
m_udpSocket = new QUdpSocket(this);
m_udpSocket->bind(QHostAddress::Any, UDP_PORT, QUdpSocket::ShareAddress);
connect(m_udpSocket, &QUdpSocket::readyRead,
this, &MainWindow::processPendingDatagrams);
connect(m_udpSocket, &QUdpSocket::readyRead, this, &MainWindow::processPendingDatagrams);
// Timer just to ask twice (udp)
m_timer = new QTimer(this);
@@ -32,29 +28,25 @@ MainWindow::MainWindow(QWidget *parent)
}
// //Example items for screenshot:
// QListWidgetItem * item = new QListWidgetItem(QIcon(":/res/stm32.png"), "00:80:E1:05:44:21 @ 192.168.0.11 (John Doe)");
// ui->devices->addItem(item);
// QListWidgetItem * item2 = new QListWidgetItem(QIcon(":/res/rpi.png"), "E4:5F:01:05:44:21 @ 192.168.0.11 (Jane Doe)");
// ui->devices->addItem(item2);
// QListWidgetItem * item3 = new QListWidgetItem(QIcon(":/res/unknown.png"), "44:44:44:05:44:21 @ 192.168.0.11 (Juul Doe)");
// QListWidgetItem * item = new QListWidgetItem(QIcon(":/res/stm32.png"), "00:80:E1:05:44:21 @ 192.168.0.11 (John
// Doe)"); ui->devices->addItem(item); QListWidgetItem * item2 = new QListWidgetItem(QIcon(":/res/rpi.png"),
// "E4:5F:01:05:44:21 @ 192.168.0.11 (Jane Doe)"); ui->devices->addItem(item2); QListWidgetItem * item3 = new
// QListWidgetItem(QIcon(":/res/unknown.png"), "44:44:44:05:44:21 @ 192.168.0.11 (Juul Doe)");
// ui->devices->addItem(item3);
connect(ui->actionAbout_Qt, &QAction::triggered, QApplication::aboutQt);
}
MainWindow::~MainWindow()
{
MainWindow::~MainWindow() {
delete ui;
}
void MainWindow::on_pbRefresh_clicked()
{
void MainWindow::on_pbRefresh_clicked() {
this->func = 0;
SendRequest();
m_timer->start();
}
void MainWindow::SendRequest()
{
void MainWindow::SendRequest() {
int broadcasts_send = 0;
int data_send = 0;
QUdpSocket udpSocket;
@@ -77,16 +69,15 @@ void MainWindow::SendRequest()
}
}
}
}
else if(this->func == 1){
} else if (this->func == 1) {
QHostAddress addr(ui->comboBox->currentText());
udpSocket.writeDatagram(this->data, addr, UDP_PORT);
data_send++;
}
if (broadcasts_send == 0 && data_send == 0) {
ui->pteLog->appendPlainText("Warning: no Network Interface Cards or valid IP adresses found (no broadcasts send)");
ui->pteLog->appendPlainText(
"Warning: no Network Interface Cards or valid IP adresses found (no broadcasts send)");
} else if (data_send != 0) {
ui->pteLog->appendPlainText(tr("Info: %1 message sent to %2").arg(data_send).arg(ui->comboBox->currentText()));
} else {
@@ -94,8 +85,7 @@ void MainWindow::SendRequest()
}
}
void MainWindow::processPendingDatagrams()
{
void MainWindow::processPendingDatagrams() {
QByteArray datagram;
QHostAddress host;
@@ -114,13 +104,9 @@ void MainWindow::processPendingDatagrams()
}
}
void MainWindow::processDatagram(QString msg,QString host)
{
void MainWindow::processDatagram(QString msg, QString host) {
// Append received data to log
QString logLine = tr("Van %1: \"%2\"")
.arg(host)
.arg(msg);
QString logLine = tr("Van %1: \"%2\"").arg(host).arg(msg);
ui->pteLog->appendPlainText(logLine);
// We receive our own request. So a check to see if it is the request:
@@ -133,9 +119,9 @@ void MainWindow::processDatagram(QString msg,QString host)
ui->comboBox->addItem(host);
}
// RegEx for MAC adress
QRegularExpression macRegExp("([0-9A-F]{2})[:-]([0-9A-F]{2})[:-]([0-9A-F]{2})[:-]([0-9A-F]{2})[:-]([0-9A-F]{2})[:-]([0-9A-F]{2})");
QRegularExpression macRegExp(
"([0-9A-F]{2})[:-]([0-9A-F]{2})[:-]([0-9A-F]{2})[:-]([0-9A-F]{2})[:-]([0-9A-F]{2})[:-]([0-9A-F]{2})");
QRegularExpressionMatch match = macRegExp.match(msg.toUpper());
if (match.hasMatch()) {
QString foundOUI = match.captured(1) % match.captured(2) % match.captured(3);
@@ -176,8 +162,7 @@ void MainWindow::processDatagram(QString msg,QString host)
}
}
QListWidgetItem *MainWindow::searchItem(QString MAC)
{
QListWidgetItem* MainWindow::searchItem(QString MAC) {
QListWidgetItem* item = nullptr;
for (int i = 0; i < ui->devices->count(); i++) {
item = ui->devices->item(i);
@@ -189,8 +174,7 @@ QListWidgetItem *MainWindow::searchItem(QString MAC)
return item;
}
void MainWindow::on_devices_itemDoubleClicked(QListWidgetItem *item)
{
void MainWindow::on_devices_itemDoubleClicked(QListWidgetItem* item) {
// Copy the IP to the clipboard
QString itemText = item->text();
int start = itemText.indexOf('@') + 2;
@@ -200,8 +184,7 @@ void MainWindow::on_devices_itemDoubleClicked(QListWidgetItem *item)
clipboard->setText(ip);
}
void MainWindow::on_devices_customContextMenuRequested(const QPoint &pos)
{
void MainWindow::on_devices_customContextMenuRequested(const QPoint& pos) {
// create menu
QAction copyAction(QIcon(":/res/copy-icon.png"), "Copy IP");
QMenu menu;
@@ -217,42 +200,30 @@ void MainWindow::on_devices_customContextMenuRequested(const QPoint &pos)
}
}
void MainWindow::on_actionAbout_triggered()
{
void MainWindow::on_actionAbout_triggered() {
About ab(this);
ab.exec();
}
void MainWindow::on_name_textEdited(const QString &arg1)
{
void MainWindow::on_name_textEdited(const QString& arg1) {
this->name = arg1;
}
void MainWindow::on_surname_textEdited(const QString &arg1)
{
void MainWindow::on_surname_textEdited(const QString& arg1) {
this->surname = arg1;
}
void MainWindow::on_comboBox_currentIndexChanged(int index)
{
void MainWindow::on_comboBox_currentIndexChanged(int index) {
if (index == 0) {
ui->ChangeOwner->setDisabled(true);
}
else{
} else {
ui->ChangeOwner->setDisabled(false);
}
}
void MainWindow::on_ChangeOwner_clicked()
{
void MainWindow::on_ChangeOwner_clicked() {
this->data = ("func1:name: " + this->name + ", surname: " + this->surname + "").toUtf8();
this->func = 1;
SendRequest();
m_timer->start();
}

View File

@@ -6,8 +6,8 @@
#include <QtWidgets>
#define QD qDebug() << __FILE__ << __LINE__
#include "about.h"
#include <QString>
#include "about.h"
// UDP protocol:
// REQ= Where are you?v1.0
@@ -17,11 +17,12 @@
#define UDP_ANS_OWNER "my owner is "
QT_BEGIN_NAMESPACE
namespace Ui { class MainWindow; }
namespace Ui {
class MainWindow;
}
QT_END_NAMESPACE
class MainWindow : public QMainWindow
{
class MainWindow : public QMainWindow {
Q_OBJECT
public:

View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
cmake_minimum_required(VERSION 3.10)
project(WSAA_tests LANGUAGES CXX C)

104
docs/tcp_cmd_interface.md Normal file
View File

@@ -0,0 +1,104 @@
# TCP CMD Interface
## Introduction
The tcp cmd interface is a way to control the device over TCP. It is a simple protocol that allows the user to send commands to the device and receive responses. The protocol looks like bash commands. The commands are separated by a new line character (`\n`). The response is sent after the command is executed. The response is also terminated by a new line character (`\n`).
## Table of contents
* [Introduction](#introduction)
* [Table of contents](#table-of-contents)
* [Usage of TCP CMD Interface](#usage-of-tcp-cmd-interface)
* [Connecting to the device](#connecting-to-the-device)
* [Sending commands](#sending-commands)
* [Available commands](#available-commands)
* [`help`](#help)
* [`text`](#text)
* [`bgcolor`](#bgcolor)
* [`color`](#color)
* [`listImages`](#listimages)
* [`setImage`](#setimage)
* [`setGif`](#setgif)
## Usage of TCP CMD Interface
### Connecting to the device
The device can be connected to using a TCP client. The device will listen on port 23. The device will send a welcome message when a client connects.
On Linux, the device can be connected to using the `nc` command:
```bash
nc <ip-address> 23
```
### Sending commands
Commands can be sent to the device by typing them in the terminal and pressing enter. The device will execute the command and send a response.
### Available commands
#### `help`
The `help` command will print a list of available commands.
```bash
$> help
help : shows a list of commands
text "<text>" : puts text on the lcd
color (<a>) <r> <g> <b> : set the background color of the lcd
textColor (<a>) <r> <g> <b> : set the color of the text
listImages : shows a list with images in the filesystem
setImage <image_name> : put an image on the screen
setGif <image_name> : put a gif on the screen
exit : closes the connection
```
#### `text`
The `text` command will print the given text on the screen. The text can be one or multiple words. one word does'n need quotes, multiple words do. The text will rapp around when it reaches the end of the screen.
```bash
$> text "Hello World!"
```
#### `bgcolor`
The `bgcolor` command will set the background color of the screen. The color can be provided in 2 ways: as three numbers between 0 and 255 and one hex value. The first number is the red value, the second is the green value and the third is the blue value. It also has the possible to set the alpha value as the first parameter, this is optional.
```bash
bgcolor 255 0 0
```
or
```bash
bgcolor 0xFF0000
```
#### `color`
The `color` command will set the color of the text. The color can be provided in 2 ways: as three numbers between 0 and 255 and one hex value. The first number is the red value, the second is the green value and the third is the blue value. It also has the possible to set the alpha value as the first parameter, this is optional.
```bash
color 255 0 0
```
or
```bash
color 0xFF0000
```
#### `listImages`
The `listImages` command will print a list of images that are present in the filesystem.
```bash
$> listImages
image1.bmp
image2.bmp
image3.bmp
gif1.gif
...
```
#### `setImage`
The `setImage` command will put an image on the screen. The image must be present in the filesystem. If the image is not present in the filesystem, the device will send an error message. This function only works for BMP images, if you give any other file type, the device will send an error message. You can also provide the starting x and y coordinates as optional parameters. If no coordinates are provided, the image will be placed at the top left corner of the screen (0,0).
```bash
$> setImage image1.bmp
```
or
```bash
$> setImage image1.bmp 128 64
```
#### `setGif`
The `setGif` command will put a gif on the screen. The gif must be present in the filesystem. If the gif is not present in the filesystem, the device will send an error message. This function only works for GIF images, if you give any other file type, the device will send an error message. You can also provide the starting x and y coordinates as optional parameters. If no coordinates are provided, the gif will be placed at the top left corner of the screen (0,0).
```bash
$> setGif gif1.gif
```
or
```bash
$> setGif gif1.gif 128 64
```

BIN
llfs-data/base.bmp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 79 KiB

BIN
llfs-data/clap.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

BIN
llfs-data/dafoe.bmp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

BIN
llfs-data/fellowkids.bmp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 94 KiB

BIN
llfs-data/goose.bmp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 KiB

122
llfs-data/index.css Normal file
View File

@@ -0,0 +1,122 @@
body{
font-family:Arial;
}
h1{
font-size: 175%;
padding: 10px;
margin: 10px;
}
h2 {
font-size: 150%;
padding: 8px;
position: absolute;
top: -6px;
left: 20px;
background-color:orangered;
color: white;
border-radius: 20px;
padding-left: 30px;
padding-right: 30px;
}
h3 {
font-size: 125%;
padding: 10px;
margin: 10px;
}
p {
padding: 10px;
margin: 10px;
}
header {
padding: 30px;
background-color: orangered;
}
header:after {
content:"";
display: block;
clear: both;
}
.logo{
width:100px;
transform:rotate(-10deg);
-moz-transform:rotate(-10deg);
-webkit-transform:rotate(-10deg);
-o-transform:rotate(-10deg);
float:left;
}
.title{
color: white;
font-size: 40px;
font: 60px "Lucida Sans Unicode", "Lucida Grande", sans-serif;
text-align: center;
padding-top: 10px;
}
.column {
flex-grow: 0;
flex-basis: 48%;
position: relative;
}
.right {
margin-left: 2%;
}
.content {
padding: 20px;
display: flex;
}
/*Geef vorm aan de vakjes op de site*/
.card {
background-color: white;
border-radius:10px;
padding:1%;
border: 1px solid black;
margin: 2% 0;
width: 100%;
padding-top: 30px;
}
.image {
width: 25%;
height: auto;
border: 10px solid transparent;
}
.image:hover {
border: 10px solid lightsalmon;
border-radius: 10px;
}
#selected {
border: 10px solid lightsalmon;
border-radius: 10px;
}
.sendButton {
position: absolute;
margin-top: 8%;
text-align: center;
margin-left: 40%;
font-size: 150%;
padding: 20px;
background-color:orangered;
color: white;
border-radius: 20px;
}
.sendButton:hover {
background-color:white;
color: orangered ;
}
/*---------------------------------------------------------------------------------------*/
footer {
background-color: orangered;
padding: 20px;
text-align: center;
border-top:20px solid lightskyblue; /*solid is vast*/
border-bottom:20px solid lightskyblue;
margin-top: 20px;
}
.foot {
color: white;
}
html{
background-color: white;
}
#myImg {
border: none;
transition: border 0.3s;
}

133
llfs-data/index.html Normal file
View File

@@ -0,0 +1,133 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8" />
<title>Webservices & Applications</title>
<link href="reset.css" rel="stylesheet" />
<link href="index.css" rel="stylesheet" />
</head>
<body>
<div>
<header>
<img class="logo" src="st.bmp" alt="STM"/>
<p class="title">
Webservices & Applications
</p>
</header>
<form action="cgi">
<div class="content row">
<div class="column left">
<div class="card">
<h2>Adjustments</h2>
<label for="send_text">Text LCD:</label>
<input type="text" id="send_text" name="vtxt"><br><br>
<label for="send_colorTxt">Select the text color:</label>
<input type="color" id="send_colorTxt" name="vktxt" value="#0000ff"><br><br>
<label for="send_colorBack">Select the background color:</label>
<input type="color" id="send_colorBack" name="vka" value="#0000ff"><br><br>
<!--<span class="sendButton" onClick="start();">
<input type="submit" value="Send">
</span>-->
<input type="submit" value="Send" class="sendButton" onClick="start();">
</div>
</div>
<div class="column right">
<div class="card">
<h2 >Images</h2>
<label for="vfo">Choose your photo:</label>
<div class="gallery" id="gallery">
<input type="hidden" id="gallery1" name="vfo" value="">
</div>
</div>
</div>
</div>
</form>
<script>
document.getElementById('send_colorBack').addEventListener('input', function() { document.body.style.backgroundColor = this.value; });
document.getElementById('send_colorTxt').addEventListener('input', function() { document.getElementById('send_text').style.color = this.value; });
/*--------------------------------------------------------------*/
// Function to load images from the folder
function loadImages() {
console.log("loadImages");
const xhttp = new XMLHttpRequest();
xhttp.onload = function() {
const imageContainer = document.getElementById('gallery');
console.log(this.responseText);
images = this.responseText.split('|');
console.log(images);
for (let i = 0; i < images.length; i++) {
console.log(images[i]);
const img = document.createElement('img');;
img.src= images[i];
img.alt = images[i];
img.className = `image ${i}`;
img.value = images[i];
img.onload = () => {
imageContainer.appendChild(img);
}
img.onclick = () => {
selecteerFoto(img, i, images[i]);
}
}
}
xhttp.open("GET", "images.info");
xhttp.send();
}
function selecteerFoto(image, i, images) {
var gallery = document.getElementById('gallery1');
var value = gallery.getAttribute('value');
var Pictures = document.querySelectorAll('.gallery img');
Pictures.forEach(function(image) {
image.removeAttribute('id');
image.removeAttribute('name');
});
image.id = "selected";
image.name = "vfo";
image.value = images[i];
gallery.setAttribute('value', images);
}
// Call the function to load the images
loadImages();
const xhr = new XMLHttpRequest();
function start() {
var send_text = document.getElementById("send_text").value;
var send_colorTxt = document.getElementById("send_colorTxt").value;
var send_colorBack = document.getElementById("send_colorBack").value;
var sendPicture = document.getElementById("selected").alt;
var url = "cgi?";
var queryString = url + "vtxt=" + send_text + "&vktxt=" + encodeURIComponent(send_colorTxt) + "&vka=" + encodeURIComponent(send_colorBack) + "&vfo=" + sendPicture;
console.log(queryString);
xhr.onreadystatechange = showAnswer;
xhr.open("GET", queryString);
xhr.send();
}
function showAnswer() {
if (xhr.readyState == 4 && xhr.status == 200) {
alert(xhr.responseText);
}
}
</script>
<footer>
<p class="foot">
Copyright &copy; Thomas More Mechelen-Antwerpen vzw -
Campus De Nayer - Professionele bachelor elektronica-ict
2023
</p>
</footer>
</div>
</body>
</html>

BIN
llfs-data/mind.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 MiB

62
llfs-data/reset.css Normal file
View File

@@ -0,0 +1,62 @@
/* http://meyerweb.com/eric/tools/css/reset/
v2.0b1 | 201101
NOTE: WORK IN PROGRESS
USE WITH CAUTION AND TEST WITH ABANDON */
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, figcaption, figure,
footer, header, hgroup, menu, nav, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
outline: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
line-height: 1;
}
ol, ul {
list-style: none;
}
blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}
/* remember to define visible focus styles!
:focus {
outline: ?????;
} */
/* remember to highlight inserts somehow! */
ins {
text-decoration: none;
}
del {
text-decoration: line-through;
}
table {
border-collapse: collapse;
border-spacing: 0;
}

BIN
llfs-data/webp.bmp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 KiB

View File

@@ -60,7 +60,8 @@ int main(int argc, char** argv) {
}
// Write the header of the output file
fprintf(out_file, "/**\n"
fprintf(out_file,
"/**\n"
" * @file %s\n"
" * @brief Linked list file system (llfs) data file.\n"
" * This file was generated by mkllfs %s.\n"
@@ -125,7 +126,8 @@ int main(int argc, char** argv) {
// Make the last file the root file of the llfs
fprintf(out_file, "\n");
fprintf(out_file, "const struct llfs_data_file *llfs_root =%s%s;\n", (strcmp(prev_llfs_name, "NULL") == 0 ? " " : " &"), prev_llfs_name);
fprintf(out_file, "const struct llfs_data_file *llfs_root =%s%s;\n",
(strcmp(prev_llfs_name, "NULL") == 0 ? " " : " &"), prev_llfs_name);
// Print the number of files
printf("Successfully converted %d files.\r\n", file_count);

View File

@@ -48,21 +48,20 @@ extern "C" {
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
# include <windows.h>
#include <tchar.h>
#include <windows.h>
#pragma warning(push)
#pragma warning(disable : 4996)
#else
#include <dirent.h>
#include <libgen.h>
# include <sys/stat.h>
#include <stddef.h>
#include <sys/stat.h>
#endif
#ifdef __MINGW32__
#include <tchar.h>
#endif
/* types */
/* Windows UNICODE wide character support */
@@ -139,25 +138,21 @@ extern "C" {
/* readdir_r is a POSIX-only function, and may not be available under various
* environments/settings, e.g. MinGW. Use readdir fallback */
#if _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _BSD_SOURCE || _SVID_SOURCE ||\
_POSIX_SOURCE
#if _POSIX_C_SOURCE >= 1 || _XOPEN_SOURCE || _BSD_SOURCE || _SVID_SOURCE || _POSIX_SOURCE
#define _TINYDIR_HAS_READDIR_R
#endif
#if _POSIX_C_SOURCE >= 200112L
#define _TINYDIR_HAS_FPATHCONF
#include <unistd.h>
#endif
#if _BSD_SOURCE || _SVID_SOURCE || \
(_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
#if _BSD_SOURCE || _SVID_SOURCE || (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
#define _TINYDIR_HAS_DIRFD
#include <sys/types.h>
#endif
#if defined _TINYDIR_HAS_FPATHCONF && defined _TINYDIR_HAS_DIRFD &&\
defined _PC_NAME_MAX
#if defined _TINYDIR_HAS_FPATHCONF && defined _TINYDIR_HAS_DIRFD && defined _PC_NAME_MAX
#define _TINYDIR_USE_FPATHCONF
#endif
#if defined __MINGW32__ || !defined _TINYDIR_HAS_READDIR_R ||\
!(defined _TINYDIR_USE_FPATHCONF || defined NAME_MAX)
#if defined __MINGW32__ || !defined _TINYDIR_HAS_READDIR_R || !(defined _TINYDIR_USE_FPATHCONF || defined NAME_MAX)
#define _TINYDIR_USE_READDIR
#endif
@@ -195,8 +190,7 @@ extern "C" {
#define _TINYDIR_FREE(_ptr) free(_ptr)
#endif /* !defined(_TINYDIR_MALLOC) */
typedef struct tinydir_file
{
typedef struct tinydir_file {
_tinydir_char_t path[_TINYDIR_PATH_MAX];
_tinydir_char_t name[_TINYDIR_FILENAME_MAX];
_tinydir_char_t* extension;
@@ -212,8 +206,7 @@ typedef struct tinydir_file
#endif
} tinydir_file;
typedef struct tinydir_dir
{
typedef struct tinydir_dir {
_tinydir_char_t path[_TINYDIR_PATH_MAX];
int has_next;
size_t n_files;
@@ -231,7 +224,6 @@ typedef struct tinydir_dir
#endif
} tinydir_dir;
/* declarations */
_TINYDIR_FUNC
@@ -263,12 +255,10 @@ size_t _tinydir_dirent_buf_size(_TINYDIR_DIR *dirp);
#endif
#endif
/* definitions*/
_TINYDIR_FUNC
int tinydir_open(tinydir_dir *dir, const _tinydir_char_t *path)
{
int tinydir_open(tinydir_dir* dir, const _tinydir_char_t* path) {
#ifndef _MSC_VER
#ifndef _TINYDIR_USE_READDIR
int error;
@@ -279,13 +269,11 @@ int tinydir_open(tinydir_dir *dir, const _tinydir_char_t *path)
#endif
_tinydir_char_t* pathp;
if (dir == NULL || path == NULL || _tinydir_strlen(path) == 0)
{
if (dir == NULL || path == NULL || _tinydir_strlen(path) == 0) {
errno = EINVAL;
return -1;
}
if (_tinydir_strlen(path) + _TINYDIR_PATH_EXTRA >= _TINYDIR_PATH_MAX)
{
if (_tinydir_strlen(path) + _TINYDIR_PATH_EXTRA >= _TINYDIR_PATH_MAX) {
errno = ENAMETOOLONG;
return -1;
}
@@ -305,8 +293,7 @@ int tinydir_open(tinydir_dir *dir, const _tinydir_char_t *path)
_tinydir_strcpy(dir->path, path);
/* Remove trailing slashes */
pathp = &dir->path[_tinydir_strlen(dir->path) - 1];
while (pathp != dir->path && (*pathp == TINYDIR_STRING('\\') || *pathp == TINYDIR_STRING('/')))
{
while (pathp != dir->path && (*pathp == TINYDIR_STRING('\\') || *pathp == TINYDIR_STRING('/'))) {
*pathp = TINYDIR_STRING('\0');
pathp++;
}
@@ -318,13 +305,11 @@ int tinydir_open(tinydir_dir *dir, const _tinydir_char_t *path)
#else
dir->_h = FindFirstFile(path_buf, &dir->_f);
#endif
if (dir->_h == INVALID_HANDLE_VALUE)
{
if (dir->_h == INVALID_HANDLE_VALUE) {
errno = ENOENT;
#else
dir->_d = _tinydir_opendir(path);
if (dir->_d == NULL)
{
if (dir->_d == NULL) {
#endif
goto bail;
}
@@ -337,15 +322,17 @@ int tinydir_open(tinydir_dir *dir, const _tinydir_char_t *path)
#else
/* allocate dirent buffer for readdir_r */
size = _tinydir_dirent_buf_size(dir->_d); /* conversion to int */
if (size == -1) return -1;
if (size == -1)
return -1;
dir->_ep = (struct _tinydir_dirent*)_TINYDIR_MALLOC(size);
if (dir->_ep == NULL) return -1;
if (dir->_ep == NULL)
return -1;
error = readdir_r(dir->_d, dir->_ep, &dir->_e);
if (error != 0) return -1;
if (error != 0)
return -1;
#endif
if (dir->_e == NULL)
{
if (dir->_e == NULL) {
dir->has_next = 0;
}
#endif
@@ -358,55 +345,45 @@ int tinydir_open(tinydir_dir *dir, const _tinydir_char_t *path)
}
_TINYDIR_FUNC
int tinydir_open_sorted(tinydir_dir *dir, const _tinydir_char_t *path)
{
int tinydir_open_sorted(tinydir_dir* dir, const _tinydir_char_t* path) {
/* Count the number of files first, to pre-allocate the files array */
size_t n_files = 0;
if (tinydir_open(dir, path) == -1)
{
if (tinydir_open(dir, path) == -1) {
return -1;
}
while (dir->has_next)
{
while (dir->has_next) {
n_files++;
if (tinydir_next(dir) == -1)
{
if (tinydir_next(dir) == -1) {
goto bail;
}
}
tinydir_close(dir);
if (n_files == 0 || tinydir_open(dir, path) == -1)
{
if (n_files == 0 || tinydir_open(dir, path) == -1) {
return -1;
}
dir->n_files = 0;
dir->_files = (tinydir_file*)_TINYDIR_MALLOC(sizeof *dir->_files * n_files);
if (dir->_files == NULL)
{
if (dir->_files == NULL) {
goto bail;
}
while (dir->has_next)
{
while (dir->has_next) {
tinydir_file* p_file;
dir->n_files++;
p_file = &dir->_files[dir->n_files - 1];
if (tinydir_readfile(dir, p_file) == -1)
{
if (tinydir_readfile(dir, p_file) == -1) {
goto bail;
}
if (tinydir_next(dir) == -1)
{
if (tinydir_next(dir) == -1) {
goto bail;
}
/* Just in case the number of files has changed between the first and
second reads, terminate without writing into unallocated memory */
if (dir->n_files == n_files)
{
if (dir->n_files == n_files) {
break;
}
}
@@ -421,10 +398,8 @@ int tinydir_open_sorted(tinydir_dir *dir, const _tinydir_char_t *path)
}
_TINYDIR_FUNC
void tinydir_close(tinydir_dir *dir)
{
if (dir == NULL)
{
void tinydir_close(tinydir_dir* dir) {
if (dir == NULL) {
return;
}
@@ -434,14 +409,12 @@ void tinydir_close(tinydir_dir *dir)
_TINYDIR_FREE(dir->_files);
dir->_files = NULL;
#ifdef _MSC_VER
if (dir->_h != INVALID_HANDLE_VALUE)
{
if (dir->_h != INVALID_HANDLE_VALUE) {
FindClose(dir->_h);
}
dir->_h = INVALID_HANDLE_VALUE;
#else
if (dir->_d)
{
if (dir->_d) {
_tinydir_closedir(dir->_d);
}
dir->_d = NULL;
@@ -454,15 +427,12 @@ void tinydir_close(tinydir_dir *dir)
}
_TINYDIR_FUNC
int tinydir_next(tinydir_dir *dir)
{
if (dir == NULL)
{
int tinydir_next(tinydir_dir* dir) {
if (dir == NULL) {
errno = EINVAL;
return -1;
}
if (!dir->has_next)
{
if (!dir->has_next) {
errno = ENOENT;
return -1;
}
@@ -473,12 +443,10 @@ int tinydir_next(tinydir_dir *dir)
#ifdef _TINYDIR_USE_READDIR
dir->_e = _tinydir_readdir(dir->_d);
#else
if (dir->_ep == NULL)
{
if (dir->_ep == NULL) {
return -1;
}
if (readdir_r(dir->_d, dir->_ep, &dir->_e) != 0)
{
if (readdir_r(dir->_d, dir->_ep, &dir->_e) != 0) {
return -1;
}
#endif
@@ -487,9 +455,7 @@ int tinydir_next(tinydir_dir *dir)
{
dir->has_next = 0;
#ifdef _MSC_VER
if (GetLastError() != ERROR_SUCCESS &&
GetLastError() != ERROR_NO_MORE_FILES)
{
if (GetLastError() != ERROR_SUCCESS && GetLastError() != ERROR_NO_MORE_FILES) {
tinydir_close(dir);
errno = EIO;
return -1;
@@ -501,11 +467,9 @@ int tinydir_next(tinydir_dir *dir)
}
_TINYDIR_FUNC
int tinydir_readfile(const tinydir_dir *dir, tinydir_file *file)
{
int tinydir_readfile(const tinydir_dir* dir, tinydir_file* file) {
const _tinydir_char_t* filename;
if (dir == NULL || file == NULL)
{
if (dir == NULL || file == NULL) {
errno = EINVAL;
return -1;
}
@@ -524,16 +488,12 @@ int tinydir_readfile(const tinydir_dir *dir, tinydir_file *file)
#else
dir->_e->d_name;
#endif
if (_tinydir_strlen(dir->path) +
_tinydir_strlen(filename) + 1 + _TINYDIR_PATH_EXTRA >=
_TINYDIR_PATH_MAX)
{
if (_tinydir_strlen(dir->path) + _tinydir_strlen(filename) + 1 + _TINYDIR_PATH_EXTRA >= _TINYDIR_PATH_MAX) {
/* the path for the file will be too long */
errno = ENAMETOOLONG;
return -1;
}
if (_tinydir_strlen(filename) >= _TINYDIR_FILENAME_MAX)
{
if (_tinydir_strlen(filename) >= _TINYDIR_FILENAME_MAX) {
errno = ENAMETOOLONG;
return -1;
}
@@ -546,17 +506,15 @@ int tinydir_readfile(const tinydir_dir *dir, tinydir_file *file)
#ifndef _MSC_VER
#ifdef __MINGW32__
if (_tstat(
#elif (defined _BSD_SOURCE) || (defined _DEFAULT_SOURCE) \
|| ((defined _XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)) \
|| ((defined _POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L)) \
|| ((defined __APPLE__) && (defined __MACH__)) \
#elif (defined _BSD_SOURCE) || (defined _DEFAULT_SOURCE) || ((defined _XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)) \
|| ((defined _POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L)) || ((defined __APPLE__) && (defined __MACH__)) \
|| (defined BSD)
if (lstat(
#else
if (stat(
#endif
file->path, &file->_s) == -1)
{
file->path, &file->_s)
== -1) {
return -1;
}
#endif
@@ -570,19 +528,18 @@ int tinydir_readfile(const tinydir_dir *dir, tinydir_file *file)
#endif
file->is_reg =
#ifdef _MSC_VER
!!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_NORMAL) ||
(
!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_DEVICE) &&
!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) &&
!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_ENCRYPTED) &&
!!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_NORMAL)
|| (!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_DEVICE)
&& !(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
&& !(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_ENCRYPTED) &&
#ifdef FILE_ATTRIBUTE_INTEGRITY_STREAM
!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_INTEGRITY_STREAM) &&
#endif
#ifdef FILE_ATTRIBUTE_NO_SCRUB_DATA
!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_NO_SCRUB_DATA) &&
#endif
!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_OFFLINE) &&
!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_TEMPORARY));
!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_OFFLINE)
&& !(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_TEMPORARY));
#else
S_ISREG(file->_s.st_mode);
#endif
@@ -591,15 +548,12 @@ int tinydir_readfile(const tinydir_dir *dir, tinydir_file *file)
}
_TINYDIR_FUNC
int tinydir_readfile_n(const tinydir_dir *dir, tinydir_file *file, size_t i)
{
if (dir == NULL || file == NULL)
{
int tinydir_readfile_n(const tinydir_dir* dir, tinydir_file* file, size_t i) {
if (dir == NULL || file == NULL) {
errno = EINVAL;
return -1;
}
if (i >= dir->n_files)
{
if (i >= dir->n_files) {
errno = ENOENT;
return -1;
}
@@ -611,24 +565,20 @@ int tinydir_readfile_n(const tinydir_dir *dir, tinydir_file *file, size_t i)
}
_TINYDIR_FUNC
int tinydir_open_subdir_n(tinydir_dir *dir, size_t i)
{
int tinydir_open_subdir_n(tinydir_dir* dir, size_t i) {
_tinydir_char_t path[_TINYDIR_PATH_MAX];
if (dir == NULL)
{
if (dir == NULL) {
errno = EINVAL;
return -1;
}
if (i >= dir->n_files || !dir->_files[i].is_dir)
{
if (i >= dir->n_files || !dir->_files[i].is_dir) {
errno = ENOENT;
return -1;
}
_tinydir_strcpy(path, dir->_files[i].path);
tinydir_close(dir);
if (tinydir_open_sorted(dir, path) == -1)
{
if (tinydir_open_sorted(dir, path) == -1) {
return -1;
}
@@ -637,8 +587,7 @@ int tinydir_open_subdir_n(tinydir_dir *dir, size_t i)
/* Open a single file given its path */
_TINYDIR_FUNC
int tinydir_file_open(tinydir_file *file, const _tinydir_char_t *path)
{
int tinydir_file_open(tinydir_file* file, const _tinydir_char_t* path) {
tinydir_dir dir;
int result = 0;
int found = 0;
@@ -651,13 +600,11 @@ int tinydir_file_open(tinydir_file *file, const _tinydir_char_t *path)
_tinydir_char_t ext_buf[_TINYDIR_FILENAME_MAX];
#endif
if (file == NULL || path == NULL || _tinydir_strlen(path) == 0)
{
if (file == NULL || path == NULL || _tinydir_strlen(path) == 0) {
errno = EINVAL;
return -1;
}
if (_tinydir_strlen(path) + _TINYDIR_PATH_EXTRA >= _TINYDIR_PATH_MAX)
{
if (_tinydir_strlen(path) + _TINYDIR_PATH_EXTRA >= _TINYDIR_PATH_MAX) {
errno = ENAMETOOLONG;
return -1;
}
@@ -665,23 +612,13 @@ int tinydir_file_open(tinydir_file *file, const _tinydir_char_t *path)
/* Get the parent path */
#if (defined _MSC_VER || defined __MINGW32__)
#if ((defined _MSC_VER) && (_MSC_VER >= 1400))
errno = _tsplitpath_s(
path,
drive_buf, _TINYDIR_DRIVE_MAX,
dir_name_buf, _TINYDIR_FILENAME_MAX,
file_name_buf, _TINYDIR_FILENAME_MAX,
ext_buf, _TINYDIR_FILENAME_MAX);
errno = _tsplitpath_s(path, drive_buf, _TINYDIR_DRIVE_MAX, dir_name_buf, _TINYDIR_FILENAME_MAX, file_name_buf,
_TINYDIR_FILENAME_MAX, ext_buf, _TINYDIR_FILENAME_MAX);
#else
_tsplitpath(
path,
drive_buf,
dir_name_buf,
file_name_buf,
ext_buf);
_tsplitpath(path, drive_buf, dir_name_buf, file_name_buf, ext_buf);
#endif
if (errno)
{
if (errno) {
return -1;
}
@@ -695,8 +632,7 @@ int tinydir_file_open(tinydir_file *file, const _tinydir_char_t *path)
/* Emulate the behavior of dirname by returning "." for dir name if it's
empty */
if (drive_buf[0] == '\0' && dir_name_buf[0] == '\0')
{
if (drive_buf[0] == '\0' && dir_name_buf[0] == '\0') {
_tinydir_strcpy(dir_name_buf, TINYDIR_STRING("."));
}
/* Concatenate the drive letter and dir name to form full dir name */
@@ -728,29 +664,24 @@ int tinydir_file_open(tinydir_file *file, const _tinydir_char_t *path)
}
/* Open the parent directory */
if (tinydir_open(&dir, dir_name) == -1)
{
if (tinydir_open(&dir, dir_name) == -1) {
return -1;
}
/* Read through the parent directory and look for the file */
while (dir.has_next)
{
if (tinydir_readfile(&dir, file) == -1)
{
while (dir.has_next) {
if (tinydir_readfile(&dir, file) == -1) {
result = -1;
goto bail;
}
if (_tinydir_strcmp(file->name, base_name) == 0)
{
if (_tinydir_strcmp(file->name, base_name) == 0) {
/* File found */
found = 1;
break;
}
tinydir_next(&dir);
}
if (!found)
{
if (!found) {
result = -1;
errno = ENOENT;
}
@@ -761,26 +692,20 @@ int tinydir_file_open(tinydir_file *file, const _tinydir_char_t *path)
}
_TINYDIR_FUNC
void _tinydir_get_ext(tinydir_file *file)
{
void _tinydir_get_ext(tinydir_file* file) {
_tinydir_char_t* period = _tinydir_strrchr(file->name, TINYDIR_STRING('.'));
if (period == NULL)
{
if (period == NULL) {
file->extension = &(file->name[_tinydir_strlen(file->name)]);
}
else
{
} else {
file->extension = period + 1;
}
}
_TINYDIR_FUNC
int _tinydir_file_cmp(const void *a, const void *b)
{
int _tinydir_file_cmp(const void* a, const void* b) {
const tinydir_file* fa = (const tinydir_file*)a;
const tinydir_file* fb = (const tinydir_file*)b;
if (fa->is_dir != fb->is_dir)
{
if (fa->is_dir != fb->is_dir) {
return -(fa->is_dir - fb->is_dir);
}
return _tinydir_strncmp(fa->name, fb->name, _TINYDIR_FILENAME_MAX);
@@ -800,8 +725,7 @@ from https://womble.decadent.org.uk/readdir_r-advisory.html
* 255, since some systems (including at least HP-UX) incorrectly *
* define it to be a smaller value. */
_TINYDIR_FUNC
size_t _tinydir_dirent_buf_size(_TINYDIR_DIR *dirp)
{
size_t _tinydir_dirent_buf_size(_TINYDIR_DIR* dirp) {
long name_max;
size_t name_end;
/* parameter may be unused */
@@ -821,8 +745,7 @@ size_t _tinydir_dirent_buf_size(_TINYDIR_DIR *dirp)
#error "buffer size for readdir_r cannot be determined"
#endif
name_end = (size_t)offsetof(struct _tinydir_dirent, d_name) + name_max + 1;
return (name_end > sizeof(struct _tinydir_dirent) ?
name_end : sizeof(struct _tinydir_dirent));
return (name_end > sizeof(struct _tinydir_dirent) ? name_end : sizeof(struct _tinydir_dirent));
}
#endif
#endif

View File

@@ -20,13 +20,16 @@
#include "lcd_api.h"
// Defines used by UDP callback
#define UDP_BROADCAST_MAX_DATA_SIZE ((UDP_BROADCAST_MAX_NAME_SIZE * 2) - 2 + 25) // Define the maximum expected data size
#define UDP_BROADCAST_MAX_DATA_SIZE \
((UDP_BROADCAST_MAX_NAME_SIZE * 2) - 2 + 25) // Define the maximum expected data size
#define UDP_BROADCAST_UDP_QUESTION1 "Where are you?v1.0" // Expected question from UDP client
#define UDP_BROADCAST_MAX_FUNC_LEN 7
#define UDP_BROADCAST_MAX_COLON_COMMA_COUNT 4
// Defines used by owner details
#define UDP_BROADCAST_MAX_REPLY_SIZE (UDP_BROADCAST_MAX_MAC_ADDR_LEN + sizeof(UDP_BROADCAST_REPLY_MIDDLE_TEXT) + (UDP_BROADCAST_MAX_NAME_SIZE * 2) + UDP_BROADCAST_MAX_REPLY_SIZE_EXTRA)
#define UDP_BROADCAST_MAX_REPLY_SIZE \
(UDP_BROADCAST_MAX_MAC_ADDR_LEN + sizeof(UDP_BROADCAST_REPLY_MIDDLE_TEXT) + (UDP_BROADCAST_MAX_NAME_SIZE * 2) \
+ UDP_BROADCAST_MAX_REPLY_SIZE_EXTRA)
#define UDP_BROADCAST_REPLY_MIDDLE_TEXT "is present and my owner is"
#define UDP_BROADCAST_MAX_MAC_ADDR_LEN 19 // Format is: "xx:xx:xx:xx:xx:xx"
@@ -36,7 +39,6 @@
#define UDP_BROADCAST_LCD_NAME_PRE_TEXT "New owner: "
#define UDP_BROADCAST_LCD_TEXT_SIZE (strlen(UDP_BROADCAST_LCD_NAME_PRE_TEXT) + UDP_BROADCAST_MAX_NAME_SIZE)
/**
* @struct owner_details_t
* @brief contains information about the owner

View File

@@ -13,10 +13,10 @@
#ifndef __ANIMATEDGIF__
#define __ANIMATEDGIF__
#include <stdio.h>
#include <stdint.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#define memcpy_P memcpy
#define PROGMEM
@@ -71,10 +71,7 @@ enum {
// RAW = 8-bit palettized pixels requiring transparent pixel handling
// COOKED = 16 or 24-bpp fully rendered pixels ready for display
//
enum {
GIF_DRAW_RAW = 0,
GIF_DRAW_COOKED
};
enum { GIF_DRAW_RAW = 0, GIF_DRAW_COOKED };
enum {
GIF_SUCCESS = 0,
@@ -89,24 +86,21 @@ enum {
GIF_ERROR_MEMORY
};
typedef struct gif_file_tag
{
typedef struct gif_file_tag {
int32_t iPos; // current file position
int32_t iSize; // file size
uint8_t* pData; // memory file pointer
void* fHandle; // class pointer to File/SdFat or whatever you want
} GIFFILE;
typedef struct gif_info_tag
{
typedef struct gif_info_tag {
int32_t iFrameCount; // total frames in file
int32_t iDuration; // duration of animation in milliseconds
int32_t iMaxDelay; // maximum frame delay
int32_t iMinDelay; // minimum frame delay
} GIFINFO;
typedef struct gif_draw_tag
{
typedef struct gif_draw_tag {
int iX, iY; // Corner offset of this frame on the canvas
int y; // current line being drawn (0 = top line of image)
int iWidth, iHeight; // size of this frame
@@ -132,8 +126,7 @@ typedef void (GIF_FREE_CALLBACK)(void *buffer);
//
// our private structure to hold a GIF image decode state
//
typedef struct gif_image_tag
{
typedef struct gif_image_tag {
int iWidth, iHeight, iCanvasWidth, iCanvasHeight;
int iX, iY; // GIF corner offset
int iBpp;
@@ -171,16 +164,22 @@ typedef struct gif_image_tag
//
// The GIF class wraps portable C code which does the actual work
//
class AnimatedGIF
{
class AnimatedGIF {
public:
int open(uint8_t* pData, int iDataSize, GIF_DRAW_CALLBACK* pfnDraw);
int openFLASH(uint8_t* pData, int iDataSize, GIF_DRAW_CALLBACK* pfnDraw);
int open(const char *szFilename, GIF_OPEN_CALLBACK *pfnOpen, GIF_CLOSE_CALLBACK *pfnClose, GIF_READ_CALLBACK *pfnRead, GIF_SEEK_CALLBACK *pfnSeek, GIF_DRAW_CALLBACK *pfnDraw);
int open(const char* szFilename,
GIF_OPEN_CALLBACK* pfnOpen,
GIF_CLOSE_CALLBACK* pfnClose,
GIF_READ_CALLBACK* pfnRead,
GIF_SEEK_CALLBACK* pfnSeek,
GIF_DRAW_CALLBACK* pfnDraw);
void close();
void reset();
void begin(unsigned char ucPaletteType = GIF_PALETTE_RGB565_LE);
void begin(int iEndian, unsigned char ucPaletteType) { begin(ucPaletteType); };
void begin(int iEndian, unsigned char ucPaletteType) {
begin(ucPaletteType);
};
int playFrame(bool bSync, int* delayMilliseconds, void* pUser = NULL);
int getCanvasWidth();
int allocFrameBuf(GIF_ALLOC_CALLBACK* pfnAlloc);

View File

@@ -7,15 +7,15 @@
#ifndef INC_LCD_API_H_
#define INC_LCD_API_H_
#include <ctype.h>
#include <stdbool.h>
#include <string.h>
#include <ctype.h>
#define LOGGER_LEVEL_ALL
#include "log.h"
#include "../../Drivers/BSP/STM32746G-Discovery/stm32746g_discovery_lcd.h"
#include "llfs.h"
#include "gifdec.h"
#include "llfs.h"
#include "log.h"
/**
* @brief The maximum amount of GIFs that can be displayed at the same time
@@ -61,7 +61,6 @@
#define LCD_FONT20 (&Font20)
#define LCD_FONT24 (&Font24)
extern LTDC_HandleTypeDef hLtdcHandler;
typedef struct {
@@ -121,7 +120,12 @@ void lcd_display_text(const char* text, uint32_t x_pos, uint32_t y_pos, uint32_t
* @param[in] y_size Height of image
* @param[in] color_mode Color mode (see defined color modes above in file)
*/
void lcd_draw_raw_img(const void* p_src, uint32_t x_pos, uint32_t y_pos, uint32_t x_size, uint32_t y_size, uint32_t color_mode);
void lcd_draw_raw_img(const void* p_src,
uint32_t x_pos,
uint32_t y_pos,
uint32_t x_size,
uint32_t y_size,
uint32_t color_mode);
/**
* @brief Draw BMP image on screen
@@ -187,7 +191,8 @@ void lcd_stop_all_gifs(void);
/**
* @brief Draw GIF image on screen from memory
* Draw GIF image from memory to the LCD screen at position X, Y
* @warning If the GIF has a loop count specified, it will stop after the specified amount of loops and the lcd_gif_t handle will be invalid for further use
* @warning If the GIF has a loop count specified, it will stop after the specified amount of loops and the lcd_gif_t
* handle will be invalid for further use
* @note Before drawing over a GIF, make sure to call lcd_stop_gif(), otherwise the GIF will keep overwriting the screen
*
* @param src Pointer to the GIF image data
@@ -201,7 +206,8 @@ lcd_gif_t* lcd_draw_gif(uint8_t* src, size_t size, uint32_t x_pos, uint32_t y_po
/**
* @brief Draw GIF image on screen from filesystem
* Draw GIF image from filesystem to the LCD screen at position X, Y
* @warning If the GIF has a loop count specified, it will stop after the specified amount of loops and the lcd_git_t handle will be invalidated
* @warning If the GIF has a loop count specified, it will stop after the specified amount of loops and the lcd_git_t
* handle will be invalidated
* @note Before drawing over a GIF, make sure to call lcd_stop_gif(), otherwise the GIF will keep overwriting the screen
*
* @param name The filename of the GIF image
@@ -214,7 +220,8 @@ lcd_gif_t* lcd_draw_gif_from_fs(const char* name, uint32_t x_pos, uint32_t y_pos
/**
* @brief Draw GIF image on screen from filesystem
* Draw GIF image from filesystem to the LCD screen at position X, Y
* @warning If the GIF has a loop count specified, it will stop after the specified amount of loops and the lcd_git_t handle will be invalidated
* @warning If the GIF has a loop count specified, it will stop after the specified amount of loops and the lcd_git_t
* handle will be invalidated
* @note Before drawing over a GIF, make sure to call lcd_stop_gif(), otherwise the GIF will keep overwriting the screen
*
* @param file The pointer to the llfs_file_t

View File

@@ -11,8 +11,8 @@
#ifndef LOG_H
#define LOG_H
#include <stdint.h>
#include <errno.h>
#include <stdint.h>
#include <stdio.h>
#include <sys/stat.h>
#include <sys/times.h>
@@ -88,27 +88,37 @@
#endif
#if LOGGER_LEVEL <= 1
#define LOG_DEBUG(tag, fmt, ...) printf(LOG_COLOR_D"[Debug] (%8lu) [%s]: " fmt LOG_RESET_COLOR "\r\n", logger_get_timestamp(), tag, ##__VA_ARGS__)
#define LOG_DEBUG(tag, fmt, ...) \
printf(LOG_COLOR_D "[Debug] (%8lu) [%s]: " fmt LOG_RESET_COLOR "\r\n", logger_get_timestamp(), tag, \
##__VA_ARGS__)
#else
#define LOG_DEBUG(tag, fmt, ...)
#endif
#if LOGGER_LEVEL <= 2
#define LOG_INFO(tag, fmt, ...) printf(LOG_COLOR_I"[Info] (%8lu) [%s]: " fmt LOG_RESET_COLOR "\r\n", logger_get_timestamp(), tag, ##__VA_ARGS__)
#define LOG_INFO(tag, fmt, ...) \
printf(LOG_COLOR_I "[Info] (%8lu) [%s]: " fmt LOG_RESET_COLOR "\r\n", logger_get_timestamp(), tag, \
##__VA_ARGS__)
#else
#define LOG_INFO(tag, fmt, ...)
#endif
#if LOGGER_LEVEL <= 3
#define LOG_WARN(tag, fmt, ...) printf(LOG_COLOR_W"[Warning] (%8lu) [%s]: " fmt LOG_RESET_COLOR "\r\n", logger_get_timestamp(), tag, ##__VA_ARGS__)
#define LOG_WARN(tag, fmt, ...) \
printf(LOG_COLOR_W "[Warning] (%8lu) [%s]: " fmt LOG_RESET_COLOR "\r\n", logger_get_timestamp(), tag, \
##__VA_ARGS__)
#else
#define LOG_WARN(tag, fmt, ...)
#endif
#if LOGGER_LEVEL <= 4
#define LOG_CRIT(tag, fmt, ...) printf(LOG_COLOR_C"[Critical] (%8lu) [%s]: " fmt LOG_RESET_COLOR "\r\n", logger_get_timestamp(), tag, ##__VA_ARGS__)
#define LOG_CRIT(tag, fmt, ...) \
printf(LOG_COLOR_C "[Critical] (%8lu) [%s]: " fmt LOG_RESET_COLOR "\r\n", logger_get_timestamp(), tag, \
##__VA_ARGS__)
#else
#define LOG_CRIT(tag, fmt, ...)
#endif
#if LOGGER_LEVEL <= 4
#define LOG_FATAL(tag, fmt, ...) printf(LOG_COLOR_F"[Fatal] (%8lu) [%s]: " fmt LOG_RESET_COLOR "\r\n", logger_get_timestamp(), tag, ##__VA_ARGS__)
#define LOG_FATAL(tag, fmt, ...) \
printf(LOG_COLOR_F "[Fatal] (%8lu) [%s]: " fmt LOG_RESET_COLOR "\r\n", logger_get_timestamp(), tag, \
##__VA_ARGS__)
#else
#define LOG_FATAL(tag, fmt, ...)
#endif

View File

@@ -11,15 +11,13 @@
#define MODBUSPORT 502 // 502 is the default
#include <tcp.h>
#include <string.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
#include <tcp.h>
#include "lcd_api.h"
#include "llfs.h"
/**
* @fn void modbus_init
* @brief Initializes the modbus tcp

View File

@@ -1,21 +1,30 @@
/**
* @file tcp_cmd.h
* @brief TCP CMD interface
* @author Gert R.
* @brief This file contains the headers of the tcp command interface
* @author Sander S.
*/
#ifndef INC_TCP_CMD_H_
#define INC_TCP_CMD_H_
#ifndef TESTING
#include "lcd_api.h"
#else
#include "mocs.h"
#endif
#include "llfs.h"
#include "log.h"
#include <tcp.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
#include <ctype.h>
void tcp_cmd_remove_newline(char* str, size_t len);
char* tcp_cmd_remove_leading_space(char* str, size_t len);
void tcp_cmd_str_tolower(char* str);
char* tcp_cmd_get_next_token(char* input, const char* delimiters, char** next);
void tcp_cmd_init(void);
err_t tcp_cmd_recv(void* arg, struct tcp_pcb* pcb, struct pbuf* p, err_t err);
#endif /* INC_TCP_CMD_H_ */

View File

@@ -0,0 +1,82 @@
/**
* @file website_backend.h
* @brief Backend for the website to operate
* @author Toon B.
*/
#ifndef INC_WEBSITE_BACKEND_
#define INC_WEBSITE_BACKEND_
/* Include headers C lib */
#include <stdint.h>
#include <string.h>
/* Defines */
#define LOGGER_LEVEL_ALL
#define STR_MAX 200
#define CLR_MAX 11
#define IMG_X 0
#define IMG_Y 0
#define SD_IMG "st.bmp"
/* Include headers */
#include "httpd.h"
#include "lcd_api.h"
#include "llfs.h"
#include "log.h"
#include "lwip.h"
#include "lwip/apps/fs.h"
/**
* @fn void wbe_init(void)
* @brief Initialise the http server. It also sets the beginning screen
* of the display.
*/
void wbe_init(void);
/**
* @fn int fs_open_custom(struct fs_file*, const char*)
* @brief Function is called when the frontend wants to reach/open a file
* or endpoint on the backend.
*
* @param[in] file, the file pointer of the file that the frontend wants
* @param[in] name, the name of the file or endpoint that the frontend asks for
* @return[out] returns 0 if file or endpoint was not found, 1 if it was found
*/
int fs_open_custom(struct fs_file* file, const char* name);
/**
* @fn void fs_close_custom(struct fs_file*)
* @brief Called when closing files and endpoints
*
* @param[in] file, the file pointer of the file that the frontend wants
*/
void fs_close_custom(struct fs_file* file);
/**
* @fn void httpd_cgi_handler(struct fs_file*, const char*, int, char**, char**)
* @brief When data is send from the frontend to the backend with the CGI
* tag and parameters, this function is called. With this comes parameters that
* we want to read for further use.
*
* @param[in] file, the file pointer of the file that the frontend wants
* @param[in] uri, the URI that is given to the backend from the frontend (here cgi)
* @param[in] num_parm, the number of parameters that is given with the URI
* @param[in] pc_param, contains the name of each parameter
* @param[in] pc_value, is the value of each parameter
*/
void httpd_cgi_handler(struct fs_file* file, const char* uri, int num_parm, char** pc_param, char** pc_value);
/**
* @fn void wbe_display(const char*, const uint32_t, const uint32_t, const char*)
* @brief Function displays the sentence, its color, the background and the given
* image on the LCD screen.
*
* @param[in] txt, is the text string that needs to be displayed
* @param[in] txt_color, the color of the wanted string
* @param[in] background_color, color of the background of the screen
* @param[in] image, name of the wanted image to be displayed
*/
void wbe_display(const char* txt, const uint32_t txt_color, const uint32_t background_color, const char* image);
#endif /* INC_WEBSITE_BACKEND_ */

View File

@@ -56,13 +56,11 @@ static void udp_broadcast_name_to_lcd(void){
text[UDP_BROADCAST_LCD_TEXT_SIZE - 1] = '\0'; // Make the last a NULL byte
lcd_display_text(text, owner_name_x_pos, owner_name_y_pos, LCD_BLACK, LCD_WHITE, LCD_FONT12);
snprintf(text, UDP_BROADCAST_LCD_TEXT_SIZE, "%s%s",UDP_BROADCAST_LCD_NAME_PRE_TEXT,
udp_owner.name);
snprintf(text, UDP_BROADCAST_LCD_TEXT_SIZE, "%s%s", UDP_BROADCAST_LCD_NAME_PRE_TEXT, udp_owner.name);
lcd_display_text(text, owner_name_x_pos, owner_name_y_pos, LCD_BLACK, LCD_WHITE, LCD_FONT12);
}
/**
* @fn uint8_t udp_broadcast_set_owner_details_name(owner_details_t*, const char*)
* @brief set_owner_details_name() sets the owner's name in the owner_details_t struct
@@ -76,7 +74,6 @@ static void udp_broadcast_name_to_lcd(void){
*/
static uint8_t udp_broadcast_set_owner_details_name(const char* name) {
if (name == NULL) {
LOG_WARN(TAG, "%s: string given is a NULL pointer", __func__);
return 1;
@@ -144,8 +141,8 @@ static void udp_broadcast_format_reply(void) {
udp_owner.mac_address[1], udp_owner.mac_address[2], udp_owner.mac_address[3], udp_owner.mac_address[4],
udp_owner.mac_address[5]);
snprintf(reply_buf, UDP_BROADCAST_MAX_REPLY_SIZE, "%s %s %s %s", mac_addr_str, UDP_BROADCAST_REPLY_MIDDLE_TEXT, udp_owner.surname,
udp_owner.name);
snprintf(reply_buf, UDP_BROADCAST_MAX_REPLY_SIZE, "%s %s %s %s", mac_addr_str, UDP_BROADCAST_REPLY_MIDDLE_TEXT,
udp_owner.surname, udp_owner.name);
udp_broadcast_set_owner_details_reply(reply_buf);
}
@@ -163,7 +160,6 @@ static void udp_broadcast_format_reply(void) {
*/
err_t udp_broadcast_set_owner_details(const char* name, const char* surname) {
if (!udp_broadcast_set_owner_details_name(name) && !udp_broadcast_set_owner_details_surname(surname)) {
// If both return 0 it's okay
udp_broadcast_set_owner_details_mac();
udp_broadcast_format_reply();
@@ -245,9 +241,9 @@ static uint8_t udp_broadcast_check_function(const char data[UDP_BROADCAST_MAX_DA
counter++;
}
}
if (enders[2] - enders[1] < UDP_BROADCAST_MAX_NAME_SIZE + 2 && data_len - enders[3] < UDP_BROADCAST_MAX_NAME_SIZE + 2
&& strncmp(data + enders[0], ":name", 5) == 0 && strncmp(data + enders[2], ", surname", 9) == 0) {
if (enders[2] - enders[1] < UDP_BROADCAST_MAX_NAME_SIZE + 2
&& data_len - enders[3] < UDP_BROADCAST_MAX_NAME_SIZE + 2 && strncmp(data + enders[0], ":name", 5) == 0
&& strncmp(data + enders[2], ", surname", 9) == 0) {
counter = 0;
for (uint8_t i = enders[1] + 2; i < enders[2]; i++) {
buffer[counter] = data[i];
@@ -336,7 +332,6 @@ static void udp_receive_callback(void* arg,
LOG_INFO(TAG, "%s: tried to reply to %s at port: %d: %s", __func__, source_ip_str, 64000, udp_owner.reply);
}
defer:
pbuf_free(p);
pbuf_free(p_data);
@@ -375,8 +370,6 @@ err_t udp_broadcast_connection_init(void) {
return err;
}
/**
* @fn err_t udp_broadcast_init()
* @brief udp_broadcast_init() initializes the owner's variables and calls upon @see udp_broadcast_connection_init()

View File

@@ -41,8 +41,7 @@ static int32_t seekFile(GIFFILE *pFile, int32_t iPosition);
static void closeFile(void* handle);
// C API
int GIF_openRAM(GIFIMAGE *pGIF, uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK *pfnDraw)
{
int GIF_openRAM(GIFIMAGE* pGIF, uint8_t* pData, int iDataSize, GIF_DRAW_CALLBACK* pfnDraw) {
pGIF->iError = GIF_SUCCESS;
pGIF->pfnRead = readMem;
pGIF->pfnSeek = seekMem;
@@ -54,20 +53,17 @@ int GIF_openRAM(GIFIMAGE *pGIF, uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK
return GIFInit(pGIF);
} /* GIF_openRAM() */
void GIF_close(GIFIMAGE *pGIF)
{
void GIF_close(GIFIMAGE* pGIF) {
if (pGIF->pfnClose)
(*pGIF->pfnClose)(pGIF->GIFFile.fHandle);
} /* GIF_close() */
void GIF_begin(GIFIMAGE *pGIF, unsigned char ucPaletteType)
{
void GIF_begin(GIFIMAGE* pGIF, unsigned char ucPaletteType) {
memset(pGIF, 0, sizeof(GIFIMAGE));
pGIF->ucPaletteType = ucPaletteType;
} /* GIF_begin() */
void GIF_reset(GIFIMAGE *pGIF)
{
void GIF_reset(GIFIMAGE* pGIF) {
(*pGIF->pfnSeek)(&pGIF->GIFFile, 0);
} /* GIF_reset() */
@@ -77,8 +73,7 @@ void GIF_reset(GIFIMAGE *pGIF)
// 0 = good decode, no more frames
// -1 = error
//
int GIF_playFrame(GIFIMAGE *pGIF, int *delayMilliseconds, void *pUser)
{
int GIF_playFrame(GIFIMAGE* pGIF, int* delayMilliseconds, void* pUser) {
int rc;
if (delayMilliseconds)
@@ -87,17 +82,14 @@ int GIF_playFrame(GIFIMAGE *pGIF, int *delayMilliseconds, void *pUser)
{
(*pGIF->pfnSeek)(&pGIF->GIFFile, 0); // seek to start
}
if (GIFParseInfo(pGIF, 0))
{
if (GIFParseInfo(pGIF, 0)) {
pGIF->pUser = pUser;
if (pGIF->iError == GIF_EMPTY_FRAME) // don't try to decode it
return 0;
rc = DecodeLZW(pGIF, 0);
if (rc != 0) // problem
return 0;
}
else
{
} else {
return 0; // error parsing the frame info, we may be at the end of the file
}
// Return 1 for more frames or 0 if this was the last frame
@@ -106,23 +98,19 @@ int GIF_playFrame(GIFIMAGE *pGIF, int *delayMilliseconds, void *pUser)
return (pGIF->GIFFile.iPos < pGIF->GIFFile.iSize - 1);
} /* GIF_playFrame() */
int GIF_getCanvasWidth(GIFIMAGE *pGIF)
{
int GIF_getCanvasWidth(GIFIMAGE* pGIF) {
return pGIF->iCanvasWidth;
} /* GIF_getCanvasWidth() */
int GIF_getCanvasHeight(GIFIMAGE *pGIF)
{
int GIF_getCanvasHeight(GIFIMAGE* pGIF) {
return pGIF->iCanvasHeight;
} /* GIF_getCanvasHeight() */
int GIF_getLoopCount(GIFIMAGE *pGIF)
{
int GIF_getLoopCount(GIFIMAGE* pGIF) {
return pGIF->iRepeatCount;
} /* GIF_getLoopCount() */
int GIF_getComment(GIFIMAGE *pGIF, char *pDest)
{
int GIF_getComment(GIFIMAGE* pGIF, char* pDest) {
int32_t iOldPos;
iOldPos = pGIF->GIFFile.iPos; // keep old position
@@ -134,8 +122,7 @@ int GIF_getComment(GIFIMAGE *pGIF, char *pDest)
} /* GIF_getComment() */
int GIF_getLastError(GIFIMAGE *pGIF)
{
int GIF_getLastError(GIFIMAGE* pGIF) {
return pGIF->iError;
} /* GIF_getLastError() */
@@ -143,8 +130,7 @@ int GIF_getLastError(GIFIMAGE *pGIF)
//
// Helper functions for memory based images
//
static int32_t readMem(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen)
{
static int32_t readMem(GIFFILE* pFile, uint8_t* pBuf, int32_t iLen) {
int32_t iBytesRead;
iBytesRead = iLen;
@@ -157,8 +143,7 @@ static int32_t readMem(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen)
return iBytesRead;
} /* readMem() */
static int32_t readFLASH(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen)
{
static int32_t readFLASH(GIFFILE* pFile, uint8_t* pBuf, int32_t iLen) {
int32_t iBytesRead;
iBytesRead = iLen;
@@ -171,31 +156,31 @@ static int32_t readFLASH(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen)
return iBytesRead;
} /* readFLASH() */
static int32_t seekMem(GIFFILE *pFile, int32_t iPosition)
{
if (iPosition < 0) iPosition = 0;
else if (iPosition >= pFile->iSize) iPosition = pFile->iSize-1;
static int32_t seekMem(GIFFILE* pFile, int32_t iPosition) {
if (iPosition < 0)
iPosition = 0;
else if (iPosition >= pFile->iSize)
iPosition = pFile->iSize - 1;
pFile->iPos = iPosition;
return iPosition;
} /* seekMem() */
#if defined(__LINUX__) || defined(__MCUXPRESSO)
static void closeFile(void *handle)
{
static void closeFile(void* handle) {
fclose((FILE*)handle);
} /* closeFile() */
static int32_t seekFile(GIFFILE *pFile, int32_t iPosition)
{
if (iPosition < 0) iPosition = 0;
else if (iPosition >= pFile->iSize) iPosition = pFile->iSize-1;
static int32_t seekFile(GIFFILE* pFile, int32_t iPosition) {
if (iPosition < 0)
iPosition = 0;
else if (iPosition >= pFile->iSize)
iPosition = pFile->iSize - 1;
pFile->iPos = iPosition;
fseek((FILE*)pFile->fHandle, iPosition, SEEK_SET);
return iPosition;
} /* seekMem() */
static int32_t readFile(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen)
{
static int32_t readFile(GIFFILE* pFile, uint8_t* pBuf, int32_t iLen) {
int32_t iBytesRead;
iBytesRead = iLen;
@@ -218,8 +203,7 @@ static int32_t readFile(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen)
// returns 1 for success, 0 for failure
// Fills in the canvas size of the GIFIMAGE structure
//
static int GIFInit(GIFIMAGE *pGIF)
{
static int GIFInit(GIFIMAGE* pGIF) {
pGIF->GIFFile.iPos = 0; // start at beginning of file
if (!GIFParseInfo(pGIF, 1)) // gather info for the first frame
return 0; // something went wrong; not a GIF file?
@@ -237,8 +221,7 @@ static int GIFInit(GIFIMAGE *pGIF)
// and return the canvas size only
// Returns 1 for success, 0 for failure
//
static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly)
{
static int GIFParseInfo(GIFIMAGE* pPage, int bInfoOnly) {
int i, j, iColorTableBits;
int iBytesRead;
unsigned char c, *p;
@@ -282,10 +265,8 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly)
{ // by default, convert to byte-reversed RGB565 for immediate use
// Read enough additional data for the color table
iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], 3 * (1 << iColorTableBits));
if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE)
{
for (i=0; i<(1<<iColorTableBits); i++)
{
if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE) {
for (i = 0; i < (1 << iColorTableBits); i++) {
uint16_t usRGB565;
usRGB565 = ((p[iOffset] >> 3) << 11); // R
usRGB565 |= ((p[iOffset + 1] >> 2) << 5); // G
@@ -296,8 +277,7 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly)
pPage->pPalette[i] = __builtin_bswap16(usRGB565); // SPI wants MSB first
iOffset += 3;
}
}
else // just copy it as-is
} else // just copy it as-is
{
memcpy(pPage->pPalette, &p[iOffset], (1 << iColorTableBits) * 3);
iOffset += (1 << iColorTableBits) * 3;
@@ -316,7 +296,8 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly)
{
pPage->ucGIFBits = p[iOffset + 1]; // packed fields
pPage->iFrameDelay = (INTELSHORT(&p[iOffset + 2])) * 10; // delay in ms
if (pPage->iFrameDelay <= 1) // 0-1 is going to make it run at 60fps; use 100 (10fps) as a reasonable substitute
if (pPage->iFrameDelay
<= 1) // 0-1 is going to make it run at 60fps; use 100 (10fps) as a reasonable substitute
pPage->iFrameDelay = 100;
if (pPage->ucGIFBits & 1) // transparent color is used
pPage->ucTransparent = p[iOffset + 4]; // transparent color index
@@ -331,7 +312,8 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly)
c = p[iOffset++]; /* Block length */
if ((iBytesRead - iOffset) < (c + 32)) // need to read more data first
{
memmove(pPage->ucFileBuf, &pPage->ucFileBuf[iOffset], (iBytesRead-iOffset)); // move existing data down
memmove(pPage->ucFileBuf, &pPage->ucFileBuf[iOffset],
(iBytesRead - iOffset)); // move existing data down
iBytesRead -= iOffset;
iStartPos += iOffset;
iOffset = 0;
@@ -339,8 +321,7 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly)
}
if (c == 11) // fixed block length
{ // Netscape app block contains the repeat count
if (memcmp(&p[iOffset], "NETSCAPE2.0", 11) == 0)
{
if (memcmp(&p[iOffset], "NETSCAPE2.0", 11) == 0) {
if (p[iOffset + 11] == 3 && p[iOffset + 12] == 1) // loop count
pPage->iRepeatCount = INTELSHORT(&p[iOffset + 13]);
}
@@ -373,7 +354,8 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly)
c = p[iOffset++]; /* Block length */
if ((iBytesRead - iOffset) < (c + 32)) // need to read more data first
{
memmove(pPage->ucFileBuf, &pPage->ucFileBuf[iOffset], (iBytesRead-iOffset)); // move existing data down
memmove(pPage->ucFileBuf, &pPage->ucFileBuf[iOffset],
(iBytesRead - iOffset)); // move existing data down
iBytesRead -= iOffset;
iStartPos += iOffset;
iOffset = 0;
@@ -392,8 +374,7 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly)
pPage->iError = GIF_DECODE_ERROR;
return 0;
} /* switch */
}
else // invalid byte, stop decoding
} else // invalid byte, stop decoding
{
if (pPage->GIFFile.iSize - iStartPos < 32) // non-image bytes at end of file?
pPage->iError = GIF_EMPTY_FRAME;
@@ -430,10 +411,8 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly)
j = (1 << ((pPage->ucMap & 7) + 1));
// Read enough additional data for the color table
iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], j * 3);
if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE)
{
for (i=0; i<j; i++)
{
if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE) {
for (i = 0; i < j; i++) {
uint16_t usRGB565;
usRGB565 = ((p[iOffset] >> 3) << 11); // R
usRGB565 |= ((p[iOffset + 1] >> 2) << 5); // G
@@ -444,8 +423,7 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly)
pPage->pLocalPalette[i] = __builtin_bswap16(usRGB565); // SPI wants MSB first
iOffset += 3;
}
}
else // just copy it as-is
} else // just copy it as-is
{
memcpy(pPage->pLocalPalette, &p[iOffset], j * 3);
iOffset += j * 3;
@@ -459,18 +437,15 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly)
// into "pure" LZW
pPage->iLZWSize = 0; // we're starting with no LZW data yet
c = 1; // get chunk length
while (c && iOffset < iBytesRead)
{
while (c && iOffset < iBytesRead) {
// Serial.printf("iOffset=%d, iBytesRead=%d\n", iOffset, iBytesRead);
c = p[iOffset++]; // get chunk length
// Serial.printf("Chunk size = %d\n", c);
if (c <= (iBytesRead - iOffset))
{
if (c <= (iBytesRead - iOffset)) {
memcpy(&pPage->ucLZW[pPage->iLZWSize], &p[iOffset], c);
pPage->iLZWSize += c;
iOffset += c;
}
else // partial chunk in our buffer
} else // partial chunk in our buffer
{
int iPartialLen = (iBytesRead - iOffset);
memcpy(&pPage->ucLZW[pPage->iLZWSize], &p[iOffset], iPartialLen);
@@ -484,8 +459,7 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly)
}
// seeking on an SD card is VERY VERY SLOW, so use the data we've already read by de-chunking it
// in this case, there's too much data, so we have to seek backwards a bit
if (iOffset < iBytesRead)
{
if (iOffset < iBytesRead) {
// Serial.printf("Need to seek back %d bytes\n", iBytesRead - iOffset);
(*pPage->pfnSeek)(&pPage->GIFFile, iStartPos + iOffset); // position file to new spot
}
@@ -494,8 +468,7 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly)
//
// Gather info about an animated GIF file
//
int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo)
{
int GIF_getInfo(GIFIMAGE* pPage, GIFINFO* pInfo) {
int iOff, iNumFrames;
int iDelay, iMaxDelay, iMinDelay, iTotalDelay;
int iReadAmount;
@@ -526,8 +499,7 @@ int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo)
while (!bDone) // && iNumFrames < MAX_FRAMES)
{
bExt = 1; /* skip extension blocks */
while (bExt && iOff < iDataAvailable)
{
while (bExt && iOff < iDataAvailable) {
if ((iDataAvailable - iOff) < 258) // need to read more data first
{
memmove(cBuf, &cBuf[iOff], (iDataAvailable - iOff)); // move existing data down
@@ -538,8 +510,7 @@ int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo)
iDataRemaining -= iReadAmount;
// lFileOff += iReadAmount;
}
switch(cBuf[iOff])
{
switch (cBuf[iOff]) {
case 0x3b: /* End of file */
/* we were fooled into thinking there were more pages */
iNumFrames--;
@@ -558,8 +529,10 @@ int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo)
iDelay = 2;
iDelay *= 10; // turn JIFFIES into milliseconds
iTotalDelay += iDelay;
if (iDelay > iMaxDelay) iMaxDelay = iDelay;
else if (iDelay < iMinDelay) iMinDelay = iDelay;
if (iDelay > iMaxDelay)
iMaxDelay = iDelay;
else if (iDelay < iMinDelay)
iMinDelay = iDelay;
// (cBuf[iOff+6]; // transparent color index
}
iOff += 2; /* skip to length */
@@ -567,8 +540,7 @@ int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo)
iOff++;
// block terminator or optional sub blocks
c = cBuf[iOff++]; /* Skip any sub-blocks */
while (c)
{
while (c) {
iOff += (int)c;
c = cBuf[iOff++];
if ((iDataAvailable - iOff) < (c + 258)) // need to read more data first
@@ -576,7 +548,8 @@ int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo)
memmove(cBuf, &cBuf[iOff], (iDataAvailable - iOff)); // move existing data down
iDataAvailable -= iOff;
iOff = 0;
iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], FILE_BUF_SIZE-iDataAvailable);
iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable],
FILE_BUF_SIZE - iDataAvailable);
iDataAvailable += iReadAmount;
iDataRemaining -= iReadAmount;
// lFileOff += iReadAmount;
@@ -651,15 +624,14 @@ int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo)
c = cBuf[iOff++]; /* Get length of next */
}
/* End of image data, check for more pages... */
if (cBuf[iOff] == 0x3b || (iDataRemaining == 0 && (iDataAvailable - iOff) < 32))
{
if (cBuf[iOff] == 0x3b || (iDataRemaining == 0 && (iDataAvailable - iOff) < 32)) {
bDone = 1; /* End of file has been reached */
}
else /* More pages to scan */
} else /* More pages to scan */
{
iNumFrames++;
// read new page data starting at this offset
if (pPage->GIFFile.iSize > FILE_BUF_SIZE && iDataRemaining > 0) // since we didn't read the whole file in one shot
if (pPage->GIFFile.iSize > FILE_BUF_SIZE
&& iDataRemaining > 0) // since we didn't read the whole file in one shot
{
memmove(cBuf, &cBuf[iOff], (iDataAvailable - iOff)); // move existing data down
iDataAvailable -= iOff;
@@ -687,15 +659,13 @@ gifpagesz:
// returns 1 to signify more data available for this image
// 0 indicates there is no more data
//
static int GIFGetMoreData(GIFIMAGE *pPage)
{
static int GIFGetMoreData(GIFIMAGE* pPage) {
int iDelta = (pPage->iLZWSize - pPage->iLZWOff);
unsigned char c = 1;
// move any existing data down
if (pPage->bEndOfFrame || iDelta >= (LZW_BUF_SIZE - MAX_CHUNK_SIZE) || iDelta <= 0)
return 1; // frame is finished or buffer is already full; no need to read more data
if (pPage->iLZWOff != 0)
{
if (pPage->iLZWOff != 0) {
// NB: memcpy() fails on some systems because the src and dest ptrs overlap
// so copy the bytes in a simple loop to avoid problems
for (int i = 0; i < pPage->iLZWSize - pPage->iLZWOff; i++) {
@@ -704,8 +674,7 @@ static int GIFGetMoreData(GIFIMAGE *pPage)
pPage->iLZWSize -= pPage->iLZWOff;
pPage->iLZWOff = 0;
}
while (c && pPage->GIFFile.iPos < pPage->GIFFile.iSize && pPage->iLZWSize < (LZW_BUF_SIZE-MAX_CHUNK_SIZE))
{
while (c && pPage->GIFFile.iPos < pPage->GIFFile.iSize && pPage->iLZWSize < (LZW_BUF_SIZE - MAX_CHUNK_SIZE)) {
(*pPage->pfnRead)(&pPage->GIFFile, &c, 1); // current length
(*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucLZW[pPage->iLZWSize], c);
pPage->iLZWSize += c;
@@ -718,8 +687,7 @@ static int GIFGetMoreData(GIFIMAGE *pPage)
// Handle transparent pixels and disposal method
// Used only when a frame buffer is allocated
//
static void DrawNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw)
{
static void DrawNewPixels(GIFIMAGE* pPage, GIFDRAW* pDraw) {
uint8_t *d, *s;
int x, iPitch = pPage->iCanvasWidth;
@@ -733,16 +701,13 @@ static void DrawNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw)
if (pDraw->ucHasTransparency) // if transparency used
{
uint8_t c, ucTransparent = pDraw->ucTransparent;
for (x=0; x<pDraw->iWidth; x++)
{
for (x = 0; x < pDraw->iWidth; x++) {
c = *s++;
if (c != ucTransparent)
*d = c;
d++;
}
}
else
{
} else {
memcpy(d, s, pDraw->iWidth); // just overwrite the old pixels
}
} /* DrawNewPixels() */
@@ -751,30 +716,24 @@ static void DrawNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw)
// to either RGB565 or RGB888 output
// Used only when a frame buffer has been allocated
//
static void ConvertNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw)
{
static void ConvertNewPixels(GIFIMAGE* pPage, GIFDRAW* pDraw) {
uint8_t *d, *s;
int x;
s = &pPage->pFrameBuffer[(pPage->iCanvasWidth * (pDraw->iY + pDraw->y)) + pDraw->iX];
d = &pPage->pFrameBuffer[pPage->iCanvasHeight * pPage->iCanvasWidth]; // point past bottom of frame buffer
if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE)
{
if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE) {
uint16_t *pPal, *pu16;
pPal = (uint16_t*)pDraw->pPalette;
pu16 = (uint16_t*)d;
for (x=0; x<pPage->iWidth; x++)
{
for (x = 0; x < pPage->iWidth; x++) {
*pu16++ = pPal[*s++]; // convert to RGB565 pixels
}
}
else
{
} else {
uint8_t* pPal;
int pixel;
pPal = (uint8_t*)pDraw->pPalette;
for (x=0; x<pPage->iWidth; x++)
{
for (x = 0; x < pPage->iWidth; x++) {
pixel = *s++;
*d++ = pPal[(pixel * 3) + 0]; // convert to RGB888 pixels
*d++ = pPal[(pixel * 3) + 1];
@@ -786,8 +745,7 @@ static void ConvertNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw)
//
// GIFMakePels
//
static void GIFMakePels(GIFIMAGE *pPage, unsigned int code)
{
static void GIFMakePels(GIFIMAGE* pPage, unsigned int code) {
int iPixCount;
unsigned short* giftabs;
unsigned char *buf, *s, *pEnd, *gifpels;
@@ -798,8 +756,7 @@ static void GIFMakePels(GIFIMAGE *pPage, unsigned int code)
buf = pPage->ucLineBuf + (pPage->iWidth - pPage->iXCount);
giftabs = pPage->usGIFTable;
gifpels = &pPage->ucGIFPixels[PIXEL_LAST];
while (code < LINK_UNUSED)
{
while (code < LINK_UNUSED) {
if (s == pPage->ucFileBuf) /* Houston, we have a problem */
{
return; /* Exit with error */
@@ -809,15 +766,13 @@ static void GIFMakePels(GIFIMAGE *pPage, unsigned int code)
}
iPixCount = (int)(intptr_t)(pPage->ucFileBuf + FILE_BUF_SIZE - s);
while (iPixCount && pPage->iYCount > 0)
{
while (iPixCount && pPage->iYCount > 0) {
if (pPage->iXCount > iPixCount) /* Pixels fit completely on the line */
{
// memcpy(buf, s, iPixCount);
// buf += iPixCount;
pEnd = buf + iPixCount;
while (buf < pEnd)
{
while (buf < pEnd) {
*buf++ = *s++;
}
pPage->iXCount -= iPixCount;
@@ -825,13 +780,11 @@ static void GIFMakePels(GIFIMAGE *pPage, unsigned int code)
if (ucNeedMore)
GIFGetMoreData(pPage); // check if we need to read more LZW data every 4 lines
return;
}
else /* Pixels cross into next line */
} else /* Pixels cross into next line */
{
GIFDRAW gd;
pEnd = buf + pPage->iXCount;
while (buf < pEnd)
{
while (buf < pEnd) {
*buf++ = *s++;
}
iPixCount -= pPage->iXCount;
@@ -867,8 +820,7 @@ static void GIFMakePels(GIFIMAGE *pPage, unsigned int code)
if (pPage->pFrameBuffer) // update the frame buffer
{
DrawNewPixels(pPage, &gd);
if (pPage->ucDrawType == GIF_DRAW_COOKED)
{
if (pPage->ucDrawType == GIF_DRAW_COOKED) {
ConvertNewPixels(pPage, &gd); // prepare for output
gd.pPixels = &pPage->pFrameBuffer[pPage->iCanvasWidth * pPage->iCanvasHeight];
}
@@ -887,16 +839,20 @@ static void GIFMakePels(GIFIMAGE *pPage, unsigned int code)
//
// Macro to extract a variable length code
//
#define GET_CODE if (bitnum > (REGISTER_WIDTH - codesize)) { pImage->iLZWOff += (bitnum >> 3); \
bitnum &= 7; ulBits = INTELLONG(&p[pImage->iLZWOff]); } \
#define GET_CODE \
if (bitnum > (REGISTER_WIDTH - codesize)) { \
pImage->iLZWOff += (bitnum >> 3); \
bitnum &= 7; \
ulBits = INTELLONG(&p[pImage->iLZWOff]); \
} \
code = (unsigned short)(ulBits >> bitnum); /* Read a 32-bit chunk */ \
code &= sMask; bitnum += codesize;
code &= sMask; \
bitnum += codesize;
//
// Decode LZW into an image
//
static int DecodeLZW(GIFIMAGE *pImage, int iOptions)
{
static int DecodeLZW(GIFIMAGE* pImage, int iOptions) {
int i, bitnum;
unsigned short oldcode, codesize, nextcode, nextlim;
unsigned short *giftabs, cc, eoi;
@@ -925,8 +881,7 @@ static int DecodeLZW(GIFIMAGE *pImage, int iOptions)
// Initialize code table
// this part only needs to be initialized once
for (i = 0; i < cc; i++)
{
for (i = 0; i < cc; i++) {
gifpels[PIXEL_FIRST + i] = gifpels[PIXEL_LAST + i] = (unsigned short)i;
giftabs[i] = LINK_END;
}
@@ -947,13 +902,13 @@ init_codetable:
oldcode = code;
GIFMakePels(pImage, code); // first code is output as the first pixel
// Main decode loop
while (code != eoi && pImage->iYCount > 0) // && y < pImage->iHeight+1) /* Loop through all lines of the image (or strip) */
while (code != eoi
&& pImage->iYCount > 0) // && y < pImage->iHeight+1) /* Loop through all lines of the image (or strip) */
{
GET_CODE
if (code == cc) /* Clear code?, and not first code */
goto init_codetable;
if (code != eoi)
{
if (code != eoi) {
if (nextcode < nextlim) // for deferred cc case, don't let it overwrite the last entry (fff)
{
giftabs[nextcode] = oldcode;
@@ -964,8 +919,7 @@ init_codetable:
gifpels[PIXEL_LAST + nextcode] = gifpels[PIXEL_FIRST + code];
}
nextcode++;
if (nextcode >= nextlim && codesize < MAX_CODE_SIZE)
{
if (nextcode >= nextlim && codesize < MAX_CODE_SIZE) {
codesize++;
nextlim <<= 1;
sMask = (sMask << 1) | 1;
@@ -981,8 +935,7 @@ init_codetable:
// return -1;
} /* DecodeLZW() */
void GIF_setDrawCallback(GIFIMAGE *pGIF, GIF_DRAW_CALLBACK *pfnDraw)
{
void GIF_setDrawCallback(GIFIMAGE* pGIF, GIF_DRAW_CALLBACK* pfnDraw) {
pGIF->pfnDraw = pfnDraw;
} /* GIF_setDrawCallback() */
//
@@ -990,18 +943,19 @@ void GIF_setDrawCallback(GIFIMAGE *pGIF, GIF_DRAW_CALLBACK *pfnDraw)
// writes new values over previous line
// expects RGB565 little endian pixels as input
//
void GIF_scaleHalf(uint16_t *pCurrent, uint16_t *pPrev, int iWidth, int bBigEndian)
{
void GIF_scaleHalf(uint16_t* pCurrent, uint16_t* pPrev, int iWidth, int bBigEndian) {
int x;
uint16_t* d = pPrev;
uint32_t gSum, rbSum, pix0, pix1, pix2, pix3;
const uint32_t RBMask = 0xf81f, GMask = 0x7e0;
for (x=0; x<iWidth; x+=2)
{
pix0 = pCurrent[0]; pix1 = pCurrent[1];
pix2 = pPrev[0]; pix3 = pPrev[1];
pCurrent += 2; pPrev += 2;
for (x = 0; x < iWidth; x += 2) {
pix0 = pCurrent[0];
pix1 = pCurrent[1];
pix2 = pPrev[0];
pix3 = pPrev[1];
pCurrent += 2;
pPrev += 2;
gSum = (pix0 & GMask) + (pix1 & GMask) + (pix2 & GMask) + (pix3 & GMask);
gSum = ((gSum + 0x40) >> 2) & GMask; // for rounding towards 1
rbSum = (pix0 & RBMask) + (pix1 & RBMask) + (pix2 & RBMask) + (pix3 & RBMask);

View File

@@ -8,7 +8,6 @@
#include "lcd_api.h"
static const char* TAG = "lcd_api";
static DMA2D_HandleTypeDef hDma2dHandler2;
@@ -85,7 +84,12 @@ void lcd_task(void) {
}
}
void lcd_display_text(const char* text, uint32_t x_pos, uint32_t y_pos, uint32_t color, uint32_t bg_color, sFONT* font) {
void lcd_display_text(const char* text,
uint32_t x_pos,
uint32_t y_pos,
uint32_t color,
uint32_t bg_color,
sFONT* font) {
BSP_LCD_SelectLayer(1);
LOG_INFO(TAG, "Display text: %s @x=%d,y=%d", text, x_pos, y_pos);
@@ -118,7 +122,12 @@ void lcd_display_text(const char* text, uint32_t x_pos, uint32_t y_pos, uint32_t
BSP_LCD_DisplayStringAt(x_pos, y_pos, (uint8_t*)text, LEFT_MODE);
}
void lcd_draw_raw_img(const void* p_src, uint32_t x_pos, uint32_t y_pos, uint32_t x_size, uint32_t y_size, uint32_t color_mode) {
void lcd_draw_raw_img(const void* p_src,
uint32_t x_pos,
uint32_t y_pos,
uint32_t x_size,
uint32_t y_size,
uint32_t color_mode) {
LOG_INFO(TAG, "Displaying raw image: @x=%lu, @y=%lu, width=%lu, height=%lu", x_pos, y_pos, x_size, y_size);
BSP_LCD_SelectLayer(0);
uint32_t address = hLtdcHandler.LayerCfg[1].FBStartAdress + (((BSP_LCD_GetXSize() * y_pos) + x_pos) * (4));

View File

@@ -10,8 +10,8 @@
#include <stdio.h>
#include <string.h>
#define LOGGER_LEVEL_WARN
#include "log.h"
#include "llfs.h"
#include "log.h"
/**
* @brief The maximum number of files that can be opened concurrently using the POSIX API
@@ -442,4 +442,3 @@ static uint8_t file_ext_cmp(const char* const filename, const char* const ext) {
}
return 1;
}

File diff suppressed because it is too large Load Diff

View File

@@ -7,8 +7,8 @@
#include <stdarg.h>
#include <stdint.h>
#include <stdio.h>
#include "stm32f7xx_hal.h"
#include "log.h"
#include "stm32f7xx_hal.h"
extern UART_HandleTypeDef huart1;

View File

@@ -33,6 +33,7 @@
#include "modbus_tcp.h"
#include "UDP_broadcast.h"
#include "tcp_cmd.h"
#include "website_backend.h"
/* USER CODE END Includes */
@@ -88,8 +89,7 @@ static void MX_QUADSPI_Init(void);
* @brief The application entry point.
* @retval int
*/
int main(void)
{
int main(void) {
/* USER CODE BEGIN 1 */
/* USER CODE END 1 */
@@ -120,10 +120,7 @@ int main(void)
MX_QUADSPI_Init();
/* USER CODE BEGIN 2 */
/* Initialize QSPI */
BSP_QSPI_Init();
BSP_QSPI_MemoryMappedMode();
WRITE_REG(QUADSPI->LPTR, 0xFFF);
/* USER CODE END 2 */
/* Clear terminal */
printf(CLEAR_SCREEN);
@@ -133,6 +130,8 @@ int main(void)
/* Initialize the filesystem */
llfs_init();
tcp_cmd_init();
/* USER CODE END 2 */
/* Initialize the tftp server */
tftp_server_init();
@@ -149,18 +148,21 @@ int main(void)
// Initialize the UDP broadcast service
if (udp_broadcast_init(10, 255) != ERR_OK) {
LOG_WARN(TAG,"error initializing udp connection, check warnings from udp_broadcast_init() or udp_broadcast_connection_init()");
LOG_WARN(TAG, "error initializing udp connection, check warnings from udp_broadcast_init() or "
"udp_broadcast_connection_init()");
}
if (udp_broadcast_set_owner_details("Joran", "Van Nieuwenhoven") != ERR_OK) {
LOG_WARN(TAG, "error setting owner's details");
}
/* Initialize website backend */
wbe_init();
/* USER CODE END 2 */
/* Infinite loop */
/* USER CODE BEGIN WHILE */
while (1)
{
while (1) {
/* USER CODE END WHILE */
/* USER CODE BEGIN 3 */
@@ -174,8 +176,7 @@ int main(void)
* @brief System Clock Configuration
* @retval None
*/
void SystemClock_Config(void)
{
void SystemClock_Config(void) {
RCC_OscInitTypeDef RCC_OscInitStruct = {0};
RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
@@ -199,29 +200,25 @@ void SystemClock_Config(void)
RCC_OscInitStruct.PLL.PLLN = 400;
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
RCC_OscInitStruct.PLL.PLLQ = 2;
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
{
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
Error_Handler();
}
/** Activate the Over-Drive mode
*/
if (HAL_PWREx_EnableOverDrive() != HAL_OK)
{
if (HAL_PWREx_EnableOverDrive() != HAL_OK) {
Error_Handler();
}
/** Initializes the CPU, AHB and APB buses clocks
*/
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
|RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2;
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;
RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_6) != HAL_OK)
{
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_6) != HAL_OK) {
Error_Handler();
}
}
@@ -231,8 +228,7 @@ void SystemClock_Config(void)
* @param None
* @retval None
*/
static void MX_DMA2D_Init(void)
{
static void MX_DMA2D_Init(void) {
/* USER CODE BEGIN DMA2D_Init 0 */
@@ -249,12 +245,10 @@ static void MX_DMA2D_Init(void)
hdma2d.LayerCfg[1].InputColorMode = DMA2D_INPUT_ARGB8888;
hdma2d.LayerCfg[1].AlphaMode = DMA2D_NO_MODIF_ALPHA;
hdma2d.LayerCfg[1].InputAlpha = 0;
if (HAL_DMA2D_Init(&hdma2d) != HAL_OK)
{
if (HAL_DMA2D_Init(&hdma2d) != HAL_OK) {
Error_Handler();
}
if (HAL_DMA2D_ConfigLayer(&hdma2d, 1) != HAL_OK)
{
if (HAL_DMA2D_ConfigLayer(&hdma2d, 1) != HAL_OK) {
Error_Handler();
}
/* USER CODE BEGIN DMA2D_Init 2 */
@@ -268,8 +262,7 @@ static void MX_DMA2D_Init(void)
* @param None
* @retval None
*/
static void MX_LTDC_Init(void)
{
static void MX_LTDC_Init(void) {
/* USER CODE BEGIN LTDC_Init 0 */
@@ -297,8 +290,7 @@ static void MX_LTDC_Init(void)
hltdc.Init.Backcolor.Blue = 0;
hltdc.Init.Backcolor.Green = 255;
hltdc.Init.Backcolor.Red = 0;
if (HAL_LTDC_Init(&hltdc) != HAL_OK)
{
if (HAL_LTDC_Init(&hltdc) != HAL_OK) {
Error_Handler();
}
pLayerCfg.WindowX0 = 0;
@@ -316,8 +308,7 @@ static void MX_LTDC_Init(void)
pLayerCfg.Backcolor.Blue = 0;
pLayerCfg.Backcolor.Green = 0;
pLayerCfg.Backcolor.Red = 0;
if (HAL_LTDC_ConfigLayer(&hltdc, &pLayerCfg, 0) != HAL_OK)
{
if (HAL_LTDC_ConfigLayer(&hltdc, &pLayerCfg, 0) != HAL_OK) {
Error_Handler();
}
pLayerCfg1.WindowX0 = 0;
@@ -335,8 +326,7 @@ static void MX_LTDC_Init(void)
pLayerCfg1.Backcolor.Blue = 0;
pLayerCfg1.Backcolor.Green = 0;
pLayerCfg1.Backcolor.Red = 0;
if (HAL_LTDC_ConfigLayer(&hltdc, &pLayerCfg1, 1) != HAL_OK)
{
if (HAL_LTDC_ConfigLayer(&hltdc, &pLayerCfg1, 1) != HAL_OK) {
Error_Handler();
}
/* USER CODE BEGIN LTDC_Init 2 */
@@ -350,8 +340,7 @@ static void MX_LTDC_Init(void)
* @param None
* @retval None
*/
static void MX_QUADSPI_Init(void)
{
static void MX_QUADSPI_Init(void) {
/* USER CODE BEGIN QUADSPI_Init 0 */
@@ -370,8 +359,7 @@ static void MX_QUADSPI_Init(void)
hqspi.Init.ClockMode = QSPI_CLOCK_MODE_0;
hqspi.Init.FlashID = QSPI_FLASH_ID_1;
hqspi.Init.DualFlash = QSPI_DUALFLASH_DISABLE;
if (HAL_QSPI_Init(&hqspi) != HAL_OK)
{
if (HAL_QSPI_Init(&hqspi) != HAL_OK) {
Error_Handler();
}
/* USER CODE BEGIN QUADSPI_Init 2 */
@@ -385,8 +373,7 @@ static void MX_QUADSPI_Init(void)
* @param None
* @retval None
*/
static void MX_USART1_UART_Init(void)
{
static void MX_USART1_UART_Init(void) {
/* USER CODE BEGIN USART1_Init 0 */
@@ -405,8 +392,7 @@ static void MX_USART1_UART_Init(void)
huart1.Init.OverSampling = UART_OVERSAMPLING_16;
huart1.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE;
huart1.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT;
if (HAL_UART_Init(&huart1) != HAL_OK)
{
if (HAL_UART_Init(&huart1) != HAL_OK) {
Error_Handler();
}
/* USER CODE BEGIN USART1_Init 2 */
@@ -416,8 +402,7 @@ static void MX_USART1_UART_Init(void)
}
/* FMC initialization function */
static void MX_FMC_Init(void)
{
static void MX_FMC_Init(void) {
/* USER CODE BEGIN FMC_Init 0 */
@@ -452,8 +437,7 @@ static void MX_FMC_Init(void)
SdramTiming.RPDelay = 16;
SdramTiming.RCDDelay = 16;
if (HAL_SDRAM_Init(&hsdram1, &SdramTiming) != HAL_OK)
{
if (HAL_SDRAM_Init(&hsdram1, &SdramTiming) != HAL_OK) {
Error_Handler();
}
@@ -467,8 +451,7 @@ static void MX_FMC_Init(void)
* @param None
* @retval None
*/
static void MX_GPIO_Init(void)
{
static void MX_GPIO_Init(void) {
GPIO_InitTypeDef GPIO_InitStruct = {0};
/* USER CODE BEGIN MX_GPIO_Init_1 */
/* USER CODE END MX_GPIO_Init_1 */
@@ -523,13 +506,11 @@ static void MX_GPIO_Init(void)
* @brief This function is executed in case of error occurrence.
* @retval None
*/
void Error_Handler(void)
{
void Error_Handler(void) {
/* USER CODE BEGIN Error_Handler_Debug */
/* User can add his own implementation to report the HAL error return state */
__disable_irq();
while (1)
{
while (1) {
}
/* USER CODE END Error_Handler_Debug */
}

View File

@@ -28,13 +28,7 @@
#define SERVER_IP4_D 11
#define SERVER_PORT 1883
typedef enum input_topic {
set_text,
set_text_color,
set_color,
set_image,
other_topic
} input_topic_t;
typedef enum input_topic { set_text, set_text_color, set_color, set_image, other_topic } input_topic_t;
// Function prototypes
static void mqtt_pub_request_cb(void*, err_t);
@@ -47,7 +41,8 @@ static void mosquitto_connect(mqtt_client_t*);
static uint32_t color_picker(char*);
static void create_publish_string(char*, char*, size_t);
// Global variables used in mqtt_incoming_publish_cb and mqtt_incoming_data_cb to give an easy to use ID to the subscribed topics
// Global variables used in mqtt_incoming_publish_cb and mqtt_incoming_data_cb to give an easy to use ID to the
// subscribed topics
static sFONT* font;
static uint16_t xpos;
static uint16_t ypos;
@@ -82,7 +77,8 @@ static void publish_data(mqtt_client_t* client, void* arg) {
create_publish_string("*.bmp", pub_payload, sizeof(pub_payload));
err = mqtt_publish(client, "getImageList", pub_payload, strlen(pub_payload), PUBLISH_QOS, PUBLISH_RETAIN, mqtt_pub_request_cb, arg);
err = mqtt_publish(client, "getImageList", pub_payload, strlen(pub_payload), PUBLISH_QOS, PUBLISH_RETAIN,
mqtt_pub_request_cb, arg);
if (err != ERR_OK) {
LOG_DEBUG(TAG, "Publish err: %d", err);
}
@@ -90,7 +86,8 @@ static void publish_data(mqtt_client_t* client, void* arg) {
pub_payload[0] = '\0';
create_publish_string("*.gif", pub_payload, sizeof(pub_payload));
err = mqtt_publish(client, "getGifList", pub_payload, strlen(pub_payload), PUBLISH_QOS, PUBLISH_RETAIN, mqtt_pub_request_cb, arg);
err = mqtt_publish(client, "getGifList", pub_payload, strlen(pub_payload), PUBLISH_QOS, PUBLISH_RETAIN,
mqtt_pub_request_cb, arg);
if (err != ERR_OK) {
LOG_DEBUG(TAG, "Publish err: %d", err);
}

View File

@@ -1,182 +1,592 @@
/**
* @file tcp_cmd.c
* @brief TCP CMD interface
* @author Gert R.
* @brief This file contains the implementation of the tcp command interface
* @author Sander S.
*/
#include "tcp_cmd.h"
static uint32_t result_txt = 0xff000000; // Store text color
static uint32_t result_bg = 0xff000000; // Store background color
#define MAX_TOKENS 10
#define MAX_CMD_LEN 50
static void tcp_cmd_close(struct tcp_pcb* pcb) {
tcp_arg(pcb, NULL);
tcp_sent(pcb, NULL);
tcp_recv(pcb, NULL);
#define NCAT
static const char* TAG = "tcp_cmd";
static uint32_t color_txt = 0xffffffff; // Store text color
static uint32_t color_bg = 0xff000000; // Store background color
static void tcp_cmd_write(struct tcp_pcb* pcb, const char* str);
static void tcp_cmd_print_header(struct tcp_pcb* pcb);
static void tcp_cmd_print_help(struct tcp_pcb* pcb);
static void tcp_cmd_clear(struct tcp_pcb* pcb, int argc, char** argv);
static void tcp_cmd_text(struct tcp_pcb* pcb, int argc, char** argv);
static void tcp_cmd_bg_color(struct tcp_pcb* pcb, int argc, char** argv);
static void tcp_cmd_color(struct tcp_pcb* pcb, int argc, char** argv);
static void tcp_cmd_list_files(struct tcp_pcb* pcb, int argc, char** argv);
static void tcp_cmd_set_image(struct tcp_pcb* pcb, int argc, char** argv);
static void tcp_cmd_set_gif(struct tcp_pcb* pcb, int argc, char** argv);
static void tcp_cmd_exit(struct tcp_pcb* pcb, int argc, char** argv);
static void tcp_cmd_unknown_cmd(struct tcp_pcb* pcb, char* cmd);
static bool tcp_cmd_parser(struct tcp_pcb* pcb, int argc, char** argv);
static err_t tcp_cmd_accept(void* arg, struct tcp_pcb* pcb, err_t err);
static void tcp_cmd_close(struct tcp_pcb* pcb);
/**
* @brief This function shifts the arguments in argv and argc
* @param[in,out] argc The argc pointer
* @param[in,out] argv The argv pointer
* @return The shifted argument
*/
static char* shift_args(int* argc, char*** argv) {
if (*argc == 0) {
return NULL;
}
char* arg = (*argv)[0];
(*argv)++;
(*argc)--;
return arg;
}
/**
* @brief This function converts a string to a color
* @param[in] argc The number of arguments
* @param[in] argv The arguments
* @param[out] color The color to write to
* @return true The conversion failed
* @return false The conversion succeeded
*/
static bool str_to_color(int argc, char** argv, uint32_t* color) {
if (argc == 1) {
*color = (uint32_t)strtoul(argv[0], NULL, 16);
return false;
}
if (argc == 3) {
*color = 0xff000000;
*color |= (uint32_t)strtoul(argv[0], NULL, 10) << 16;
*color |= (uint32_t)strtoul(argv[1], NULL, 10) << 8;
*color |= (uint32_t)strtoul(argv[2], NULL, 10);
return false;
}
if (argc == 4) {
*color = (uint32_t)strtoul(argv[0], NULL, 10) << 24;
*color |= (uint32_t)strtoul(argv[1], NULL, 10) << 16;
*color |= (uint32_t)strtoul(argv[2], NULL, 10) << 8;
*color |= (uint32_t)strtoul(argv[3], NULL, 10);
return false;
}
return true;
}
/**
* @brief This function removes the newline from a string the string can contain multiple lines
* @param[in,out] str The string to remove the newline from
*/
void tcp_cmd_remove_newline(char* str, size_t len) {
size_t i = 0;
size_t j = 0;
while (str[i] != '\0' && j < len) {
if (str[j] != '\n' && str[j] != '\r') {
str[i] = str[j];
i++;
}
j++;
}
str[i] = '\0';
}
/**
* @brief This function 'removes' the leading spaces from a string
* @param[in] str The string to remove the leading spaces from
* @param[in] len The length of the string
* @return char* A pointer to the first non-space character
*/
char* tcp_cmd_remove_leading_space(char* str, size_t len) {
size_t i = 0;
if (str == NULL || str[0] == '\0' || len == 0) {
return NULL;
}
while (str[i] != '\0' && i < len) {
if (isspace((int)str[i]) == 0) {
return &str[i];
}
i++;
}
return NULL;
}
/**
* @brief This function converts a string to lowercase
* @param[in,out] str The string to convert
*/
void tcp_cmd_str_tolower(char* str) {
int i = 0;
while (str[i] != '\0') {
str[i] = (char)tolower((int)str[i]);
i++;
}
}
/**
* @brief This function finds the next token in the input string
* If the token is between quotes, return the whole string between quotes
* @param[in] input The input string
* @param[in] delimiter The delimiters to use
* @param[in,out] next The next token
* @return char* The next token
*/
char* tcp_cmd_get_next_token(char* input, const char* delimiters, char** next) {
if (input == NULL && *next == NULL) {
return NULL;
}
if (input == NULL) {
input = *next;
}
// Skip leading delimiters
input += strspn(input, delimiters);
if (*input == '\0') {
return NULL;
}
// If the token is between quotes, return the whole string between quotes
if (*input == '"') {
char* end = strchr(++input, '"');
if (end == NULL) {
return NULL;
}
*end = '\0';
*next = end + 1;
return input;
}
// Find the end of the token
char* end = input + strcspn(input, delimiters);
if (*end == '\0') {
*next = end;
} else {
*end = '\0';
*next = end + 1;
}
return input;
}
/**
* @brief This function is a wrapper for tcp_write and tcp_output
* @param[in] pcb The tcp_pcb struct to write to
* @param[in] str The string to write
*/
static void tcp_cmd_write(struct tcp_pcb* pcb, const char* str) {
tcp_write(pcb, str, strlen(str), TCP_WRITE_FLAG_COPY | TCP_WRITE_FLAG_MORE);
tcp_output(pcb);
}
/**
* @brief This function prints the header of the tcp command interface
* @param[in] pcb The tcp_pcb struct to write to
*/
static void tcp_cmd_print_header(struct tcp_pcb* pcb) {
tcp_cmd_write(pcb, " Welcome to the TCP CMD interface\n"
"(Type help for a list of the commands! exit to close)\n"
"============================================================\n"
"$>");
}
/**
* @brief This function prints the help text
* @param[in] pcb The tcp_pcb struct to write to
*/
static void tcp_cmd_print_help(struct tcp_pcb* pcb) {
LOG_INFO(TAG, "Printing help");
tcp_cmd_write(pcb, "help : shows a list of commands\n"
"clear text/images : clears the text or images on the lcd\n"
"text \"<text>\" : puts text on the lcd\n"
"bgColor (<a>) <r> <g> <b> : set the background color of the lcd\n"
"color (<a>) <r> <g> <b> : set the color of the text\n"
"listFiles : shows a list with images in the filesystem\n"
"setImage <image_name> : put an image on the screen\n"
"setGif <image_name> : put a gif on the screen\n"
"exit : closes the connection\n");
}
/**
* @brief This function handles the clear command
*
* @param[in] pcb The tcp_pcb struct to write to
* @param[in] argc The number of arguments
* @param[in] argv The arguments
*/
static void tcp_cmd_clear(struct tcp_pcb* pcb, int argc, char** argv) {
if (argc == 0) {
LOG_INFO(TAG, "Clearing screen");
lcd_clear_text();
lcd_clear_images();
return;
}
if (argc == 1) {
if (strcmp(argv[0], "text") == 0) {
LOG_INFO(TAG, "Clearing text");
lcd_clear_text();
return;
}
if (strcmp(argv[0], "images") == 0) {
LOG_INFO(TAG, "Clearing images");
lcd_clear_images();
return;
}
}
LOG_WARN(TAG, "Bad usage of clear");
tcp_cmd_write(pcb, "Usage: clear\n");
tcp_cmd_write(pcb, "Usage: clear text\n");
tcp_cmd_write(pcb, "Usage: clear images\n");
return;
}
/**
* @brief This function handles the text command
*
* @param[in] pcb The tcp_pcb struct to write to
* @param[in] argc The number of arguments
* @param[in] argv The arguments
*/
static void tcp_cmd_text(struct tcp_pcb* pcb, int argc, char** argv) {
if (argc == 1) {
LOG_INFO(TAG, "Setting text %s @ 10, 10", argv[0]);
lcd_display_text((const char*)argv[0], 10, 10, color_txt, color_bg, LCD_FONT24);
return;
}
if (argc == 3) {
LOG_INFO(TAG, "Setting text %s @ %lu, %lu", argv[0], (uint32_t)strtoul(argv[1], NULL, 10),
(uint32_t)strtoul(argv[2], NULL, 10));
lcd_display_text((const char*)argv[0], (uint32_t)strtoul(argv[1], NULL, 10),
(uint32_t)strtoul(argv[2], NULL, 10), color_txt, color_bg, LCD_FONT24);
return;
}
LOG_WARN(TAG, "Bad usage of text");
tcp_cmd_write(pcb, "Usage: text \"<text>\"\n");
tcp_cmd_write(pcb, "Usage: text <word>\n");
tcp_cmd_write(pcb, "Usage: text \"<text>\" <x> <y>\n");
}
/**
* @brief This function handles the bgcolor command
*
* @param[in] pcb The tcp_pcb struct to write to
* @param[in] argc The number of arguments
* @param[in] argv The arguments
*/
static void tcp_cmd_bg_color(struct tcp_pcb* pcb, int argc, char** argv) {
if (!str_to_color(argc, argv, &color_bg)) {
LOG_INFO(TAG, "Setting background color to %08lX", color_bg);
return;
}
LOG_WARN(TAG, "Bad usage of bgcolor");
tcp_cmd_write(pcb, "Usage: bgcolor 0x<rrggbb>\n");
tcp_cmd_write(pcb, "Usage: bgcolor 0x<aarrggbb>\n");
tcp_cmd_write(pcb, "Usage: bgcolor <r> <g> <b>\n");
tcp_cmd_write(pcb, "Usage: bgcolor <a> <r> <g> <b>\n");
}
/**
* @brief This function handles the color command
*
* @param[in] pcb The tcp_pcb struct to write to
* @param[in] argc The number of arguments
* @param[in] argv The arguments
*/
static void tcp_cmd_color(struct tcp_pcb* pcb, int argc, char** argv) {
if (!str_to_color(argc, argv, &color_txt)) {
LOG_INFO(TAG, "Setting color to %08lX", color_txt);
return;
}
LOG_WARN(TAG, "Bad usage of color");
tcp_cmd_write(pcb, "Usage: color 0x<rrggbb>\n");
tcp_cmd_write(pcb, "Usage: color 0x<aarrggbb>\n");
tcp_cmd_write(pcb, "Usage: color <r> <g> <b>\n");
tcp_cmd_write(pcb, "Usage: color <a> <r> <g> <b>\n");
}
/**
* @brief This function handles the listfiles command
*
* @param[in] pcb The tcp_pcb struct to write to
* @param[in] argc The number of arguments
* @param[in] argv The arguments
*/
static void tcp_cmd_list_files(struct tcp_pcb* pcb, int argc, char** argv) {
UNUSED(argv);
if (argc == 0) {
LOG_INFO(TAG, "Listing files");
void* mem = NULL; // Pointer for internal use by the llfs library
llfs_file_t* file;
while ((file = llfs_next_file(&mem, NULL)) != NULL) {
tcp_cmd_write(pcb, file->name);
tcp_cmd_write(pcb, "\n");
}
return;
}
LOG_WARN(TAG, "Bad usage of listfiles");
tcp_cmd_write(pcb, "Usage: listfiles\n");
tcp_cmd_write(pcb, "Usage: ls\n");
return;
}
/**
* @brief This function handles the setimage command
*
* @param[in] pcb The tcp_pcb struct to write to
* @param[in] argc The number of arguments
* @param[in] argv The arguments
*/
static void tcp_cmd_set_image(struct tcp_pcb* pcb, int argc, char** argv) {
const char* ext = NULL;
if (argc >= 1) {
ext = llfs_get_filename_ext(argv[0]);
if (strcmp(ext, "bmp") != 0) {
LOG_WARN(TAG, "setimage: File is not a bmp");
tcp_cmd_write(pcb, "File is not a bmp\n");
return;
}
}
if (argc == 1) {
LOG_INFO(TAG, "Setting image %s @ 0, 0", argv[0]);
lcd_draw_img_from_fs(argv[0], 0, 0);
return;
}
if (argc == 3) {
LOG_INFO(TAG, "Setting image %s @ %lu, %lu", argv[0], (uint32_t)strtoul(argv[1], NULL, 10),
(uint32_t)strtoul(argv[2], NULL, 10));
lcd_draw_img_from_fs(argv[0], (uint32_t)strtoul(argv[1], NULL, 10), (uint32_t)strtoul(argv[2], NULL, 10));
return;
}
LOG_WARN(TAG, "Bad usage of setimage");
tcp_cmd_write(pcb, "Usage: setimage <filename>\n");
tcp_cmd_write(pcb, "Usage: setimage <filename> <x> <y>\n");
}
/**
* @brief This function handles the setgif command
*
* @param[in] pcb The tcp_pcb struct to write to
* @param[in] argc The number of arguments
* @param[in] argv The arguments
*/
static void tcp_cmd_set_gif(struct tcp_pcb* pcb, int argc, char** argv) {
const char* ext = NULL;
if (argc >= 1) {
ext = llfs_get_filename_ext(argv[0]);
if (strcmp(ext, "gif") != 0) {
LOG_WARN(TAG, "setgif: File is not a gif");
tcp_cmd_write(pcb, "File is not a gif\n");
return;
}
}
if (argc == 1) {
LOG_INFO(TAG, "Setting gif %s @ 0, 0", argv[0]);
lcd_draw_gif_from_fs(argv[0], 0, 0);
return;
}
if (argc == 3) {
LOG_INFO(TAG, "Setting gif %s @ %lu, %lu", argv[0], (uint32_t)strtoul(argv[1], NULL, 10),
(uint32_t)strtoul(argv[2], NULL, 10));
lcd_draw_gif_from_fs(argv[0], (uint32_t)strtoul(argv[1], NULL, 10), (uint32_t)strtoul(argv[2], NULL, 10));
return;
}
LOG_WARN(TAG, "Bad usage of setgif");
tcp_cmd_write(pcb, "Usage: setgif <filename>\n");
tcp_cmd_write(pcb, "Usage: setgif <filename> <x> <y>\n");
}
/**
* @brief This function handles the exit command
*
* @param[in] pcb The tcp_pcb struct to write to
* @param[in] argc The number of arguments
* @param[in] argv The arguments
*/
static void tcp_cmd_exit(struct tcp_pcb* pcb, int argc, char** argv) {
UNUSED(argv);
if (argc == 0) {
LOG_INFO(TAG, "Closing connection");
tcp_cmd_write(pcb, "Exiting...\n");
lcd_clear_images();
lcd_clear_text();
tcp_close(pcb);
return;
}
static err_t tcp_cmd_recv(void* arg, struct tcp_pcb* pcb, struct pbuf* p, err_t err) {
size_t len;
size_t number_of_files;
uint8_t file_in_fs;
uint8_t check = 0;
char* pc;
char tcp_buffer[1024];
char text[256];
char color_r[3];
char color_g[3];
char color_b[3];
char text_color_r[3];
char text_color_g[3];
char text_color_b[3];
char extension[4];
char* endptr;
if (err == ERR_OK && p != NULL) {
tcp_recved(pcb, p->tot_len);
pc = (char*)p->payload;
len = p->tot_len;
for (size_t i = 0; i < len; i++) {
tcp_buffer[i] = pc[i];
LOG_WARN(TAG, "Bad usage of exit");
tcp_cmd_write(pcb, "Usage: exit\n");
}
if (!strncmp(tcp_buffer, "help", 4)) {
check = 1;
tcp_write(pcb, "help : laat lijst zien met alle commando's\r\n"
"text : geeft tekst mee die op LCD komt (uw_text)\r\n"
"color : kleur achtergrond van scherm (255 255 255)\r\n"
"textColor : kleur van tekst (255 255 255)\r\n"
"listImages: laat een lijst zien van de mogelijke afbeeldingen\r\n"
"setImage : veranderd te afbeelding (naam_afbeelding)\r\n"
"exit : sluit de verbinding\r\n", 354, TCP_WRITE_FLAG_COPY | TCP_WRITE_FLAG_MORE);
} else if (!strncmp(tcp_buffer, "text ", 5)) {
size_t i;
for (i = 0; i < len - 4; i++) {
text[i] = tcp_buffer[i + 5];
}
text[i - 1] = '\0';
lcd_clear_text();
lcd_display_text(text, 10, 10, result_txt, result_bg, LCD_FONT24);
check = 1;
} else if (!strncmp(tcp_buffer, "color", 5)) {
for (size_t i = 0; i < 3; i++) {
color_r[i] = tcp_buffer[i + 6];
color_g[i] = tcp_buffer[i + 10];
color_b[i] = tcp_buffer[i + 14];
}
result_bg |= strtoul(color_r, &endptr, 10) << 16;
result_bg |= strtoul(color_g, &endptr, 10) << 8;
result_bg |= strtoul(color_b, &endptr, 10);
check = 1;
} else if (!strncmp(tcp_buffer, "textColor", 9)) {
for (size_t i = 0; i < 3; i++) {
text_color_r[i] = tcp_buffer[i + 10];
text_color_g[i] = tcp_buffer[i + 14];
text_color_b[i] = tcp_buffer[i + 18];
}
result_txt |= strtoul(text_color_r, &endptr, 10) << 16;
result_txt |= strtoul(text_color_g, &endptr, 10) << 8;
result_txt |= strtoul(text_color_b, &endptr, 10);
check = 1;
} else if (!strncmp(tcp_buffer, "listImages", 10)) {
number_of_files = llfs_file_count();
if (number_of_files > 0) {
llfs_file_t file_list[number_of_files];
number_of_files = llfs_file_list(file_list, number_of_files, NULL);
for (size_t i = 0; i < number_of_files; i++) {
tcp_write(pcb, file_list[i].name, strlen(file_list[i].name), TCP_WRITE_FLAG_COPY | TCP_WRITE_FLAG_MORE);
tcp_write(pcb, "\r\n", 2, TCP_WRITE_FLAG_COPY | TCP_WRITE_FLAG_MORE);
}
} else {
tcp_write(pcb, "NO files in filesystem\r\n", 24, TCP_WRITE_FLAG_COPY | TCP_WRITE_FLAG_MORE);
/**
* @brief This function handles unknown commands
*
* @param[in] pcb The tcp_pcb struct to write to
* @param[in] cmd The command
*/
static void tcp_cmd_unknown_cmd(struct tcp_pcb* pcb, char* cmd) {
LOG_WARN(TAG, "Unknown command: %s", cmd);
tcp_cmd_write(pcb, "Unknown command: ");
tcp_cmd_write(pcb, cmd);
tcp_cmd_write(pcb, "\n");
tcp_cmd_write(pcb, "Type help for list of commands\n");
}
check = 1;
} else if (!strncmp(tcp_buffer, "setImage", 8)) {
char filename[len - 8];
for (size_t i = 0; i < len - 9; i++) {
filename[i] = tcp_buffer[i + 9];
/**
* @brief This function parses the command and calls the appropriate function
*
* @param[in] pcb Pointer to the tcp_pcb struct to write to
* @param[in] argc Count of arguments
* @param[in] argv Array of arguments
* @return true Connection should be closed
* @return false Connection should be kept open
*/
static bool tcp_cmd_parser(struct tcp_pcb* pcb, int argc, char** argv) {
if (argc == 0) {
LOG_WARN(TAG, "No command given");
return false;
}
for (size_t i = 0; i < 3; i++) {
extension[i] = tcp_buffer[i + len - 3];
char* cmd = shift_args(&argc, &argv);
tcp_cmd_str_tolower(cmd);
if (strcmp(cmd, "help") == 0) {
tcp_cmd_print_help(pcb);
return false;
}
filename[sizeof(filename) - 1] = '\0';
extension[3] = '\0';
number_of_files = llfs_file_count();
if(number_of_files > 0) {
llfs_file_t file_list[number_of_files];
number_of_files = llfs_file_list(file_list, number_of_files, NULL);
file_in_fs = 0;
for (size_t i = 0; i < number_of_files; i++) {
if (!strcmp(filename, file_list[i].name)) {
file_in_fs = 1;
if (strcmp(cmd, "clear") == 0) {
tcp_cmd_clear(pcb, argc, argv);
return false;
}
if (strcmp(cmd, "text") == 0) {
tcp_cmd_text(pcb, argc, argv);
return false;
}
if (strcmp(cmd, "bgcolor") == 0) {
tcp_cmd_bg_color(pcb, argc, argv);
return false;
}
if (strcmp(cmd, "color") == 0) {
tcp_cmd_color(pcb, argc, argv);
return false;
}
if (strcmp(cmd, "listfiles") == 0) {
tcp_cmd_list_files(pcb, argc, argv);
return false;
}
if (strcmp(cmd, "ls") == 0) {
tcp_cmd_list_files(pcb, argc, argv);
return false;
}
if (strcmp(cmd, "setimage") == 0) {
tcp_cmd_set_image(pcb, argc, argv);
return false;
}
if (strcmp(cmd, "setgif") == 0) {
tcp_cmd_set_gif(pcb, argc, argv);
return false;
}
if (strcmp(cmd, "exit") == 0) {
tcp_cmd_exit(pcb, argc, argv);
return true;
}
tcp_cmd_unknown_cmd(pcb, cmd);
return false;
}
// Check which file extension is used and call right function
if (!strncmp(extension, "bmp", 3) && file_in_fs) {
lcd_clear_images();
lcd_draw_img_from_fs(filename, 10, 10);
} else if (!strncmp(extension, "gif", 3) && file_in_fs) {
lcd_clear_images();
lcd_draw_gif_from_fs(filename, 10, 10);
} else if (!file_in_fs) {
tcp_write(pcb, "File NOT in filesystem\n\r", 24, TCP_WRITE_FLAG_COPY | TCP_WRITE_FLAG_MORE);
} else {
tcp_write(pcb, "Extension NOT supported\n\r", 25, TCP_WRITE_FLAG_COPY | TCP_WRITE_FLAG_MORE);
}
} else {
tcp_write(pcb, "NO files in filesystem\r\n", 24, TCP_WRITE_FLAG_COPY | TCP_WRITE_FLAG_MORE);
}
check = 1;
} else if (!strncmp(tcp_buffer, "exit", 4)) {
lcd_clear_images();
lcd_clear_text();
tcp_cmd_close(pcb);
check = 1;
}
if (!check && (strncmp(tcp_buffer, "\r\n", 2) != 0)) {
tcp_write(pcb, "Onbestaand commando: help voor lijst van commando's\r\n", 53, TCP_WRITE_FLAG_COPY | TCP_WRITE_FLAG_MORE);
}
pbuf_free(p);
if (len > tcp_sndbuf(pcb)) {
len = tcp_sndbuf(pcb);
}
tcp_sent(pcb, NULL);
} else {
pbuf_free(p);
}
if (err == ERR_OK && p == NULL) {
tcp_cmd_close(pcb);
}
if (strncmp(tcp_buffer, "\r\n", 2) != 0) {
tcp_write(pcb, "User: ", 6, TCP_WRITE_FLAG_COPY | TCP_WRITE_FLAG_MORE);
/**
* @brief This function is called when the tcp connection receives data
* @param[in] arg The argument ptr
* @param[in] pcb The tcp_pcb struct
* @param[in] p The pbuf struct
* @param[in] err The error code from the tcp stack
* @return err_t ERR_OK if successful
*/
err_t tcp_cmd_recv(void* arg, struct tcp_pcb* pcb, struct pbuf* p, err_t err) {
int argc = 0;
char cmd[MAX_CMD_LEN] = {0};
char* cmd_ptr = NULL;
char* argv[MAX_TOKENS] = {0};
bool close_conn = false;
char* next = NULL;
LWIP_UNUSED_ARG(arg);
// Connection closed?
if (p == NULL && err == ERR_OK) {
LOG_INFO(TAG, "Remote closed connection");
return tcp_close(pcb);
}
if (err != ERR_OK) {
LOG_WARN(TAG, "TCP data received with error(%d): %s", err, lwip_strerr(err));
return ERR_OK;
}
if (p->tot_len >= MAX_CMD_LEN) {
LOG_WARN(TAG, "Command too long");
tcp_cmd_write(pcb, "Command too long");
}
uint16_t len = p->tot_len >= MAX_CMD_LEN ? MAX_CMD_LEN : p->tot_len;
// Make sure the string is null terminated
pbuf_copy_partial(p, cmd, len, 0);
cmd[len] = '\0';
// Tell the tcp stack that we have taken the data
tcp_recved(pcb, p->tot_len);
tcp_cmd_remove_newline(cmd, strlen(cmd));
if (cmd[0] != '\0') {
LOG_INFO(TAG, "cmd: %s", cmd);
}
// Split string into tokens by delimiter (space)
cmd_ptr = tcp_cmd_remove_leading_space(cmd, strlen(cmd));
argv[0] = tcp_cmd_get_next_token(cmd_ptr, " ", &next);
if (argv[0] != NULL) {
argc = 1;
}
while (argv[argc - 1] != NULL && argc < MAX_TOKENS) {
// Check if the next token is 0 (end of string) strlen doesn't work here
if (*next == 0) {
argv[argc] = NULL;
break;
}
next = tcp_cmd_remove_leading_space(next, strlen(next));
argv[argc] = tcp_cmd_get_next_token(NULL, " ", &next);
if (argv[argc] == NULL) {
break;
}
argc++;
}
close_conn = tcp_cmd_parser(pcb, argc, argv);
if (close_conn) {
LOG_INFO(TAG, "Closing connection");
tcp_cmd_close(pcb);
#ifdef NCAT
} else {
tcp_cmd_write(pcb, "$>");
}
#else
} else if (argc > 0) {
tcp_cmd_write(pcb, "$>");
} else {
tcp_cmd_write(pcb, "");
}
#endif
defer:
pbuf_free(p);
return ERR_OK;
}
/**
* @brief This function is called when a new tcp connection is accepted
* @param[in] arg The argument
* @param[in] pcb The tcp_pcb struct
* @param[in] err The error
* @return err_t ERR_OK
*/
static err_t tcp_cmd_accept(void* arg, struct tcp_pcb* pcb, err_t err) {
LWIP_UNUSED_ARG(arg);
LWIP_UNUSED_ARG(err);
@@ -184,20 +594,46 @@ static err_t tcp_cmd_accept(void* arg, struct tcp_pcb* pcb, err_t err) {
tcp_recv(pcb, tcp_cmd_recv);
tcp_err(pcb, NULL);
tcp_poll(pcb, NULL, 4);
tcp_write(pcb, " Welcom bij de TCP CMD Interface\r\n"
"(Typ help voor een lijst van de commando's! X om te sluiten)\r\n"
"============================================================\r\n"
"User: ", 168, TCP_WRITE_FLAG_COPY | TCP_WRITE_FLAG_MORE);
tcp_sent(pcb, NULL);
LOG_INFO(TAG, "New connection accepted");
tcp_cmd_print_header(pcb);
return ERR_OK;
}
/**
* @brief This function closes the tcp connection
* @param[in] pcb The tcp_pcb struct to close
*/
static void tcp_cmd_close(struct tcp_pcb* pcb) {
tcp_arg(pcb, NULL);
tcp_sent(pcb, NULL);
tcp_recv(pcb, NULL);
tcp_close(pcb);
}
/**
* @brief This function initializes the tcp command interface
*/
void tcp_cmd_init(void) {
struct tcp_pcb* tcp_pcb;
tcp_pcb = tcp_new();
tcp_bind(tcp_pcb, IP_ADDR_ANY, 23);
tcp_pcb = tcp_listen(tcp_pcb);
tcp_accept(tcp_pcb, tcp_cmd_accept);
if (tcp_pcb == NULL) {
LOG_CRIT(TAG, "Failed to allocate pcb");
return;
}
if (tcp_bind(tcp_pcb, IP_ADDR_ANY, 23) != ERR_OK) {
LOG_CRIT(TAG, "Failed to bind pcb");
free(tcp_pcb);
return;
}
tcp_pcb = tcp_listen(tcp_pcb);
if (tcp_pcb == NULL) {
LOG_CRIT(TAG, "Failed to listen");
free(tcp_pcb);
return;
}
tcp_accept(tcp_pcb, tcp_cmd_accept);
}

View File

@@ -28,7 +28,10 @@ static void* tftp_open(const char* fname, const char* mode, uint8_t write);
static void tftp_close(void* handle);
static int tftp_read(void* handle, void* buf, int bytes);
static int tftp_write(void* handle, struct pbuf* p);
static struct tftp_context tftpContext_s = {.open = tftp_open, .close = tftp_close, .read = tftp_read, .write = tftp_write};
static struct tftp_context tftpContext_s = {.open = tftp_open,
.close = tftp_close,
.read = tftp_read,
.write = tftp_write};
/**
* @brief tftp custom file functions to set the offset and read the data
* @param[in,out] handle Custom file handles

View File

@@ -0,0 +1,301 @@
/**
* @file website_backend.h
* @brief Backend for the website to operate
* @author Toon B.
*/
// Includes
#include "website_backend.h"
// Static functions
static size_t wbe_get_images(char* images_string, size_t file_count_fs);
static inline void wbe_build_infostring(const llfs_file_t* file_list, char* info_string, const size_t cnt);
static void wbe_decoding_url(const char* encoded, char* decoded);
static uint32_t wbe_color_value(const char* rgb);
void wbe_init(void) {
httpd_init();
LOG_DEBUG("WBE", "Initialize webserver");
// Set starting LCD screen
wbe_display("Please Edit Me !", LCD_GREEN, LCD_BLACK, SD_IMG);
return;
}
int fs_open_custom(struct fs_file* file, const char* name) {
// Variables
llfs_file_t* wanted_file = llfs_file_open(name + 1);
size_t buffer_len = 0;
static char image_stringbuffer[STR_MAX] = "";
// The wanted file was found in the filesystem
if (wanted_file != NULL) {
// Debug info
LOG_DEBUG("WBE", "The file : %s was found", wanted_file->name);
// Give the information about the file to the client
file->data = (const char*)wanted_file->data;
file->len = (int)wanted_file->len;
file->index = (int)wanted_file->len;
file->is_custom_file = 1;
file->pextension = NULL;
file->flags = FS_FILE_FLAGS_HEADER_INCLUDED;
return 1;
}
/*
* The endpoint '/images.info' is called when the client wants to call for the
* information string that contains the names of the available images.
*/
if (strncmp(name, "/images.info", strlen("/images.info")) == 0) {
// Create the information string for the images in the filesystem
buffer_len = wbe_get_images(image_stringbuffer, llfs_file_count());
// Give the string back to the client
file->data = image_stringbuffer;
file->len = (int)buffer_len;
file->index = (int)buffer_len;
file->is_custom_file = 1;
file->pextension = NULL;
file->flags = FS_FILE_FLAGS_HEADER_INCLUDED;
return 1;
}
// Endpoint when client wants to send information to the backend
if (strncmp(name, "/cgi", 3) == 0) {
// Give the original index.html back to the client
wanted_file = llfs_file_open("index.html");
if (wanted_file != NULL) {
file->data = (const char*)wanted_file->data;
file->len = (int)wanted_file->len;
file->index = (int)wanted_file->len;
file->is_custom_file = 1;
file->pextension = NULL;
file->flags = FS_FILE_FLAGS_HEADER_INCLUDED;
return 1;
}
}
return 0;
}
void fs_close_custom(struct fs_file* file) {
}
/**
* @fn void wbe_get_images(char*, size_t)
* @brief Function searches filesystem for files with extention ".bmp" and ".gif" and put them
* combined in a string that needs to be send to the frontend.
*
* @param[in] images_string, string that will contain the image names
* @param[in] file_count_fs, the number of files in the filesystem
*/
static size_t wbe_get_images(char* images_string, size_t file_count_fs) {
// Allocate space for the files
llfs_file_t file_list[file_count_fs];
size_t file_count_bmp = 0;
size_t file_count_gif = 0;
// Reset string
strcpy(images_string, "");
// Get all the ".bmp" and ".gif" files
file_count_bmp = llfs_file_list(file_list, file_count_fs, ".bmp");
file_count_gif = llfs_file_list(file_list + file_count_bmp, file_count_fs, ".gif");
// Create the info string
wbe_build_infostring(file_list, images_string, file_count_gif + file_count_bmp);
// Debug info
LOG_DEBUG("WBE", "Images string : %s ", images_string);
// Return the length of the string
return strlen(images_string);
}
/**
* @fn void wbe_build_infostring(const llfs_file_t*, char*, const size_t)
* @brief Function adds the names of the files in "file_list" and adds them in "infoStr".
* The names are seperated by '|' characters.
*
* @param[in] file_list, list with files
* @param[in] info_string, string that will contain the filenames
* @param[in] cnt, the number of files
*/
static inline void wbe_build_infostring(const llfs_file_t* file_list, char* info_string, const size_t cnt) {
// Add the filenames to the info string
for (size_t i = 0; i < cnt; ++i) {
strncat(info_string, file_list[i].name, strlen(file_list[i].name));
strncat(info_string, "|", 2);
}
// Remove last seperator '|'
info_string[strlen(info_string) - 1] = '\0';
}
void httpd_cgi_handler(struct fs_file* file, const char* uri, int num_parm, char** pc_param, char** pc_value) {
// Variables
uint32_t vktxt = LCD_GREEN;
uint32_t vka = LCD_BLACK;
// Allocate space for parameters
char vtxt[STR_MAX]; // The sentence that we want to print on the LCD.
char vfo[STR_MAX]; // Name of the selected image on the website.
char s_vktxt[CLR_MAX]; // The color of the sentence. (in #RGB)
char s_vka[CLR_MAX]; // Color of the background. (also in #RGB)
if (strcmp("/cgi", uri) == 0) {
for (size_t i = 0; i < num_parm; ++i) {
// The given sentence
if (strcmp("vtxt", pc_param[i]) == 0) {
wbe_decoding_url(pc_value[i], vtxt);
}
// The color of the sentence
if (strcmp("vktxt", pc_param[i]) == 0) {
wbe_decoding_url(pc_value[i], s_vktxt);
// Convert to hex value
if (s_vktxt != NULL) {
vktxt = wbe_color_value(s_vktxt);
}
}
// Color of the background
if (strcmp("vka", pc_param[i]) == 0) {
wbe_decoding_url(pc_value[i], s_vka);
// convert to hex value
if (s_vka != NULL) {
vka = wbe_color_value(s_vka);
}
}
// Name of the image
if (strcmp("vfo", pc_param[i]) == 0) {
wbe_decoding_url(pc_value[i], vfo);
}
}
// Debug info
LOG_DEBUG("WBE", "CGI DATA : %s , %x , %x , %s", vtxt, vktxt, vka, vfo);
// Display on LCD
wbe_display(vtxt, vktxt, vka, vfo);
}
}
/**
* @fn void wbe_decoding_url(const char*, char*)
* @brief The given information from the CGI parameters are URL encoded.
* This function translates this encoded string in a readable
* decoded string. The lengthe of "char* decoded" is at least the
* length of "char* encoded" + 1.
*
* @param[in] encoded, the encoded URL string that needs to be decoded
* @param[in] decoded, string that will contain the decoded URL.
*/
static void wbe_decoding_url(const char* encoded, char* decoded) {
// Variables
char* endptr;
size_t decoded_index = 0;
size_t encoded_length = strlen(encoded);
uint32_t hex_val;
for (size_t i = 0; i < encoded_length; ++i) {
// If we encounter a %xx, decode it to ascii
if ((encoded[i] == '%') && (i + 2 < encoded_length)) {
// Decode %xx
hex_val = (uint32_t)strtoul(&encoded[i + 1], &endptr, 16);
// Check for conversion errors
if (endptr == &encoded[i + 1] || *endptr != '\0') {
LOG_DEBUG("WBE", "URL text conversion error");
}
decoded[decoded_index++] = (char)hex_val;
// Skip 2 characters
i += 2;
// If we encounter a +, add a space character
} else if (encoded[i] == '+') {
decoded[decoded_index++] = ' ';
// If no % or +, just put what stands in 'encoded'
} else {
decoded[decoded_index++] = encoded[i];
}
}
// Finish the string
decoded[decoded_index] = '\0';
}
static uint32_t wbe_color_value(const char* rgb) {
// Variables
char* endptr;
uint32_t color = LCD_BLACK;
char argb[11] = "0xff";
// Create argb string (also, skip the '#' char)
strncat(argb, rgb + 1, strlen(rgb + 1));
// Get argb value
color = (uint32_t)strtoul(argb, &endptr, 16);
// Check for conversion errors
if (*endptr != '\0') {
color = LCD_BLACK;
LOG_DEBUG("WBE", "URL color conversion error");
}
return color;
}
void wbe_display(const char* txt, const uint32_t txt_color, const uint32_t bg_color, const char* image) {
// Variables
lcd_gif_t* gif;
const char* extension;
// clear the screen
lcd_clear_text();
lcd_clear_images();
// Display the text and the background
lcd_set_bg_color_layer0(bg_color);
lcd_display_text(txt, 10, 10, txt_color, bg_color, LCD_FONT16);
// Get the extension of the file
extension = llfs_get_filename_ext(image);
// Check extension
if (extension != NULL) {
// Draw bmp
if (strcmp(extension, "bmp") == 0) {
lcd_draw_img_from_fs(image, IMG_X, IMG_Y);
// Draw gif
} else if (strcmp(extension, "gif") == 0) {
gif = lcd_draw_gif_from_fs(image, IMG_X, IMG_Y);
if (gif == NULL) {
LOG_DEBUG("WBE", "GIF could not be drawn");
}
// If nothing, then draw the standard image
} else {
lcd_draw_img_from_fs(SD_IMG, IMG_X, IMG_Y);
}
// If nothing, then draw the standard image
} else {
lcd_draw_img_from_fs(SD_IMG, IMG_X, IMG_Y);
}
}

View File

@@ -12,14 +12,17 @@ add_executable(tests)
target_compile_definitions(tests
PRIVATE
"TESTING"
"DEBUG"
)
target_sources(tests
PRIVATE
${TEST_SOURCES}
../project/Core/Src/tftp.c
../project/Core/Src/llfs_data.c
../project/Core/Src/llfs.c
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/project/Core/Src/llfs_data.c
${CMAKE_SOURCE_DIR}/project/Core/Src/llfs.c
${CMAKE_SOURCE_DIR}/project/Core/Src/tftp.c
${CMAKE_SOURCE_DIR}/project/Core/Src/tcp_cmd.c
)
target_compile_options(tests PRIVATE $<$<CONFIG:Debug>:
@@ -35,7 +38,7 @@ target_include_directories(tests
PUBLIC
${CMAKE_CURRENT_LIST_DIR}
${PROJECT_BINARY_DIR}
../project/Core/Inc/
${CMAKE_SOURCE_DIR}/project/Core/Inc/
)
include(GoogleTest)

View File

@@ -1,44 +1,68 @@
#include "mocs.h"
#include "tftp.h"
#include "mocs.h"
#ifdef DEBUG
#define dprint(fmt, ...) printf(fmt, ##__VA_ARGS__)
#else
#define dprint(fmt, ...)
#endif
void tftp_cleanup(void) {
dprint("tftp_cleanup\n");
}
uint32_t logger_get_timestamp(void) {
dprint("logger_get_timestamp\n");
return 0;
}
int tftp_init(struct tftp_context* context) {
UNUSED(context);
dprint("tftp_init\n");
return 0;
}
void lcd_display_text(const char* text, uint16_t x_pos, uint16_t y_pos, uint32_t color, uint32_t bg_color, sFONT* font) {
UNUSED(text);
UNUSED(x_pos);
UNUSED(y_pos);
UNUSED(color);
UNUSED(bg_color);
UNUSED(font);
printf("lcd_display_text @ %d %d with color 0x%08X bg color 0x%08X\n%s\n", x_pos, y_pos, color, bg_color, text);
dprint("lcd_display_text @ %d %d with color 0x%08X bg color 0x%08X\n%s\n", x_pos, y_pos, color, bg_color, text);
}
void lcd_draw_img_from_fs(char* filename, uint32_t x_pos, uint32_t y_pos) {
printf("lcd_draw_img_from_fs\n%s @%d %d\n", filename, x_pos, y_pos);
UNUSED(filename);
UNUSED(x_pos);
UNUSED(y_pos);
dprint("lcd_draw_img_from_fs\n%s @%d %d\n", filename, x_pos, y_pos);
}
void lcd_draw_gif_from_fs(char* filename, uint32_t x_pos, uint32_t y_pos) {
printf("lcd_draw_gif_from_fs\n%s @%d %d\n", filename, x_pos, y_pos);
UNUSED(filename);
UNUSED(x_pos);
UNUSED(y_pos);
dprint("lcd_draw_gif_from_fs\n%s @%d %d\n", filename, x_pos, y_pos);
}
void lcd_clear_images(void) {
printf("lcd_clear_images\n");
dprint("lcd_clear_images\n");
}
void lcd_clear_text(void) {
printf("lcd_clear_text\n");
dprint("lcd_clear_text\n");
}
void lcd_draw_bmp_img(uint8_t* bmp_buff, uint32_t x_pos, uint32_t y_pos) {
UNUSED(bmp_buff);
UNUSED(x_pos);
UNUSED(y_pos);
printf("lcd_draw_bmp_img @ %d %d\n", x_pos, y_pos);
dprint("lcd_draw_bmp_img @ %d %d\n", x_pos, y_pos);
}
void lcd_draw_gif(uint8_t* gif_buff, size_t len, uint32_t x_pos, uint32_t y_pos) {
@@ -47,10 +71,11 @@ void lcd_draw_gif(uint8_t* gif_buff, size_t len, uint32_t x_pos, uint32_t y_pos)
UNUSED(x_pos);
UNUSED(y_pos);
printf("lcd_draw_gif @ %d %d\n", x_pos, y_pos);
dprint("lcd_draw_gif @ %d %d\n", x_pos, y_pos);
}
struct tcp_pcb* tcp_new(void) {
dprint("tcp_new\n");
return NULL;
}
@@ -58,48 +83,69 @@ err_t tcp_bind(void *pcb, void *ipaddr, uint16_t port) {
UNUSED(pcb);
UNUSED(ipaddr);
UNUSED(port);
dprint("tcp_bind @ %d\n", port);
return ERR_OK;
}
struct tcp_pcb* tcp_listen(void* pcb) {
UNUSED(pcb);
dprint("tcp_listen\n");
return NULL;
}
void tcp_accept(void* pcb, tcp_accept_fn arg) {
UNUSED(pcb);
UNUSED(arg);
dprint("tcp_accept\n");
}
void tcp_arg(void* pcb, void* arg) {
UNUSED(pcb);
UNUSED(arg);
dprint("tcp_arg\n");
}
void tcp_sent(void* pcb, void* arg) {
UNUSED(pcb);
UNUSED(arg);
dprint("tcp_sent\n");
}
void tcp_recv(void* pcb, tcp_recv_fn arg) {
UNUSED(pcb);
UNUSED(arg);
dprint("tcp_recv\n");
}
void tcp_setprio(void* pcb, uint8_t prio) {
UNUSED(pcb);
UNUSED(prio);
dprint("tcp_setprio\n");
}
void tcp_err(void* pcb, void* err) {
UNUSED(pcb);
UNUSED(err);
dprint("tcp_err\n");
}
void tcp_poll(void* pcb, void* poll, uint8_t interval) {
UNUSED(pcb);
UNUSED(poll);
UNUSED(interval);
dprint("tcp_poll\n");
}
void tcp_close(void* pcb) {
err_t tcp_close(void* pcb) {
UNUSED(pcb);
dprint("tcp_close\n");
return ERR_OK;
}
void tcp_write(void* pcb, const char* data, size_t len, uint8_t apiflags) {
@@ -107,23 +153,44 @@ void tcp_write(void* pcb, const char* data, size_t len, uint8_t apiflags) {
UNUSED(apiflags);
UNUSED(len);
printf("tcp_write:\n%s\n", data);
dprint("tcp_write:\n");
printf("%s\n", data);
}
void tcp_output(void* pcb) {
UNUSED(pcb);
dprint("tcp_output\n");
}
void tcp_recved(void* pcb, uint16_t len) {
UNUSED(pcb);
UNUSED(len);
dprint("tcp_recved\n");
}
size_t tcp_sndbuf(void* pcb) {
UNUSED(pcb);
dprint("tcp_sndbuf\n");
return 0;
}
void pbuf_free(struct pbuf* p) {
UNUSED(p);
dprint("pbuf_free\n");
}
uint16_t pbuf_copy_partial(const struct pbuf* buf, void* dataptr, uint16_t len, uint16_t offset) {
memcpy(dataptr, ((uint8_t*)(buf->payload)) + offset, len);
return len;
}
const char* lwip_strerr(err_t err) {
UNUSED(err);
dprint("lwip_sterr\n");
return NULL;
}

View File

@@ -4,8 +4,8 @@
extern "C" {
#endif
#include <stdlib.h>
#include <stdint.h>
#include <stdlib.h>
#ifndef UNUSED
#define UNUSED(x) (void)(x)
@@ -13,6 +13,15 @@ extern "C" {
#define LWIP_UNUSED_ARG(x) UNUSED(x)
typedef void sFONT;
#define LCD_COLOR_BLACK 0
#define LCD_COLOR_WHITE 1
#define LCD_TRANSPARENT 2
#define LCD_FONT16 0
#define LCD_FONT24 (void*)1
typedef int8_t err_t;
/** Definitions for error constants. */
typedef enum {
@@ -86,8 +95,7 @@ typedef void sFONT;
#define TCP_PRIO_MAX 127
#define IP_ADDR_ANY 0
typedef err_t (*tcp_recv_fn)(void *arg, struct tcp_pcb *tpcb,
struct pbuf *p, err_t err);
typedef err_t (*tcp_recv_fn)(void* arg, struct tcp_pcb* tpcb, struct pbuf* p, err_t err);
typedef err_t (*tcp_accept_fn)(void* arg, struct tcp_pcb* newpcb, err_t err);
@@ -112,7 +120,7 @@ void tcp_recv(void *pcb, tcp_recv_fn arg);
void tcp_setprio(void* pcb, uint8_t prio);
void tcp_err(void* pcb, void* err);
void tcp_poll(void* pcb, void* poll, uint8_t interval);
void tcp_close(void *pcb);
err_t tcp_close(void* pcb);
void tcp_write(void* pcb, const char* data, size_t len, uint8_t apiflags);
void tcp_output(void* pcb);
@@ -121,6 +129,10 @@ void pbuf_free(struct pbuf* p);
size_t tcp_sndbuf(void* pcb);
uint16_t pbuf_copy_partial(const struct pbuf* buf, void* dataptr, uint16_t len, uint16_t offset);
const char* lwip_strerr(err_t err);
#ifdef __cplusplus
}
#endif

0
tests/tcp.h Normal file
View File

252
tests/tcp_cmd.cpp Normal file
View File

@@ -0,0 +1,252 @@
#include <gtest/gtest.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "mocs.h"
extern "C" {
#include "tcp_cmd.h"
}
TEST(TCP_CMD, tcp_cmd_remove_newline) {
char* cmd = (char*)calloc(50, 1);
strcpy(cmd, "help\n");
tcp_cmd_remove_newline(cmd, strlen(cmd));
EXPECT_STREQ(cmd, "help");
strcpy(cmd, "help");
tcp_cmd_remove_newline(cmd, strlen(cmd));
EXPECT_STREQ(cmd, "help");
strcpy(cmd, "help\n\n");
tcp_cmd_remove_newline(cmd, strlen(cmd));
EXPECT_STREQ(cmd, "help");
strcpy(cmd, "\nhelp\n\n");
tcp_cmd_remove_newline(cmd, strlen(cmd));
EXPECT_STREQ(cmd, "help");
strcpy(cmd, "\n\nhelp\n\n");
tcp_cmd_remove_newline(cmd, strlen(cmd));
EXPECT_STREQ(cmd, "help");
strcpy(cmd, "\n\nhelp\n\n\n");
tcp_cmd_remove_newline(cmd, strlen(cmd));
EXPECT_STREQ(cmd, "help");
strcpy(cmd, "\n\nhelp\n\n\n\n");
tcp_cmd_remove_newline(cmd, strlen(cmd));
EXPECT_STREQ(cmd, "help");
strcpy(cmd, "\n\nhelp\n\n\n\n\n");
tcp_cmd_remove_newline(cmd, strlen(cmd));
EXPECT_STREQ(cmd, "help");
strcpy(cmd, "\n\nhelp\n\n\n\n\n\n");
tcp_cmd_remove_newline(cmd, strlen(cmd));
EXPECT_STREQ(cmd, "help");
strcpy(cmd, "\n\nhelp\n\n\n\n\n\n\n");
tcp_cmd_remove_newline(cmd, strlen(cmd));
EXPECT_STREQ(cmd, "help");
strcpy(cmd, "\n\nhelp\n\n\n\n\n\n\n\n");
tcp_cmd_remove_newline(cmd, strlen(cmd));
EXPECT_STREQ(cmd, "help");
strcpy(cmd, "\n\nhelp\n\n\n\n\n\n\n\n\n");
tcp_cmd_remove_newline(cmd, strlen(cmd));
EXPECT_STREQ(cmd, "help");
strcpy(cmd, "\n\nhel\np\n");
tcp_cmd_remove_newline(cmd, strlen(cmd));
EXPECT_STREQ(cmd, "help");
free(cmd);
}
TEST(TCP_CMD, tcp_cmd_remove_leading_space) {
char* cmd = (char*)calloc(50, 1);
strcpy(cmd, "help");
EXPECT_STREQ(tcp_cmd_remove_leading_space(cmd, strlen(cmd)), "help");
strcpy(cmd, " help");
EXPECT_STREQ(tcp_cmd_remove_leading_space(cmd, strlen(cmd)), "help");
strcpy(cmd, " help");
EXPECT_STREQ(tcp_cmd_remove_leading_space(cmd, strlen(cmd)), "help");
strcpy(cmd, " help");
EXPECT_STREQ(tcp_cmd_remove_leading_space(cmd, strlen(cmd)), "help");
strcpy(cmd, " help");
EXPECT_STREQ(tcp_cmd_remove_leading_space(cmd, strlen(cmd)), "help");
strcpy(cmd, "\n\t\r\n help");
EXPECT_STREQ(tcp_cmd_remove_leading_space(cmd, strlen(cmd)), "help");
}
TEST(TCP_CMD, tcp_data_cb) {
char* cmd = (char*)calloc(50, 1);
std::string output;
pbuf p = {.next = NULL, .payload = (void*)cmd, .tot_len = 4, .len = 0, .type_internal = 0, .flags = 0, .if_idx = 0};
strcpy(cmd, "help");
p.tot_len = (uint16_t)strlen(cmd);
testing::internal::CaptureStdout();
tcp_cmd_recv(NULL, NULL, &p, ERR_OK);
output = testing::internal::GetCapturedStdout();
#ifndef DEBUG
EXPECT_EQ(output, "help : shows a list of commands\n"
"clear text/images : clears the text or images on the lcd\n"
"text \"<text>\" : puts text on the lcd\n"
"bgColor (<a>) <r> <g> <b> : set the background color of the lcd\n"
"color (<a>) <r> <g> <b> : set the color of the text\n"
"listFiles : shows a list with images in the filesystem\n"
"setImage <image_name> : put an image on the screen\n"
"setGif <image_name> : put a gif on the screen\n"
"exit : closes the connection\n\n$>\n");
#else
EXPECT_EQ(output, "tcp_recved\ntcp_write:\n"
"help : shows a list of commands\n"
"clear text/images : clears the text or images on the lcd\n"
"text \"<text>\" : puts text on the lcd\n"
"bgColor (<a>) <r> <g> <b> : set the background color of the lcd\n"
"color (<a>) <r> <g> <b> : set the color of the text\n"
"listFiles : shows a list with images in the filesystem\n"
"setImage <image_name> : put an image on the screen\n"
"setGif <image_name> : put a gif on the screen\n"
"exit : closes the connection\n"
"\ntcp_output\ntcp_write:\n$>\ntcp_output\npbuf_free\n");
#endif
strcpy(cmd, "text \"This is printed on the display\"");
p.tot_len = (uint16_t)strlen(cmd);
testing::internal::CaptureStdout();
tcp_cmd_recv(NULL, NULL, &p, ERR_OK);
output = testing::internal::GetCapturedStdout();
#ifndef DEBUG
EXPECT_EQ(output, "$>\n");
#else
EXPECT_EQ(output, "tcp_recved\nlcd_display_text @ 10 10 with color 0xFFFFFFFF bg color 0xFF000000\nThis is printed on the display\ntcp_write:\n$>\ntcp_output\npbuf_free\n");
#endif
strcpy(cmd, "color 0x555555");
p.tot_len = (uint16_t)strlen(cmd);
testing::internal::CaptureStdout();
tcp_cmd_recv(NULL, NULL, &p, ERR_OK);
output = testing::internal::GetCapturedStdout();
#ifndef DEBUG
EXPECT_EQ(output, "$>\n");
#else
EXPECT_EQ(output, "tcp_recved\ntcp_write:\n$>\ntcp_output\npbuf_free\n");
#endif
strcpy(cmd, "bgcolor 0xAAAAAA");
p.tot_len = (uint16_t)strlen(cmd);
testing::internal::CaptureStdout();
tcp_cmd_recv(NULL, NULL, &p, ERR_OK);
output = testing::internal::GetCapturedStdout();
#ifndef DEBUG
EXPECT_EQ(output, "$>\n");
#else
EXPECT_EQ(output, "tcp_recved\ntcp_write:\n$>\ntcp_output\npbuf_free\n");
#endif
strcpy(cmd, "text \"This is printed on the display\"");
p.tot_len = (uint16_t)strlen(cmd);
testing::internal::CaptureStdout();
tcp_cmd_recv(NULL, NULL, &p, ERR_OK);
output = testing::internal::GetCapturedStdout();
#ifndef DEBUG
EXPECT_EQ(output, "$>\n");
#else
EXPECT_EQ(output, "tcp_recved\nlcd_display_text @ 10 10 with color 0x00555555 bg color 0x00AAAAAA\nThis is printed on the display\ntcp_write:\n$>\ntcp_output\npbuf_free\n");
#endif
strcpy(cmd, "color 255 255 255");
p.tot_len = (uint16_t)strlen(cmd);
testing::internal::CaptureStdout();
tcp_cmd_recv(NULL, NULL, &p, ERR_OK);
output = testing::internal::GetCapturedStdout();
#ifndef DEBUG
EXPECT_EQ(output, "$>\n");
#else
EXPECT_EQ(output, "tcp_recved\ntcp_write:\n$>\ntcp_output\npbuf_free\n");
#endif
strcpy(cmd, "bgcolor 255 255 255");
p.tot_len = (uint16_t)strlen(cmd);
testing::internal::CaptureStdout();
tcp_cmd_recv(NULL, NULL, &p, ERR_OK);
output = testing::internal::GetCapturedStdout();
#ifndef DEBUG
EXPECT_EQ(output, "$>\n");
#else
EXPECT_EQ(output, "tcp_recved\ntcp_write:\n$>\ntcp_output\npbuf_free\n");
#endif
strcpy(cmd, "text \"This is printed on the display\"");
p.tot_len = (uint16_t)strlen(cmd);
testing::internal::CaptureStdout();
tcp_cmd_recv(NULL, NULL, &p, ERR_OK);
output = testing::internal::GetCapturedStdout();
#ifndef DEBUG
EXPECT_EQ(output, "$>\n");
#else
EXPECT_EQ(output, "tcp_recved\nlcd_display_text @ 10 10 with color 0xFFFFFFFF bg color 0xFFFFFFFF\nThis is printed on the display\ntcp_write:\n$>\ntcp_output\npbuf_free\n");
#endif
strcpy(cmd, "setImage \"test.bmp\"");
p.tot_len = (uint16_t)strlen(cmd);
testing::internal::CaptureStdout();
tcp_cmd_recv(NULL, NULL, &p, ERR_OK);
output = testing::internal::GetCapturedStdout();
#ifndef DEBUG
EXPECT_EQ(output, "$>\n");
#else
EXPECT_EQ(output, "tcp_recved\nlcd_draw_img_from_fs\ntest.bmp @0 0\ntcp_write:\n$>\ntcp_output\npbuf_free\n");
#endif
strcpy(cmd, "setImage \"test.gif\"");
p.tot_len = (uint16_t)strlen(cmd);
testing::internal::CaptureStdout();
tcp_cmd_recv(NULL, NULL, &p, ERR_OK);
output = testing::internal::GetCapturedStdout();
#ifndef DEBUG
EXPECT_EQ(output, "[Warning] ( 0) [tcp_cmd]: setimage: File is not a bmp\r\nFile is not a bmp\n\n$>\n");
#else
EXPECT_EQ(output, "tcp_recved\nlogger_get_timestamp\n[Warning] ( 0) [tcp_cmd]: setimage: File is not a bmp\r\ntcp_write:\nFile is not a bmp\n\ntcp_output\ntcp_write:\n$>\ntcp_output\npbuf_free\n");
#endif
strcpy(cmd, "setGif \"test.gif\"");
p.tot_len = (uint16_t)strlen(cmd);
testing::internal::CaptureStdout();
tcp_cmd_recv(NULL, NULL, &p, ERR_OK);
output = testing::internal::GetCapturedStdout();
#ifndef DEBUG
EXPECT_EQ(output, "$>\n");
#else
EXPECT_EQ(output, "tcp_recved\nlcd_draw_gif_from_fs\ntest.gif @0 0\ntcp_write:\n$>\ntcp_output\npbuf_free\n");
#endif
strcpy(cmd, "setGif \"test.bmp\"");
p.tot_len = (uint16_t)strlen(cmd);
testing::internal::CaptureStdout();
tcp_cmd_recv(NULL, NULL, &p, ERR_OK);
output = testing::internal::GetCapturedStdout();
#ifndef DEBUG
EXPECT_EQ(output, "[Warning] ( 0) [tcp_cmd]: setgif: File is not a gif\r\nFile is not a gif\n\n$>\n");
#else
EXPECT_EQ(output, "tcp_recved\nlogger_get_timestamp\n[Warning] ( 0) [tcp_cmd]: setgif: File is not a gif\r\ntcp_write:\nFile is not a gif\n\ntcp_output\ntcp_write:\n$>\ntcp_output\npbuf_free\n");
#endif
strcpy(cmd, "exit");
p.tot_len = (uint16_t)strlen(cmd);
testing::internal::CaptureStdout();
tcp_cmd_recv(NULL, NULL, &p, ERR_OK);
output = testing::internal::GetCapturedStdout();
#ifndef DEBUG
EXPECT_EQ(output, "Exiting...\n\n");
#else
EXPECT_EQ(output, "tcp_recved\ntcp_write:\nExiting...\n\ntcp_output\nlcd_clear_images\nlcd_clear_text\ntcp_close\ntcp_arg\ntcp_sent\ntcp_recv\ntcp_close\npbuf_free\n");
#endif
free(cmd);
}

View File

@@ -1,47 +1,35 @@
#include <gtest/gtest.h>
#include <stdint.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "mocs.h"
#include "tftp.h"
tftp_custom_file_t file = {
.data = (char*)"1234567890",
.len = 11,
.name = (char*)"test.txt",
.offset = 0
};
tftp_custom_file_t write_file = {
.data = NULL,
.len = 0,
.name = (char*)"test.txt",
.offset = 0
};
tftp_custom_file_t file = {.data = (char*)"1234567890", .len = 11, .name = (char*)"test.txt", .offset = 0};
tftp_custom_file_t write_file = {.data = NULL, .len = 0, .name = (char*)"test.txt", .offset = 0};
TEST(TFTP, custom_fseek)
{
TEST(TFTP, custom_fseek) {
tftp_custom_fseek(&file, 5, SEEK_SET);
EXPECT_EQ(file.offset, 5);
tftp_custom_fseek(&file, 5, SEEK_CUR);
EXPECT_EQ(file.offset, 10);
}
TEST(TFTP, custom_fread)
{
TEST(TFTP, custom_fread) {
char buf[11];
tftp_custom_fseek(&file, 0, SEEK_SET);
size_t bytes = tftp_custom_fread(buf, 11, &file);
EXPECT_EQ(bytes, 10);
EXPECT_EQ(file.offset, 10);
EXPECT_EQ(bytes, 11);
EXPECT_EQ(file.offset, 11);
EXPECT_EQ(memcmp(buf, "1234567890", 10), 0);
memset(buf, 0, 11);
tftp_custom_fseek(&file, 0, SEEK_SET);
bytes = tftp_custom_fread(buf, 11, &file);
EXPECT_EQ(bytes, 10);
EXPECT_EQ(bytes, 11);
EXPECT_EQ(memcmp(buf, "1234567890", 10), 0);
memset(buf, 0, 11);

View File

@@ -4,8 +4,8 @@
extern "C" {
#endif
#include <stdlib.h>
#include <stdint.h>
#include <stdlib.h>
#include "mocs.h"
struct tftp_context {