Skip to content

Commit

Permalink
Set project name
Browse files Browse the repository at this point in the history
  • Loading branch information
viktorxda committed Aug 31, 2024
1 parent 12ffb59 commit 43db178
Show file tree
Hide file tree
Showing 271 changed files with 30 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ jobs:
uses: softprops/action-gh-release@v2
with:
tag_name: latest
files: build/fpvue
files: build/pixelpilot
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
*.i*86
*.x86_64
*.hex
fpvue

# Debug files
*.dSYM/
Expand All @@ -59,3 +58,4 @@ cmake_install.cmake
Makefile

.vscode/
build/
29 changes: 14 additions & 15 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
cmake_minimum_required(VERSION 3.1)

project(fpvue VERSION 0.12)
project(pixelpilot VERSION 0.12)

set(CMAKE_CXX_STANDARD 17)

add_compile_options("-Wno-address-of-packed-member")

set(SOURCE_FILES
drm.h
drm.c
osd.h
osd.c
rtp.h
rtp.c
mavlink.h
mavlink.c
main.cpp
main.h
scheduling_helper.hpp
gstrtpreceiver.cpp
gstrtpreceiver.h)
src/drm.h
src/drm.c
src/osd.h
src/osd.c
src/rtp.h
src/rtp.c
src/mavlink.h
src/mavlink.c
src/main.cpp
src/main.h
src/scheduling_helper.hpp
src/gstrtpreceiver.cpp
src/gstrtpreceiver.h)

include_directories("/usr/include/libdrm" "/usr/include/cairo")

Expand All @@ -46,7 +46,6 @@ if(CMAKE_BUILD_TYPE MATCHES "Debug")
)
endif()

configure_file(fpvue_config.h.in fpvue_config.h)
target_include_directories(${PROJECT_NAME} PUBLIC "${PROJECT_BINARY_DIR}")

include(GNUInstallDirs)
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# FPVue_rk
# PixelPilot_rk
> [!IMPORTANT]
> Warning, this is an experimental project.
>
Expand Down Expand Up @@ -46,22 +46,22 @@ Build and run application in production environment:
```
cmake -B build
sudo cmake --build build --target install
build/fpvue
build/pixelpilot
```

Build and run application for debugging purposes:

```
cmake -B build -DCMAKE_BUILD_TYPE=Debug
cmake --build build
build/fpvue --osd
build/pixelpilot --osd
```

## Usage

Show command line options:
```
fpvue --help
pixelpilot --help
```

## Known issues
Expand Down
2 changes: 0 additions & 2 deletions fpvue_config.h

This file was deleted.

2 changes: 0 additions & 2 deletions fpvue_config.h.in

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
16 changes: 8 additions & 8 deletions main.cpp → src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define MODULE_TAG "fpvue"
#define MODULE_TAG "pixelpilot"

#include <stdio.h>
#include <stdlib.h>
Expand Down Expand Up @@ -47,7 +47,7 @@ extern "C" {
#include "gstrtpreceiver.h"
#include "scheduling_helper.hpp"
#include "time_util.h"
#include "fpvue_config.h"
#include "pixelpilot_config.h"


#define READ_BUF_SIZE (1024*1024) // SZ_1M https://github.com/rockchip-linux/mpp/blob/ed377c99a733e2cdbcc457a6aa3f0fcd438a9dff/osal/inc/mpp_common.h#L179
Expand Down Expand Up @@ -500,10 +500,10 @@ void set_mpp_decoding_parameters(MppApi * mpi, MppCtx ctx) {

void printHelp() {
printf(
"\n\t\tFPVue FPV Decoder for Rockchip (%d.%d)\n"
"\n\t\tPixelPilot FPV Decoder for Rockchip (%d.%d)\n"
"\n"
" Usage:\n"
" fpvue [Arguments]\n"
" pixelpilot [Arguments]\n"
"\n"
" Arguments:\n"
" -p [Port] - Listen port (Default: 5600)\n"
Expand All @@ -523,7 +523,7 @@ void printHelp() {
" --dvr-fmp4 - Save the video feed as a fragmented mp4\n"
"\n"
" --screen-mode - Override default screen mode. ex:1920x1080@120\n"
"\n", fpvue_VERSION_MAJOR , fpvue_VERSION_MINOR
"\n", PILOT_VERSION_MAJOR, PILOT_VERSION_MINOR
);
}

Expand Down Expand Up @@ -640,7 +640,7 @@ int main(int argc, char **argv)
}

__OnArgument("--version") {
printf("FPVue Rockchip %d.%d\n", fpvue_VERSION_MAJOR , fpvue_VERSION_MINOR);
printf("PixelPilot Rockchip %d.%d\n", PILOT_VERSION_MAJOR, PILOT_VERSION_MINOR);
return 0;
}

Expand All @@ -651,7 +651,7 @@ int main(int argc, char **argv)
return 0;
}

printf("FPVue Rockchip %d.%d\n", fpvue_VERSION_MAJOR , fpvue_VERSION_MINOR);
printf("PixelPilot Rockchip %d.%d\n", PILOT_VERSION_MAJOR, PILOT_VERSION_MINOR);

if (enable_osd == 0 ) {
video_zpos = 4;
Expand Down Expand Up @@ -803,4 +803,4 @@ int main(int argc, char **argv)
close(drm_fd);

return 0;
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 2 additions & 0 deletions src/pixelpilot_config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#define PILOT_VERSION_MAJOR 0
#define PILOT_VERSION_MINOR 13.2
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 43db178

Please sign in to comment.