Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 85f588fcb3 | |||
| bb28b1e2ef | |||
| 20efb62615 | |||
| edde77b9c3 | |||
| 5565ad5170 |
@@ -1,6 +1,6 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
## Author: Shaun Reed ##
|
## Author: Shaun Reed ##
|
||||||
## Legal: All Content (c) 2022 Shaun Reed, all rights reserved ##
|
## Legal: All Content (c) 2025 Shaun Reed, all rights reserved ##
|
||||||
## About: A root project for practicing C++ ##
|
## About: A root project for practicing C++ ##
|
||||||
## This project can be built to debug and run all nested projects ##
|
## This project can be built to debug and run all nested projects ##
|
||||||
## Or, any subdirectory with a project() statement can be selected ##
|
## Or, any subdirectory with a project() statement can be selected ##
|
||||||
@@ -16,10 +16,32 @@ project(
|
|||||||
DESCRIPTION "A root project for several small cpp practice projects"
|
DESCRIPTION "A root project for several small cpp practice projects"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
add_compile_options("-Wall")
|
add_compile_options("-Wall")
|
||||||
|
|
||||||
|
option(KLIPS_CCACHE "Enable ccache" ON)
|
||||||
|
|
||||||
|
if (KLIPS_CCACHE)
|
||||||
|
find_program(SCCACHE_PATH sccache)
|
||||||
|
if(SCCACHE_PATH)
|
||||||
|
message(STATUS "[Klips] Found sccache: ${SCCACHE_PATH}")
|
||||||
|
set(CMAKE_CXX_COMPILER_LAUNCHER ${SCCACHE_PATH})
|
||||||
|
set(CMAKE_C_COMPILER_LAUNCHER ${SCCACHE_PATH})
|
||||||
|
else()
|
||||||
|
message(STATUS "[Klips] Failed to find sccache, falling back to ccache.")
|
||||||
|
find_program(CCACHE_PATH ccache)
|
||||||
|
if(CCACHE_PATH)
|
||||||
|
message(STATUS "[Klips] Found ccache: ${CCACHE_PATH}")
|
||||||
|
set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_PATH})
|
||||||
|
set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PATH})
|
||||||
|
else()
|
||||||
|
message(WARNING "[Klips] Failed to find sccache and ccache. Compilation will not be cached.")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
add_subdirectory(algorithms)
|
add_subdirectory(algorithms)
|
||||||
add_subdirectory(catch2)
|
add_subdirectory(catch2)
|
||||||
add_subdirectory(cmake-example)
|
add_subdirectory(cmake-example)
|
||||||
@@ -28,4 +50,15 @@ add_subdirectory(datastructs)
|
|||||||
add_subdirectory(graphics)
|
add_subdirectory(graphics)
|
||||||
add_subdirectory(multithreading)
|
add_subdirectory(multithreading)
|
||||||
add_subdirectory(patterns)
|
add_subdirectory(patterns)
|
||||||
add_subdirectory(qt)
|
|
||||||
|
find_package(Qt6 COMPONENTS UiPlugin Core Gui Widgets)
|
||||||
|
if (NOT Qt6_FOUND)
|
||||||
|
message(
|
||||||
|
WARNING
|
||||||
|
"[Klips] Qt examples will not be built.\n"
|
||||||
|
"On Ubuntu 24.04 Qt6 can be installed using apt:\n"
|
||||||
|
" sudo apt install qt6-base-dev qt6-tools-dev\n"
|
||||||
|
)
|
||||||
|
else()
|
||||||
|
add_subdirectory(qt)
|
||||||
|
endif()
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for practicing various algorithms in C++"
|
DESCRIPTION "A project for practicing various algorithms in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for practicing algorithms using graphs in C++"
|
DESCRIPTION "A project for practicing algorithms using graphs in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project(
|
|||||||
DESCRIPTION "Practice implementing and using object graphs in C++"
|
DESCRIPTION "Practice implementing and using object graphs in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
algo-graphs-object graph.cpp
|
algo-graphs-object graph.cpp
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project(
|
|||||||
DESCRIPTION "Practice implementing and using simple graphs in C++"
|
DESCRIPTION "Practice implementing and using simple graphs in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
algo-graphs-simple graph.cpp
|
algo-graphs-simple graph.cpp
|
||||||
|
|||||||
@@ -8,9 +8,8 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <algorithm>
|
|
||||||
#include "lib-graph.hpp"
|
#include "lib-graph.hpp"
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
void Graph::BFS(int startNode)
|
void Graph::BFS(int startNode)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
#include <unordered_set>
|
#include <unordered_set>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
|
|
||||||
class Graph {
|
class Graph {
|
||||||
|
|||||||
@@ -14,5 +14,6 @@ project(
|
|||||||
DESCRIPTION "Practice implementing and using templated graphs in C++"
|
DESCRIPTION "Practice implementing and using templated graphs in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(algo-graphs-templated graph.cpp)
|
add_executable(algo-graphs-templated graph.cpp)
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
#include <unordered_set>
|
#include <unordered_set>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project(
|
|||||||
DESCRIPTION "Practice implementing and using weighted graphs in C++"
|
DESCRIPTION "Practice implementing and using weighted graphs in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
algo-graphs-weighted graph.cpp
|
algo-graphs-weighted graph.cpp
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
#include <unordered_set>
|
#include <unordered_set>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for practicing various sorting algorithms in C++"
|
DESCRIPTION "A project for practicing various sorting algorithms in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for practicing insertion sort in C++"
|
DESCRIPTION "A project for practicing insertion sort in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
algo-sort-insertion insertion-sort.cpp
|
algo-sort-insertion insertion-sort.cpp
|
||||||
|
|||||||
@@ -14,6 +14,8 @@ project (
|
|||||||
DESCRIPTION "A project for practicing merge sort in C++"
|
DESCRIPTION "A project for practicing merge sort in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
algo-sort-merge merge-sort.cpp
|
algo-sort-merge merge-sort.cpp
|
||||||
lib-merge.cpp lib-merge.h
|
lib-merge.cpp lib-merge.h
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
void MergeSort(std::vector<int> &array, size_t lhs, size_t rhs)
|
void MergeSort(std::vector<int> &array, size_t lhs, size_t rhs)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for practicing quick sort in C++"
|
DESCRIPTION "A project for practicing quick sort in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
algo-sort-quick quick-sort.cpp
|
algo-sort-quick quick-sort.cpp
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for practicing radix sort in C++"
|
DESCRIPTION "A project for practicing radix sort in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
algo-sort-radix radix-sort.cpp
|
algo-sort-radix radix-sort.cpp
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for practicing selection sort in C++"
|
DESCRIPTION "A project for practicing selection sort in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
algo-sort-select select-sort.cpp
|
algo-sort-select select-sort.cpp
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for practicing algorithms using trees in C++"
|
DESCRIPTION "A project for practicing algorithms using trees in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for testing BST algorithms"
|
DESCRIPTION "A project for testing BST algorithms"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
algo-trees-bst driver.cpp
|
algo-trees-bst driver.cpp
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for testing red-black tree algorithms"
|
DESCRIPTION "A project for testing red-black tree algorithms"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
algo-trees-redblack driver.cpp
|
algo-trees-redblack driver.cpp
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
#define REDBLACK_H
|
#define REDBLACK_H
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
enum Color {Black, Red};
|
enum Color {Black, Red};
|
||||||
|
|
||||||
|
|||||||
@@ -14,18 +14,22 @@ project(
|
|||||||
DESCRIPTION "Practice project for learning Catch2"
|
DESCRIPTION "Practice project for learning Catch2"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_compile_options(-Wall)
|
add_compile_options(-Wall)
|
||||||
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
|
|
||||||
Include(FetchContent)
|
Include(FetchContent)
|
||||||
FetchContent_Declare(
|
FetchContent_Declare(
|
||||||
Catch2
|
Catch2
|
||||||
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
|
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
|
||||||
GIT_TAG v3.0.1
|
GIT_TAG v3.4.0
|
||||||
)
|
)
|
||||||
FetchContent_MakeAvailable(Catch2)
|
FetchContent_MakeAvailable(Catch2)
|
||||||
|
|
||||||
add_subdirectory(src)
|
add_library(klips SHARED src/klips.cpp)
|
||||||
add_subdirectory(test)
|
target_include_directories(klips PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
|
||||||
|
|
||||||
|
add_executable(test_klips src/test_klips.cpp)
|
||||||
|
target_link_libraries(test_klips PUBLIC Catch2::Catch2WithMain klips)
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
################################################################################
|
|
||||||
## Author: Shaun Reed ##
|
|
||||||
## Legal: All Content (c) 2022 Shaun Reed, all rights reserved ##
|
|
||||||
## About: Practice project for testing with catch2 framework ##
|
|
||||||
## ##
|
|
||||||
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.15)
|
|
||||||
|
|
||||||
project(
|
|
||||||
#[[NAME]] Catch2
|
|
||||||
VERSION 1.0
|
|
||||||
DESCRIPTION "Practice project for learning Catch2"
|
|
||||||
LANGUAGES CXX
|
|
||||||
)
|
|
||||||
|
|
||||||
add_compile_options(-Wall)
|
|
||||||
add_definitions("-std=c++17")
|
|
||||||
|
|
||||||
add_library(klips SHARED klips.cpp)
|
|
||||||
target_include_directories(klips PRIVATE ${CMAKE_SOURCE_DIR}/include)
|
|
||||||
@@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
#include "../bin/catch.hpp"
|
#include "catch2/catch_all.hpp"
|
||||||
|
|
||||||
#include "klips.hpp"
|
#include "klips.hpp"
|
||||||
#include "type_name.hpp"
|
#include "type_name.hpp"
|
||||||
|
|
||||||
@@ -139,7 +140,7 @@ template <> template <bool must_find> void test_config_get<std::string>::run() {
|
|||||||
TEMPLATE_PRODUCT_TEST_CASE("Test", "[test]", test_config_get,
|
TEMPLATE_PRODUCT_TEST_CASE("Test", "[test]", test_config_get,
|
||||||
(int, std::string)) {
|
(int, std::string)) {
|
||||||
TT();
|
TT();
|
||||||
TestType t;
|
// TestType t;
|
||||||
test_config_get<int> s;
|
test_config_get<int> s;
|
||||||
s.template run<true>();
|
s.template run<true>();
|
||||||
// TestType t;
|
// TestType t;
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
################################################################################
|
|
||||||
## Author: Shaun Reed ##
|
|
||||||
## Legal: All Content (c) 2022 Shaun Reed, all rights reserved ##
|
|
||||||
## About: Practice project for testing with catch2 framework ##
|
|
||||||
## ##
|
|
||||||
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.15)
|
|
||||||
|
|
||||||
project(
|
|
||||||
#[[NAME]] Catch2
|
|
||||||
VERSION 1.0
|
|
||||||
DESCRIPTION "Practice project for learning Catch2"
|
|
||||||
LANGUAGES CXX
|
|
||||||
)
|
|
||||||
|
|
||||||
add_compile_options(-Wall)
|
|
||||||
|
|
||||||
add_executable(test_klips test_klips.cpp)
|
|
||||||
target_link_libraries(test_klips PRIVATE Catch2::Catch2WithMain klips)
|
|
||||||
target_include_directories(test_klips PRIVATE ${CMAKE_SOURCE_DIR}/include)
|
|
||||||
@@ -22,6 +22,7 @@ project (
|
|||||||
DESCRIPTION "A basic CMake template for C++ projects"
|
DESCRIPTION "A basic CMake template for C++ projects"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
# Include any directories the compiler may need
|
# Include any directories the compiler may need
|
||||||
include_directories(./include)
|
include_directories(./include)
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for practicing cryptography in C++"
|
DESCRIPTION "A project for practicing cryptography in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project(
|
|||||||
DESCRIPTION "Practice implementing columnar transposition in C++"
|
DESCRIPTION "Practice implementing columnar transposition in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
crypto-columnar-transposition driver.cpp
|
crypto-columnar-transposition driver.cpp
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for practicing various data structures in C++"
|
DESCRIPTION "A project for practicing various data structures in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for testing a basic implementation of a BST"
|
DESCRIPTION "A project for testing a basic implementation of a BST"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
data-bst driver.cpp
|
data-bst driver.cpp
|
||||||
|
|||||||
@@ -10,10 +10,11 @@
|
|||||||
|
|
||||||
#include "bst.h"
|
#include "bst.h"
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
/********************************************************************************
|
/********************************************************************************
|
||||||
* Constructors, Destructors, Operators
|
* Constructors, Destructors, Operators
|
||||||
*********************************************************************************/
|
*********************************************************************************/
|
||||||
|
|
||||||
/** Copy Assignment Operator
|
/** Copy Assignment Operator
|
||||||
* @brief Empty the calling object's root BinaryNode, and copy the rhs data
|
* @brief Empty the calling object's root BinaryNode, and copy the rhs data
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "Project for testing circular doubly linked list implementation"
|
DESCRIPTION "Project for testing circular doubly linked list implementation"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
data-circular-doubly-linked-list driver.cpp
|
data-circular-doubly-linked-list driver.cpp
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
#include "circledoublelist.h"
|
#include "circledoublelist.h"
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* Constructors, Destructors, Operators
|
* Constructors, Destructors, Operators
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "Project for testing circular singly linked list implementation"
|
DESCRIPTION "Project for testing circular singly linked list implementation"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
data-circular-singly-linked-list driver.cpp
|
data-circular-singly-linked-list driver.cpp
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
#include "circlesinglelist.h"
|
#include "circlesinglelist.h"
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* Constructors, Destructors, Operators
|
* Constructors, Destructors, Operators
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for testing a doubly linked list implementation"
|
DESCRIPTION "A project for testing a doubly linked list implementation"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
data-doubly-linked-list driver.cpp
|
data-doubly-linked-list driver.cpp
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
#include "doublelist.h"
|
#include "doublelist.h"
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* Constructors, Destructors, Operators
|
* Constructors, Destructors, Operators
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for testing a max heap implementation"
|
DESCRIPTION "A project for testing a max heap implementation"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
data-max-heap driver.cpp
|
data-max-heap driver.cpp
|
||||||
|
|||||||
@@ -10,10 +10,11 @@
|
|||||||
|
|
||||||
#include "maxheap.h"
|
#include "maxheap.h"
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
/********************************************************************************
|
/********************************************************************************
|
||||||
* Constructors, Destructors, Operators
|
* Constructors, Destructors, Operators
|
||||||
*********************************************************************************/
|
*********************************************************************************/
|
||||||
|
|
||||||
/** default constructor
|
/** default constructor
|
||||||
* Constructs a heap with the given default values
|
* Constructs a heap with the given default values
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "Project for testing queue implementation"
|
DESCRIPTION "Project for testing queue implementation"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
data-queue driver.cpp
|
data-queue driver.cpp
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
#include "queuelist.h"
|
#include "queuelist.h"
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* Constructors, Destructors, Operators
|
* Constructors, Destructors, Operators
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for testing a singly linked list implementation"
|
DESCRIPTION "A project for testing a singly linked list implementation"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
data-singly-linked-list driver.cpp
|
data-singly-linked-list driver.cpp
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
#include "singlelist.h"
|
#include "singlelist.h"
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* Constructors, Destructors, Operators
|
* Constructors, Destructors, Operators
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for testing a Stack implementation"
|
DESCRIPTION "A project for testing a Stack implementation"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
data-stack driver.cpp
|
data-stack driver.cpp
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
#include "stacklist.h"
|
#include "stacklist.h"
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* Constructors, Destructors, Operators
|
* Constructors, Destructors, Operators
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for practicing templated data structures in C++"
|
DESCRIPTION "A project for practicing templated data structures in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_subdirectory(doublelist)
|
add_subdirectory(doublelist)
|
||||||
add_subdirectory(queuelist)
|
add_subdirectory(queuelist)
|
||||||
|
|||||||
@@ -14,5 +14,6 @@ project (
|
|||||||
DESCRIPTION "A project for practicing templated doubly linked list implementations"
|
DESCRIPTION "A project for practicing templated doubly linked list implementations"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(data-templates-doubly-linked-list driver.cpp)
|
add_executable(data-templates-doubly-linked-list driver.cpp)
|
||||||
|
|||||||
@@ -14,5 +14,6 @@ project (
|
|||||||
DESCRIPTION "A project for practicing templated queue implementations"
|
DESCRIPTION "A project for practicing templated queue implementations"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(data-templates-queue driver.cpp)
|
add_executable(data-templates-queue driver.cpp)
|
||||||
|
|||||||
@@ -14,5 +14,6 @@ project (
|
|||||||
DESCRIPTION "A project for practicing templated Stack implementations"
|
DESCRIPTION "A project for practicing templated Stack implementations"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(data-templates-stack driver.cpp)
|
add_executable(data-templates-stack driver.cpp)
|
||||||
|
|||||||
@@ -14,5 +14,6 @@ project (
|
|||||||
DESCRIPTION "A project for practicing templated Vector implementations"
|
DESCRIPTION "A project for practicing templated Vector implementations"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(data-templates-vectors driver.cpp)
|
add_executable(data-templates-vectors driver.cpp)
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project (
|
|||||||
DESCRIPTION "A project for testing a basic Vector implementation"
|
DESCRIPTION "A project for testing a basic Vector implementation"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
data-vectors driver.cpp
|
data-vectors driver.cpp
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
#include "vector.h"
|
#include "vector.h"
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* Constructors, Destructors, Operators
|
* Constructors, Destructors, Operators
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
## Author: Shaun Reed ##
|
## Author: Shaun Reed ##
|
||||||
## Legal: All Content (c) 2021 Shaun Reed, all rights reserved ##
|
## Legal: All Content (c) 2025 Shaun Reed, all rights reserved ##
|
||||||
## About: A root project for practicing C++ ##
|
## About: A root project for practicing C++ ##
|
||||||
## This project can be built to debug and run all nested projects ##
|
## This project can be built to debug and run all nested projects ##
|
||||||
## Or, any subdirectory with a project() statement can be selected ##
|
## Or, any subdirectory with a project() statement can be selected ##
|
||||||
@@ -16,6 +16,7 @@ project(
|
|||||||
DESCRIPTION "A root project for practicing graphics programming in C++"
|
DESCRIPTION "A root project for practicing graphics programming in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
## Author: Shaun Reed ##
|
## Author: Shaun Reed ##
|
||||||
## Legal: All Content (c) 2021 Shaun Reed, all rights reserved ##
|
## Legal: All Content (c) 2025 Shaun Reed, all rights reserved ##
|
||||||
## ##
|
## ##
|
||||||
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
|
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
|
||||||
################################################################################
|
################################################################################
|
||||||
@@ -8,40 +8,46 @@
|
|||||||
# Define CMake version
|
# Define CMake version
|
||||||
cmake_minimum_required(VERSION 3.15)
|
cmake_minimum_required(VERSION 3.15)
|
||||||
|
|
||||||
|
include(FetchContent)
|
||||||
project(
|
project(
|
||||||
#[[NAME]] OpenGL-Cmake
|
#[[NAME]] OpenGL-Cmake
|
||||||
DESCRIPTION "Example project for building OpenGL projects with CMake"
|
DESCRIPTION "Example project for building OpenGL projects with CMake"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_library(graphics-lib-opengl src/lib-opengl-test.cpp)
|
add_library(graphics-lib-opengl src/lib-opengl-test.cpp)
|
||||||
target_include_directories(graphics-lib-opengl PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
|
target_include_directories(graphics-lib-opengl PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
|
||||||
|
|
||||||
# Find OpenGL package
|
# Find OpenGL package
|
||||||
find_package(OpenGL REQUIRED)
|
find_package(OpenGL)
|
||||||
if (OPENGL_FOUND)
|
if (NOT OPENGL_FOUND)
|
||||||
# Link opengl-test executable to OpenGL
|
|
||||||
target_include_directories(graphics-lib-opengl PUBLIC ${OPENGL_INCLUDE_DIR})
|
|
||||||
target_link_libraries(graphics-lib-opengl PUBLIC ${OPENGL_LIBRARIES})
|
|
||||||
else()
|
|
||||||
message(
|
message(
|
||||||
"Error: CMake was unable to find the OpenGL package\n"
|
"[Klips] Error: CMake was unable to find OpenGL.\n"
|
||||||
"Please install OpenGL and try again\n"
|
"On Ubuntu 24.04 OpenGL can be installed using apt:\n"
|
||||||
|
" sudo apt install libopengl-dev libgl1-mesa-dev mesa-common-dev libglu1-mesa-dev\n"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
# Link opengl-test executable to OpenGL
|
||||||
|
message(STATUS "[Klips] Found OpenGL: ${OPENGL_INCLUDE_DIR}")
|
||||||
|
target_include_directories(graphics-lib-opengl PUBLIC ${OPENGL_INCLUDE_DIR})
|
||||||
|
target_link_libraries(graphics-lib-opengl PUBLIC ${OPENGL_LIBRARIES})
|
||||||
|
|
||||||
# Find GLUT package
|
find_package(GLUT QUIET)
|
||||||
find_package(GLUT REQUIRED)
|
if(NOT GLUT_FOUND)
|
||||||
if (GLUT_FOUND)
|
|
||||||
# Link lib-opengl-test executable to GLUT
|
|
||||||
target_include_directories(graphics-lib-opengl PUBLIC ${GLUT_INCLUDE_DIR})
|
|
||||||
target_link_libraries(graphics-lib-opengl PUBLIC ${GLUT_LIBRARIES})
|
|
||||||
else()
|
|
||||||
message(
|
message(
|
||||||
"Error: CMake was unable to find the GLUT package\n"
|
FATAL_ERROR
|
||||||
"Please install GLUT (freeglut3-dev) and try again\n"
|
"[Klips] Failed to fetch GLUT. Could not find dependency X11 input libraries.\n"
|
||||||
|
"On Ubuntu 24.04 Xi can be installed using apt:\n"
|
||||||
|
" sudo apt install libxi-dev\n"
|
||||||
|
"Alternatively, on Ubuntu 24.04 GLUT can be installed with apt:\n"
|
||||||
|
" sudo apt install freeglut3-dev\n"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
message(STATUS "[Klips] Found GLUT: ${GLUT_INCLUDE_DIR}")
|
||||||
|
# Link lib-opengl-test executable to GLUT
|
||||||
|
target_include_directories(graphics-lib-opengl PUBLIC ${GLUT_INCLUDE_DIR})
|
||||||
|
target_link_libraries(graphics-lib-opengl PUBLIC ${GLUT_LIBRARIES})
|
||||||
|
|
||||||
# Add test executable
|
# Add test executable
|
||||||
add_executable(graphics-cmake-opengl apps/test-gl.cpp)
|
add_executable(graphics-cmake-opengl apps/test-gl.cpp)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
## Author: Shaun Reed ##
|
## Author: Shaun Reed ##
|
||||||
## Legal: All Content (c) 2021 Shaun Reed, all rights reserved ##
|
## Legal: All Content (c) 2025 Shaun Reed, all rights reserved ##
|
||||||
## ##
|
## ##
|
||||||
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
|
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
|
||||||
################################################################################
|
################################################################################
|
||||||
@@ -13,6 +13,7 @@ project(
|
|||||||
DESCRIPTION "Example project for building SDL projects with CMake"
|
DESCRIPTION "Example project for building SDL projects with CMake"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
# Add Library
|
# Add Library
|
||||||
add_library(
|
add_library(
|
||||||
@@ -27,31 +28,30 @@ target_include_directories( # When calling library, include a directo
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Search for SDL2 package
|
# Search for SDL2 package
|
||||||
find_package(SDL2 REQUIRED sdl2)
|
find_package(SDL2 QUIET)
|
||||||
|
if (NOT SDL2_FOUND)
|
||||||
|
message(FATAL_ERROR
|
||||||
|
"[Klips] Failed to find SDL2.\n"
|
||||||
|
"On Ubuntu 24.04 SDL2 can be installed using apt:\n"
|
||||||
|
" sudo apt install libsdl2-dev\n"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
message(STATUS "[Klips] Found SDL2: ${SDL2_INCLUDE_DIRS}")
|
||||||
|
|
||||||
# If SDL2 was found successfully, link to lib-sdl-test
|
# Any target that links with this library will also link to SDL2
|
||||||
if (SDL2_FOUND)
|
# + Because we choose PUBLIC visibility
|
||||||
# Any target that links with this library will also link to SDL2
|
target_include_directories(graphics-lib-sdl PUBLIC ${SDL2_INCLUDE_DIRS})
|
||||||
# + Because we choose PUBLIC visibility
|
target_link_libraries(graphics-lib-sdl PUBLIC "${SDL2_LIBRARIES}")
|
||||||
target_include_directories(graphics-lib-sdl PUBLIC ${SDL2_INCLUDE_DIRS})
|
|
||||||
target_link_libraries(graphics-lib-sdl PUBLIC "${SDL2_LIBRARIES}")
|
|
||||||
|
|
||||||
# Creating executable
|
# Creating executable
|
||||||
add_executable(
|
add_executable(
|
||||||
graphics-cmake-sdl # Exe name
|
graphics-cmake-sdl # Exe name
|
||||||
apps/sdl-test.cpp # Exe Source(s)
|
apps/sdl-test.cpp # Exe Source(s)
|
||||||
)
|
)
|
||||||
|
|
||||||
# Linking the exe to library
|
# Linking the exe to library
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
graphics-cmake-sdl # Executable to link
|
graphics-cmake-sdl # Executable to link
|
||||||
PRIVATE # Visibility
|
PRIVATE # Visibility
|
||||||
graphics-lib-sdl # Library to link
|
graphics-lib-sdl # Library to link
|
||||||
)
|
)
|
||||||
|
|
||||||
else()
|
|
||||||
message(
|
|
||||||
"Error: CMake was unable to find SDL2 package.\n"
|
|
||||||
"Please install the libsdl2-dev package and try again.\n"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
@@ -14,6 +14,7 @@ project(
|
|||||||
DESCRIPTION "Practice with multithreaded programming in C++"
|
DESCRIPTION "Practice with multithreaded programming in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
add_compile_options("-Wall")
|
add_compile_options("-Wall")
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ project(
|
|||||||
DESCRIPTION "Example of condition_variables in multithreaded C++"
|
DESCRIPTION "Example of condition_variables in multithreaded C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
multithread-conditions driver.cpp
|
multithread-conditions driver.cpp
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ project(
|
|||||||
DESCRIPTION "Example and solution for deadlocks in C++"
|
DESCRIPTION "Example and solution for deadlocks in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
multithread-deadlock driver.cpp
|
multithread-deadlock driver.cpp
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ project(
|
|||||||
DESCRIPTION "Example and solution for livelocks in C++"
|
DESCRIPTION "Example and solution for livelocks in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
multithread-livelock driver.cpp
|
multithread-livelock driver.cpp
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project(
|
|||||||
DESCRIPTION "Example and solution for race conditions"
|
DESCRIPTION "Example and solution for race conditions"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
multithread-race-condition driver.cpp
|
multithread-race-condition driver.cpp
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project(
|
|||||||
DESCRIPTION "A project for practicing various design patterns in C++"
|
DESCRIPTION "A project for practicing various design patterns in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ project(
|
|||||||
DESCRIPTION "An example of the abstract factory design pattern in C++"
|
DESCRIPTION "An example of the abstract factory design pattern in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
add_compile_options("-Wall")
|
add_compile_options("-Wall")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project(
|
|||||||
DESCRIPTION "An example of the adapter design pattern in C++"
|
DESCRIPTION "An example of the adapter design pattern in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
add_compile_options("-Wall")
|
add_compile_options("-Wall")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
#ifndef ADAPTER_HPP
|
#ifndef ADAPTER_HPP
|
||||||
#define ADAPTER_HPP
|
#define ADAPTER_HPP
|
||||||
|
|
||||||
|
#include <ctime>
|
||||||
#include <random>
|
#include <random>
|
||||||
|
|
||||||
// Target implementation to adapt to a new interface
|
// Target implementation to adapt to a new interface
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project(
|
|||||||
DESCRIPTION "An example of the bridge design pattern in C++"
|
DESCRIPTION "An example of the bridge design pattern in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
add_compile_options("-Wall")
|
add_compile_options("-Wall")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project(
|
|||||||
DESCRIPTION "An example of the factory design pattern in C++"
|
DESCRIPTION "An example of the factory design pattern in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
add_compile_options("-Wall")
|
add_compile_options("-Wall")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project(
|
|||||||
DESCRIPTION "An example of the state design pattern in C++"
|
DESCRIPTION "An example of the state design pattern in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
add_compile_options("-Wall")
|
add_compile_options("-Wall")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project(
|
|||||||
DESCRIPTION "An example of the prototype design pattern in C++"
|
DESCRIPTION "An example of the prototype design pattern in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
add_compile_options("-Wall")
|
add_compile_options("-Wall")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project(
|
|||||||
DESCRIPTION "An example of the singleton design pattern in C++"
|
DESCRIPTION "An example of the singleton design pattern in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
patterns-singleton main.cpp
|
patterns-singleton main.cpp
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project(
|
|||||||
DESCRIPTION "An example of the state design pattern in C++"
|
DESCRIPTION "An example of the state design pattern in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
add_compile_options("-Wall")
|
add_compile_options("-Wall")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project(
|
|||||||
DESCRIPTION "An example of the visitor design pattern in C++"
|
DESCRIPTION "An example of the visitor design pattern in C++"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
add_compile_options("-Wall")
|
add_compile_options("-Wall")
|
||||||
|
|
||||||
add_executable(
|
add_executable(
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ project(
|
|||||||
DESCRIPTION "A root project for several small Qt6 practice projects"
|
DESCRIPTION "A root project for several small Qt6 practice projects"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||||
add_compile_options("-Wall")
|
add_compile_options("-Wall")
|
||||||
|
|||||||
@@ -14,6 +14,9 @@ project(
|
|||||||
DESCRIPTION "Example of a widget plugin collection for Qt Designer"
|
DESCRIPTION "Example of a widget plugin collection for Qt Designer"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
# Lowercase string to use as a slug for executable names for identification.
|
||||||
|
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
|
||||||
|
|
||||||
include(GenerateExportHeader)
|
include(GenerateExportHeader)
|
||||||
|
|
||||||
@@ -51,43 +54,56 @@ endif()
|
|||||||
set(QT_INSTALL_DIR "${QT_DIR}/6.3.1/gcc_64/" CACHE PATH "Path to Qt6 install")
|
set(QT_INSTALL_DIR "${QT_DIR}/6.3.1/gcc_64/" CACHE PATH "Path to Qt6 install")
|
||||||
list(APPEND CMAKE_PREFIX_PATH "${QT_INSTALL_DIR}")
|
list(APPEND CMAKE_PREFIX_PATH "${QT_INSTALL_DIR}")
|
||||||
|
|
||||||
find_package(Qt6 REQUIRED COMPONENTS UiPlugin Core Gui Widgets)
|
find_package(Qt6 COMPONENTS UiPlugin Core Gui Widgets)
|
||||||
|
if (NOT Qt6_FOUND)
|
||||||
|
message(
|
||||||
|
FATAL_ERROR
|
||||||
|
"[Klips] Error: CMake was unable to find Qt6 libraries.\n"
|
||||||
|
"The example will not be built until the build is configured with these packages installed.\n"
|
||||||
|
"On Ubuntu 24.04 Qt6 can be installed using apt:\n"
|
||||||
|
" sudo apt-get install qt6-base-dev qt6-tools-dev\n"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
# Creating a library with two plugins for the collection.
|
# Creating a library with two plugins for the collection.
|
||||||
qt_add_library(widget-plugin-library
|
set(WIDGET_PLUGIN_LIBRARY widget-plugin-library_${PROJECT_NAME_LOWER})
|
||||||
|
qt_add_library(${WIDGET_PLUGIN_LIBRARY}
|
||||||
textview.cpp textview.h
|
textview.cpp textview.h
|
||||||
widgetplugin.cpp widgetplugin.h
|
widgetplugin.cpp widgetplugin.h
|
||||||
)
|
)
|
||||||
target_sources(widget-plugin-library PRIVATE
|
target_sources(${WIDGET_PLUGIN_LIBRARY} PRIVATE
|
||||||
textview.cpp textview.h
|
textview.cpp textview.h
|
||||||
treeview.cpp treeview.h
|
treeview.cpp treeview.h
|
||||||
widgetplugin.cpp widgetplugin.h
|
widgetplugin.cpp widgetplugin.h
|
||||||
)
|
)
|
||||||
set_target_properties(widget-plugin-library PROPERTIES
|
set_target_properties(${WIDGET_PLUGIN_LIBRARY} PROPERTIES
|
||||||
WIN32_EXECUTABLE TRUE
|
WIN32_EXECUTABLE TRUE
|
||||||
MACOSX_BUNDLE TRUE
|
MACOSX_BUNDLE TRUE
|
||||||
)
|
)
|
||||||
target_link_libraries(widget-plugin-library
|
target_link_libraries(${WIDGET_PLUGIN_LIBRARY}
|
||||||
PUBLIC Qt::UiPlugin Qt::Core Qt::Gui Qt::Widgets
|
PUBLIC Qt::UiPlugin Qt::Core Qt::Gui Qt::Widgets
|
||||||
)
|
)
|
||||||
|
|
||||||
install(TARGETS widget-plugin-library
|
install(TARGETS ${WIDGET_PLUGIN_LIBRARY}
|
||||||
RUNTIME DESTINATION "${QT_PLUGIN_LIBRARY_DIR}"
|
RUNTIME DESTINATION "${QT_PLUGIN_LIBRARY_DIR}"
|
||||||
BUNDLE DESTINATION "${QT_PLUGIN_LIBRARY_DIR}"
|
BUNDLE DESTINATION "${QT_PLUGIN_LIBRARY_DIR}"
|
||||||
LIBRARY DESTINATION "${QT_PLUGIN_LIBRARY_DIR}"
|
LIBRARY DESTINATION "${QT_PLUGIN_LIBRARY_DIR}"
|
||||||
)
|
)
|
||||||
|
|
||||||
generate_export_header(widget-plugin-library)
|
generate_export_header(${WIDGET_PLUGIN_LIBRARY}
|
||||||
|
BASE_NAME widget_plugin_library
|
||||||
|
EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/widget-plugin-library_export.h"
|
||||||
|
)
|
||||||
|
|
||||||
# Creating the collection
|
# Creating the collection
|
||||||
|
set(WIDGET_PLUGIN_COLLECTION widget-plugin-collection_${PROJECT_NAME_LOWER})
|
||||||
qt_add_library(widget-plugin-collection
|
qt_add_library(${WIDGET_PLUGIN_COLLECTION}
|
||||||
widgetplugincollection.cpp widgetplugincollection.h
|
widgetplugincollection.cpp widgetplugincollection.h
|
||||||
)
|
)
|
||||||
target_link_libraries(widget-plugin-collection
|
target_link_libraries(${WIDGET_PLUGIN_COLLECTION}
|
||||||
Qt6::Widgets Qt6::UiPlugin widget-plugin-library
|
Qt6::Widgets Qt6::UiPlugin ${WIDGET_PLUGIN_LIBRARY}
|
||||||
)
|
)
|
||||||
install(TARGETS widget-plugin-collection
|
install(TARGETS ${WIDGET_PLUGIN_COLLECTION}
|
||||||
RUNTIME DESTINATION "${QT_PLUGIN_INSTALL_DIR}"
|
RUNTIME DESTINATION "${QT_PLUGIN_INSTALL_DIR}"
|
||||||
BUNDLE DESTINATION "${QT_PLUGIN_INSTALL_DIR}"
|
BUNDLE DESTINATION "${QT_PLUGIN_INSTALL_DIR}"
|
||||||
LIBRARY DESTINATION "${QT_PLUGIN_INSTALL_DIR}"
|
LIBRARY DESTINATION "${QT_PLUGIN_INSTALL_DIR}"
|
||||||
@@ -101,10 +117,11 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/app-dir.h.in"
|
|||||||
@ONLY
|
@ONLY
|
||||||
)
|
)
|
||||||
|
|
||||||
qt_add_executable(widget-app
|
set(WIDGET_APP widget-app_${PROJECT_NAME_LOWER})
|
||||||
|
qt_add_executable(${WIDGET_APP}
|
||||||
widgetapp.cpp widgetapp.h widgetapp.ui
|
widgetapp.cpp widgetapp.h widgetapp.ui
|
||||||
main.cpp
|
main.cpp
|
||||||
)
|
)
|
||||||
target_link_libraries(widget-app
|
target_link_libraries(${WIDGET_APP}
|
||||||
PRIVATE Qt::Widgets widget-plugin-library
|
PRIVATE Qt::Widgets ${WIDGET_PLUGIN_LIBRARY}
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#ifndef APPDIR_H_IN
|
#ifndef APPDIR_H_IN
|
||||||
#define APPDIR_H_IN
|
#define APPDIR_H_IN
|
||||||
|
|
||||||
#define APP_DIR "/home/kapper/Code/klips/cpp/qt/designer-plugin-collection"
|
#define APP_DIR "/media/shaun/Storage/Code/klips/cpp/qt/designer-plugin-collection"
|
||||||
|
|
||||||
#endif // APPDIR_H_IN
|
#endif // APPDIR_H_IN
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
## Author: Shaun Reed ##
|
## Author: Shaun Reed ##
|
||||||
## Legal: All Content (c) 2022 Shaun Reed, all rights reserved ##
|
## Legal: All Content (c) 2025 Shaun Reed, all rights reserved ##
|
||||||
## About: Example of making widget plugins for Qt Designer ##
|
## About: Example of making widget plugins for Qt Designer ##
|
||||||
## ##
|
## ##
|
||||||
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
|
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
|
||||||
@@ -14,6 +14,9 @@ project(
|
|||||||
DESCRIPTION "Example of a widget plugin for Qt Designer"
|
DESCRIPTION "Example of a widget plugin for Qt Designer"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
# Lowercase string to use as a slug for executable names for identification.
|
||||||
|
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
|
||||||
|
|
||||||
include(GenerateExportHeader)
|
include(GenerateExportHeader)
|
||||||
|
|
||||||
@@ -42,35 +45,44 @@ endif()
|
|||||||
set(QT_INSTALL_DIR "${QT_DIR}/6.3.1/gcc_64/" CACHE PATH "Path to Qt6 install")
|
set(QT_INSTALL_DIR "${QT_DIR}/6.3.1/gcc_64/" CACHE PATH "Path to Qt6 install")
|
||||||
list(APPEND CMAKE_PREFIX_PATH "${QT_INSTALL_DIR}")
|
list(APPEND CMAKE_PREFIX_PATH "${QT_INSTALL_DIR}")
|
||||||
|
|
||||||
find_package(Qt6 REQUIRED COMPONENTS UiPlugin Core Gui Widgets)
|
find_package(Qt6 COMPONENTS UiPlugin Core Gui Widgets)
|
||||||
|
if (NOT Qt6_FOUND)
|
||||||
|
message(
|
||||||
|
FATAL_ERROR
|
||||||
|
"[Klips] Error: CMake was unable to find Qt6 libraries.\n"
|
||||||
|
"The example will not be built until the build is configured with these packages installed.\n"
|
||||||
|
"On Ubuntu 24.04 Qt6 can be installed using apt:\n"
|
||||||
|
" sudo apt-get install qt6-base-dev qt6-tools-dev\n"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
# Creating the plugin
|
# Creating the plugin
|
||||||
|
set(WIDGET_PLUGIN widget-plugin_${PROJECT_NAME_LOWER})
|
||||||
qt_add_library(widget-plugin)
|
qt_add_library(${WIDGET_PLUGIN})
|
||||||
target_sources(widget-plugin PRIVATE
|
target_sources(${WIDGET_PLUGIN} PRIVATE
|
||||||
text-view.cpp text-view.h
|
text-view.cpp text-view.h
|
||||||
widget-plugin.cpp widget-plugin.h
|
widget-plugin.cpp widget-plugin.h
|
||||||
)
|
)
|
||||||
set_target_properties(widget-plugin PROPERTIES
|
set_target_properties(${WIDGET_PLUGIN} PROPERTIES
|
||||||
WIN32_EXECUTABLE TRUE
|
WIN32_EXECUTABLE TRUE
|
||||||
MACOSX_BUNDLE TRUE
|
MACOSX_BUNDLE TRUE
|
||||||
)
|
)
|
||||||
target_link_libraries(widget-plugin PUBLIC
|
target_link_libraries(${WIDGET_PLUGIN} PUBLIC
|
||||||
Qt::UiPlugin Qt::Core Qt::Gui Qt::Widgets
|
Qt::UiPlugin Qt::Core Qt::Gui Qt::Widgets
|
||||||
)
|
)
|
||||||
|
|
||||||
install(TARGETS widget-plugin
|
install(TARGETS ${WIDGET_PLUGIN}
|
||||||
RUNTIME DESTINATION "${QT_PLUGIN_INSTALL_DIR}"
|
RUNTIME DESTINATION "${QT_PLUGIN_INSTALL_DIR}"
|
||||||
BUNDLE DESTINATION "${QT_PLUGIN_INSTALL_DIR}"
|
BUNDLE DESTINATION "${QT_PLUGIN_INSTALL_DIR}"
|
||||||
LIBRARY DESTINATION "${QT_PLUGIN_INSTALL_DIR}"
|
LIBRARY DESTINATION "${QT_PLUGIN_INSTALL_DIR}"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Application that will use the widget plugin
|
# Application that will use the widget plugin
|
||||||
|
set(WIDGET_APP widget-app_${PROJECT_NAME_LOWER})
|
||||||
qt_add_executable(widget-app
|
qt_add_executable(${WIDGET_APP}
|
||||||
widget-app.cpp widget-app.h widget-app.ui
|
widget-app.cpp widget-app.h widget-app.ui
|
||||||
main.cpp
|
main.cpp
|
||||||
)
|
)
|
||||||
target_link_libraries(widget-app PRIVATE
|
target_link_libraries(${WIDGET_APP} PRIVATE
|
||||||
Qt::Widgets widget-plugin
|
Qt::Widgets ${WIDGET_PLUGIN}
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
## Author: Shaun Reed ##
|
## Author: Shaun Reed ##
|
||||||
## Legal: All Content (c) 2022 Shaun Reed, all rights reserved ##
|
## Legal: All Content (c) 2025 Shaun Reed, all rights reserved ##
|
||||||
## About: Practice project for using Qt Designer with custom C++ widgets ##
|
## About: Practice project for using Qt Designer with custom C++ widgets ##
|
||||||
## ##
|
## ##
|
||||||
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
|
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
|
||||||
@@ -14,6 +14,7 @@ project(
|
|||||||
DESCRIPTION "Practice using Qt designer for desktop applications"
|
DESCRIPTION "Practice using Qt designer for desktop applications"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_compile_options(-Wall)
|
add_compile_options(-Wall)
|
||||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||||
@@ -28,7 +29,16 @@ set(QT_DIR "$ENV{HOME}/Code/Clones/Qt/6.3.1/gcc_64/" CACHE PATH "Path to Qt6")
|
|||||||
|
|
||||||
list(APPEND CMAKE_PREFIX_PATH "${QT_DIR}")
|
list(APPEND CMAKE_PREFIX_PATH "${QT_DIR}")
|
||||||
|
|
||||||
find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
|
find_package(Qt6 COMPONENTS Core Gui Widgets)
|
||||||
|
if (NOT Qt6_FOUND)
|
||||||
|
message(
|
||||||
|
FATAL_ERROR
|
||||||
|
"[Klips] Error: CMake was unable to find Qt6 libraries.\n"
|
||||||
|
"The example will not be built until the build is configured with these packages installed.\n"
|
||||||
|
"On Ubuntu 24.04 Qt6 can be installed using apt:\n"
|
||||||
|
" sudo apt-get install qt6-base-dev qt6-tools-dev\n"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
qt_add_executable(designer
|
qt_add_executable(designer
|
||||||
designer.cpp designer.h designer.ui
|
designer.cpp designer.h designer.ui
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
## Author: Shaun Reed ##
|
## Author: Shaun Reed ##
|
||||||
## Legal: All Content (c) 2022 Shaun Reed, all rights reserved ##
|
## Legal: All Content (c) 2025 Shaun Reed, all rights reserved ##
|
||||||
## About: Practice project for using signals and slots in Qt ##
|
## About: Practice project for using signals and slots in Qt ##
|
||||||
## ##
|
## ##
|
||||||
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
|
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
|
||||||
@@ -14,6 +14,7 @@ project(
|
|||||||
DESCRIPTION "Practice using signals and slots in Qt 6"
|
DESCRIPTION "Practice using signals and slots in Qt 6"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
add_compile_options(-Wall)
|
add_compile_options(-Wall)
|
||||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||||
@@ -28,7 +29,16 @@ set(QT_DIR "$ENV{HOME}/Code/Clones/Qt/6.3.1/gcc_64/" CACHE PATH "Path to Qt6")
|
|||||||
|
|
||||||
list(APPEND CMAKE_PREFIX_PATH "${QT_DIR}")
|
list(APPEND CMAKE_PREFIX_PATH "${QT_DIR}")
|
||||||
|
|
||||||
find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
|
find_package(Qt6 COMPONENTS Core Gui Widgets)
|
||||||
|
if (NOT Qt6_FOUND)
|
||||||
|
message(
|
||||||
|
FATAL_ERROR
|
||||||
|
"[Klips] Error: CMake was unable to find Qt6 libraries.\n"
|
||||||
|
"The example will not be built until the build is configured with these packages installed.\n"
|
||||||
|
"On Ubuntu 24.04 Qt6 can be installed using apt:\n"
|
||||||
|
" sudo apt-get install qt6-base-dev qt6-tools-dev\n"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
qt_add_executable(slots
|
qt_add_executable(slots
|
||||||
text-view.cpp text-view.h
|
text-view.cpp text-view.h
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ public:
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
signals:
|
signals:
|
||||||
void sendTest()QWidget;
|
void sendTest();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
signals:
|
signals:
|
||||||
|
|||||||
8
esp/README.md
Normal file
8
esp/README.md
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
# esp
|
||||||
|
|
||||||
|
```bash
|
||||||
|
shaunrd0/klips/esp/
|
||||||
|
├── cpp # Examples of ESP32 projects written in C++
|
||||||
|
├── rust # Examples of ESP32 projects written in Rust
|
||||||
|
└── README.md
|
||||||
|
```
|
||||||
@@ -12,6 +12,7 @@ project(
|
|||||||
DESCRIPTION "Example ESP-IDF cmake project"
|
DESCRIPTION "Example ESP-IDF cmake project"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
# For writing pure cmake components, see the documentation
|
# For writing pure cmake components, see the documentation
|
||||||
# https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-guides/build-system.html#writing-pure-cmake-components
|
# https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-guides/build-system.html#writing-pure-cmake-components
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ project(
|
|||||||
DESCRIPTION "Temperature and humidity from DHT sensor served on a web page"
|
DESCRIPTION "Temperature and humidity from DHT sensor served on a web page"
|
||||||
LANGUAGES CXX
|
LANGUAGES CXX
|
||||||
)
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
|
||||||
# For writing pure cmake components, see the documentation
|
# For writing pure cmake components, see the documentation
|
||||||
# https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-guides/build-system.html#writing-pure-cmake-components
|
# https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-guides/build-system.html#writing-pure-cmake-components
|
||||||
|
|||||||
4
esp/cpp/06_i2c-scanner/.gitignore
vendored
Normal file
4
esp/cpp/06_i2c-scanner/.gitignore
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
build
|
||||||
|
managed_components
|
||||||
|
dependencies.lock
|
||||||
|
sdkconfig.old
|
||||||
18
esp/cpp/06_i2c-scanner/CMakeLists.txt
Normal file
18
esp/cpp/06_i2c-scanner/CMakeLists.txt
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# For more information about build system see
|
||||||
|
# https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/build-system.html
|
||||||
|
# The following five lines of boilerplate have to be in your project's
|
||||||
|
# CMakeLists in this exact order for cmake to work correctly
|
||||||
|
cmake_minimum_required(VERSION 3.26)
|
||||||
|
|
||||||
|
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
||||||
|
|
||||||
|
project(
|
||||||
|
#[[NAME]] i2c-scanner
|
||||||
|
VERSION 0.1
|
||||||
|
DESCRIPTION "Simple I2C device scanner"
|
||||||
|
LANGUAGES CXX
|
||||||
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
# For writing pure cmake components, see the documentation
|
||||||
|
# https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-guides/build-system.html#writing-pure-cmake-components
|
||||||
|
idf_build_set_property(COMPILE_OPTIONS "-Wno-error" APPEND)
|
||||||
32
esp/cpp/06_i2c-scanner/README.md
Normal file
32
esp/cpp/06_i2c-scanner/README.md
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
# 06_i2c-scanner
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
Simple I2C device scanner.
|
||||||
|
|
||||||
|
For this example I used this [SSD1306 OLED display](https://www.digikey.com/en/products/detail/winstar-display/WEA012864DWPP3N00003/20533255).
|
||||||
|
|
||||||
|
To build the example run the following commands.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
source ~/path/to/esp-idf/export.sh
|
||||||
|
|
||||||
|
mkdir build
|
||||||
|
cd build
|
||||||
|
cmake ..
|
||||||
|
make -j $(nproc)
|
||||||
|
|
||||||
|
# Flash to ESP32
|
||||||
|
make flash
|
||||||
|
|
||||||
|
# Open Serial Monitor, press CTRL+] to exit.
|
||||||
|
make monitor
|
||||||
|
```
|
||||||
|
|
||||||
|
Expected output in serial monitor at 115200 baud
|
||||||
|
|
||||||
|
```bash
|
||||||
|
Scanning I2C devices...
|
||||||
|
[0x3c]: Device found with clock rate 100000 and timeout 50
|
||||||
|
Done.
|
||||||
|
```
|
||||||
4
esp/cpp/06_i2c-scanner/main/CMakeLists.txt
Normal file
4
esp/cpp/06_i2c-scanner/main/CMakeLists.txt
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
idf_component_register(
|
||||||
|
SRCS "main.cpp"
|
||||||
|
INCLUDE_DIRS "."
|
||||||
|
)
|
||||||
17
esp/cpp/06_i2c-scanner/main/idf_component.yml
Normal file
17
esp/cpp/06_i2c-scanner/main/idf_component.yml
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
## IDF Component Manager Manifest File
|
||||||
|
dependencies:
|
||||||
|
## Required IDF version
|
||||||
|
idf:
|
||||||
|
version: '>=5.3.0'
|
||||||
|
# # Put list of dependencies here
|
||||||
|
# # For components maintained by Espressif:
|
||||||
|
# component: "~1.0.0"
|
||||||
|
# # For 3rd party components:
|
||||||
|
# username/component: ">=1.0.0,<2.0.0"
|
||||||
|
# username2/component2:
|
||||||
|
# version: "~1.0.0"
|
||||||
|
# # For transient dependencies `public` flag can be set.
|
||||||
|
# # `public` flag doesn't have an effect dependencies of the `main` component.
|
||||||
|
# # All dependencies of `main` are public by default.
|
||||||
|
# public: true
|
||||||
|
espressif/arduino-esp32: ^3.1.1
|
||||||
35
esp/cpp/06_i2c-scanner/main/main.cpp
Normal file
35
esp/cpp/06_i2c-scanner/main/main.cpp
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
#include "Arduino.h"
|
||||||
|
#include "Wire.h"
|
||||||
|
|
||||||
|
[[maybe_unused]] static const char *TAG = "i2c-scanner";
|
||||||
|
|
||||||
|
void i2c_scan()
|
||||||
|
{
|
||||||
|
uint8_t device_num = 0;
|
||||||
|
Serial.println("Scanning I2C devices...");
|
||||||
|
for (byte address = 1; address < 127; address++) {
|
||||||
|
Wire.beginTransmission(address);
|
||||||
|
byte error = Wire.endTransmission();
|
||||||
|
if (error == 0) {
|
||||||
|
Serial.printf(
|
||||||
|
"[0x%.2x]: Device found with clock rate %lu and timeout %u\n",
|
||||||
|
address,
|
||||||
|
Wire.getClock(), Wire.getTimeOut());
|
||||||
|
device_num++;
|
||||||
|
} else if (error == 4) {
|
||||||
|
Serial.printf("[0x%.2x]: Unknown error.\n", address);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Serial.println(device_num > 0 ? "Done.\n" : "No I2C devices found.\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
void setup()
|
||||||
|
{
|
||||||
|
Serial.begin(115200);
|
||||||
|
Wire.begin();
|
||||||
|
}
|
||||||
|
|
||||||
|
void loop()
|
||||||
|
{
|
||||||
|
i2c_scan();
|
||||||
|
}
|
||||||
BIN
esp/cpp/06_i2c-scanner/schematic.png
Normal file
BIN
esp/cpp/06_i2c-scanner/schematic.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 227 KiB |
2414
esp/cpp/06_i2c-scanner/sdkconfig
Normal file
2414
esp/cpp/06_i2c-scanner/sdkconfig
Normal file
File diff suppressed because it is too large
Load Diff
4
esp/cpp/07_lcd-panel-i2c/.gitignore
vendored
Normal file
4
esp/cpp/07_lcd-panel-i2c/.gitignore
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
build
|
||||||
|
managed_components
|
||||||
|
dependencies.lock
|
||||||
|
sdkconfig.old
|
||||||
18
esp/cpp/07_lcd-panel-i2c/CMakeLists.txt
Normal file
18
esp/cpp/07_lcd-panel-i2c/CMakeLists.txt
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# For more information about build system see
|
||||||
|
# https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/build-system.html
|
||||||
|
# The following five lines of boilerplate have to be in your project's
|
||||||
|
# CMakeLists in this exact order for cmake to work correctly
|
||||||
|
cmake_minimum_required(VERSION 3.26)
|
||||||
|
|
||||||
|
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
||||||
|
|
||||||
|
project(
|
||||||
|
#[[NAME]] lcd-panel-i2c
|
||||||
|
VERSION 0.1
|
||||||
|
DESCRIPTION "Using the SSD1306 LCD display with ESP-IDF and LVGL over I2C"
|
||||||
|
LANGUAGES CXX
|
||||||
|
)
|
||||||
|
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||||
|
# For writing pure cmake components, see the documentation
|
||||||
|
# https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-guides/build-system.html#writing-pure-cmake-components
|
||||||
|
idf_build_set_property(COMPILE_OPTIONS "-Wno-error" APPEND)
|
||||||
27
esp/cpp/07_lcd-panel-i2c/README.md
Normal file
27
esp/cpp/07_lcd-panel-i2c/README.md
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
# 07_lcd-panel-i2c
|
||||||
|
|
||||||
|
Using the ESP IDF for drawing to a LCD screen over I2C.
|
||||||
|
|
||||||
|
[ESP IDF - I2C](https://docs.espressif.com/projects/esp-idf/en/v5.3.2/esp32/api-reference/peripherals/i2c.html)
|
||||||
|
|
||||||
|
[ESP IDF - LCD](https://docs.espressif.com/projects/esp-idf/en/v5.3.2/esp32/api-reference/peripherals/lcd/index.html)
|
||||||
|
|
||||||
|
[ESP IDF - FreeRTOS](https://docs.espressif.com/projects/esp-idf/en/v5.3.2/esp32/api-reference/system/freertos.html)
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
For instructions on setting up the ESP-IDF see [04_-esp-idf-arduino](./../04_esp-idf-arduino)
|
||||||
|
|
||||||
|
To build this example run the following commands.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
source ~/path/to/esp-idf/export.sh
|
||||||
|
|
||||||
|
mkdir build
|
||||||
|
cd build
|
||||||
|
cmake ..
|
||||||
|
make -j $(nproc)
|
||||||
|
make flash
|
||||||
|
```
|
||||||
BIN
esp/cpp/07_lcd-panel-i2c/example.gif
Normal file
BIN
esp/cpp/07_lcd-panel-i2c/example.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 887 KiB |
7
esp/cpp/07_lcd-panel-i2c/main/CMakeLists.txt
Normal file
7
esp/cpp/07_lcd-panel-i2c/main/CMakeLists.txt
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
idf_component_register(
|
||||||
|
SRCS
|
||||||
|
main.cpp display.cpp panel_device.cpp scoped_lock.cpp
|
||||||
|
i2c.h time_keeper.h panel.h ssd1306.h
|
||||||
|
INCLUDE_DIRS .
|
||||||
|
REQUIRES driver
|
||||||
|
)
|
||||||
56
esp/cpp/07_lcd-panel-i2c/main/display.cpp
Normal file
56
esp/cpp/07_lcd-panel-i2c/main/display.cpp
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
/*#############################################################################
|
||||||
|
## Author: Shaun Reed ##
|
||||||
|
## Legal: All Content (c) 2025 Shaun Reed, all rights reserved ##
|
||||||
|
## ##
|
||||||
|
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com ##
|
||||||
|
##############################################################################
|
||||||
|
*/
|
||||||
|
#include <lv_init.h>
|
||||||
|
|
||||||
|
#include "display.h"
|
||||||
|
|
||||||
|
// Static TimeKeeper for managing ESP timers across all displays.
|
||||||
|
TimeKeeper Display::timers_;
|
||||||
|
|
||||||
|
Display::Display(IPanelDevice &device) :
|
||||||
|
panel_(device)
|
||||||
|
{
|
||||||
|
if (!lv_is_initialized()) {
|
||||||
|
ESP_LOGI(TAG, "Initialize LVGL");
|
||||||
|
lv_init();
|
||||||
|
}
|
||||||
|
|
||||||
|
ESP_LOGI(TAG, "Creating LVGL display");
|
||||||
|
lv_display_ = panel_.device_->create_display();
|
||||||
|
// associate the i2c panel handle to the display
|
||||||
|
lv_display_set_user_data(lv_display_, panel_.esp_panel_);
|
||||||
|
|
||||||
|
panel_.register_display_callbacks(lv_display_);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Display::set_text(const char *text,
|
||||||
|
const char *name,
|
||||||
|
lv_label_long_mode_t long_mode,
|
||||||
|
lv_align_t align)
|
||||||
|
{
|
||||||
|
// Lock the mutex due to the LVGL APIs are not thread-safe.
|
||||||
|
ScopedLock lock;
|
||||||
|
|
||||||
|
ESP_LOGI(TAG, "Display LVGL Scroll Text");
|
||||||
|
lv_obj_t *scr = lv_display_get_screen_active(lv_display_);
|
||||||
|
|
||||||
|
// Create the label if it's `name` doesn't already exist in the map keys.
|
||||||
|
if (!lv_objects_.count(name)) {
|
||||||
|
lv_objects_[name] = lv_label_create(scr);
|
||||||
|
}
|
||||||
|
auto obj = lv_objects_[name];
|
||||||
|
|
||||||
|
// Set text and long mode.
|
||||||
|
lv_label_set_long_mode(obj, long_mode);
|
||||||
|
lv_label_set_text(obj, text);
|
||||||
|
|
||||||
|
// Set the size of the screen.
|
||||||
|
// If you use rotation 90 or 270 use lv_display_get_vertical_resolution.
|
||||||
|
lv_obj_set_width(obj, lv_display_get_horizontal_resolution(lv_display_));
|
||||||
|
lv_obj_align(obj, align, 0, 0);
|
||||||
|
}
|
||||||
114
esp/cpp/07_lcd-panel-i2c/main/display.h
Normal file
114
esp/cpp/07_lcd-panel-i2c/main/display.h
Normal file
@@ -0,0 +1,114 @@
|
|||||||
|
/*#############################################################################
|
||||||
|
## Author: Shaun Reed ##
|
||||||
|
## Legal: All Content (c) 2025 Shaun Reed, all rights reserved ##
|
||||||
|
## ##
|
||||||
|
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com ##
|
||||||
|
##############################################################################
|
||||||
|
*/
|
||||||
|
#ifndef DISPLAY_H
|
||||||
|
#define DISPLAY_H
|
||||||
|
|
||||||
|
#include <widgets/label/lv_label.h>
|
||||||
|
|
||||||
|
#include <unordered_map>
|
||||||
|
|
||||||
|
#include "time_keeper.h"
|
||||||
|
#include "panel.h"
|
||||||
|
#include "scoped_lock.h"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Encapsulates lv_display handle and related LVGL operations.
|
||||||
|
* Contains helper methods that wrap basic LVGL operations such as drawing text.
|
||||||
|
* The underlying lv_display can be obtained for manual LVGL operations.
|
||||||
|
* @sa ScopedLock
|
||||||
|
* @sa Display::get()
|
||||||
|
*/
|
||||||
|
class Display {
|
||||||
|
public:
|
||||||
|
/**
|
||||||
|
* Construct a new Display using an object that implements IPanelDevice.
|
||||||
|
*
|
||||||
|
* @param device An object that implements the IPanelDevice interface.
|
||||||
|
*/
|
||||||
|
explicit Display(IPanelDevice &device);
|
||||||
|
|
||||||
|
~Display() = default;
|
||||||
|
|
||||||
|
Display(const Display &) = delete;
|
||||||
|
|
||||||
|
Display(Display &) = delete;
|
||||||
|
|
||||||
|
Display &operator=(Display &) = delete;
|
||||||
|
|
||||||
|
using lv_display_handle_t = lv_display_t *;
|
||||||
|
|
||||||
|
//
|
||||||
|
// GETTERS
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Getter for accessing LVGL display handle.
|
||||||
|
*
|
||||||
|
* @sa ScopedLock for calling custom LVGL API's not implemented by Display.
|
||||||
|
*/
|
||||||
|
[[nodiscard]] inline lv_display_handle_t get() const { return lv_display_; }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Getter for accessing LVGL display handle.
|
||||||
|
*
|
||||||
|
* @sa ScopedLock for calling custom LVGL API's not implemented by Display.
|
||||||
|
*/
|
||||||
|
[[nodiscard]] inline lv_display_handle_t get() { return lv_display_; }
|
||||||
|
|
||||||
|
/// Dereference operator for accessing LVGL display handle.
|
||||||
|
[[nodiscard]] inline lv_display_handle_t operator*() const { return get(); }
|
||||||
|
|
||||||
|
/// Dereference operator for accessing LVGL display handle.
|
||||||
|
[[nodiscard]] inline lv_display_handle_t operator*() { return get(); }
|
||||||
|
|
||||||
|
//
|
||||||
|
// LVGL OPERATIONS
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a LVGL label with some given text on the current display.
|
||||||
|
* The name of the object can be reused to change text on this label later.
|
||||||
|
*
|
||||||
|
* @param text Text to write to the display.
|
||||||
|
* @param name Name for the LVGL label object associated with this text.
|
||||||
|
* @param long_mode LVGL long mode for text wider than the current display.
|
||||||
|
* @param align LVGL alignment to use for placing the label on the display.
|
||||||
|
*/
|
||||||
|
void set_text(const char *text,
|
||||||
|
const char *name,
|
||||||
|
lv_label_long_mode_t long_mode = LV_LABEL_LONG_SCROLL_CIRCULAR,
|
||||||
|
lv_align_t align = LV_ALIGN_TOP_MID);
|
||||||
|
|
||||||
|
//
|
||||||
|
// PUBLIC STATIC MEMBERS
|
||||||
|
|
||||||
|
/// Public static TimeKeeper for managing ESP timers across all displays.
|
||||||
|
static TimeKeeper timers_;
|
||||||
|
|
||||||
|
private:
|
||||||
|
|
||||||
|
//
|
||||||
|
// PRIVATE MEMBERS
|
||||||
|
|
||||||
|
/// Panel associated with this Display.
|
||||||
|
Panel panel_;
|
||||||
|
|
||||||
|
/// LVGL display handle.
|
||||||
|
lv_display_handle_t lv_display_;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* LVGL object handles stored in the LVGL screen associated with this Display.
|
||||||
|
*
|
||||||
|
* @sa Display::set_text
|
||||||
|
* @sa lv_display_get_screen_active
|
||||||
|
*/
|
||||||
|
std::unordered_map<const char *, lv_obj_t *> lv_objects_;
|
||||||
|
|
||||||
|
/// Tag used for ESP logging.
|
||||||
|
constexpr static const char *TAG = "Display";
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // DISPLAY_H
|
||||||
91
esp/cpp/07_lcd-panel-i2c/main/i2c.h
Normal file
91
esp/cpp/07_lcd-panel-i2c/main/i2c.h
Normal file
@@ -0,0 +1,91 @@
|
|||||||
|
/*#############################################################################
|
||||||
|
## Author: Shaun Reed ##
|
||||||
|
## Legal: All Content (c) 2025 Shaun Reed, all rights reserved ##
|
||||||
|
## ##
|
||||||
|
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com ##
|
||||||
|
##############################################################################
|
||||||
|
*/
|
||||||
|
#ifndef I2C_H
|
||||||
|
#define I2C_H
|
||||||
|
|
||||||
|
#define I2C_BUS_PORT 0
|
||||||
|
|
||||||
|
#include <driver/i2c_master.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Encapsulates ESP I2C creation and usage.
|
||||||
|
*/
|
||||||
|
struct I2C {
|
||||||
|
/**
|
||||||
|
* Construct and initialize an ESP I2C master bus.
|
||||||
|
* An I2C constructor may only be called one time in any application.
|
||||||
|
*
|
||||||
|
* @param sda GPIO pin number for SDA
|
||||||
|
* @param scl GPIO pin number for SCL
|
||||||
|
* @param rst GPIO pin number for RST
|
||||||
|
*/
|
||||||
|
I2C(gpio_num_t sda, gpio_num_t scl, int rst = -1) :
|
||||||
|
I2C((i2c_master_bus_config_t) {
|
||||||
|
.i2c_port = I2C_BUS_PORT,
|
||||||
|
.sda_io_num = sda,
|
||||||
|
.scl_io_num = scl,
|
||||||
|
.clk_source = I2C_CLK_SRC_DEFAULT,
|
||||||
|
.glitch_ignore_cnt = 7,
|
||||||
|
.flags {
|
||||||
|
.enable_internal_pullup = true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
rst
|
||||||
|
) { }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Construct an ESP I2C master bus given a specific ESP I2C configuration.
|
||||||
|
* An I2C constructor may only be called one time in any application.
|
||||||
|
*
|
||||||
|
* @param config ESP I2C master bus configuration.
|
||||||
|
* @param rst GPIO pin number for RST
|
||||||
|
*/
|
||||||
|
explicit I2C(i2c_master_bus_config_t config, int rst = -1) :
|
||||||
|
esp_bus_config_(config),
|
||||||
|
rst_num_(rst)
|
||||||
|
{
|
||||||
|
i2c_master_bus_handle_t i2c;
|
||||||
|
ESP_LOGI(TAG, "Initializing new master I2C bus");
|
||||||
|
ESP_ERROR_CHECK(i2c_new_master_bus(&esp_bus_config_, &i2c));
|
||||||
|
}
|
||||||
|
|
||||||
|
~I2C() = default;
|
||||||
|
|
||||||
|
//
|
||||||
|
// GETTERS
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ESP I2C master bus handle getter.
|
||||||
|
* This will fail if an I2C instance was never constructed.
|
||||||
|
*/
|
||||||
|
static i2c_master_bus_handle_t get()
|
||||||
|
{
|
||||||
|
i2c_master_bus_handle_t i2c = nullptr;
|
||||||
|
ESP_ERROR_CHECK(i2c_master_get_bus_handle(0, &i2c));
|
||||||
|
return i2c;
|
||||||
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// PUBLIC MEMBERS
|
||||||
|
|
||||||
|
/// ESP I2C master bus configuration used during initialization.
|
||||||
|
i2c_master_bus_config_t esp_bus_config_;
|
||||||
|
|
||||||
|
/// RST GPIO pin number.
|
||||||
|
int rst_num_;
|
||||||
|
|
||||||
|
private:
|
||||||
|
|
||||||
|
//
|
||||||
|
// PRIVATE MEMBERS
|
||||||
|
|
||||||
|
/// Tag used for ESP logging.
|
||||||
|
constexpr static const char *TAG = "I2C";
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif //I2C_H
|
||||||
5
esp/cpp/07_lcd-panel-i2c/main/idf_component.yml
Normal file
5
esp/cpp/07_lcd-panel-i2c/main/idf_component.yml
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
## IDF Component Manager Manifest File
|
||||||
|
dependencies:
|
||||||
|
idf: '>=5.3.0'
|
||||||
|
lvgl/lvgl: "9.2.0"
|
||||||
|
esp_lcd_sh1107: "^1"
|
||||||
39
esp/cpp/07_lcd-panel-i2c/main/main.cpp
Normal file
39
esp/cpp/07_lcd-panel-i2c/main/main.cpp
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
/*#############################################################################
|
||||||
|
## Author: Shaun Reed ##
|
||||||
|
## Legal: All Content (c) 2025 Shaun Reed, all rights reserved ##
|
||||||
|
## ##
|
||||||
|
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com ##
|
||||||
|
##############################################################################
|
||||||
|
*/
|
||||||
|
#include "display.h"
|
||||||
|
#include "ssd1306.h"
|
||||||
|
|
||||||
|
// Pin may vary based on your schematic.
|
||||||
|
#define PIN_SDA GPIO_NUM_21
|
||||||
|
#define PIN_SCL GPIO_NUM_22
|
||||||
|
#define PIN_RST (-1)
|
||||||
|
|
||||||
|
I2C i2c(PIN_SDA, PIN_SCL, PIN_RST);
|
||||||
|
|
||||||
|
extern "C" void app_main(void)
|
||||||
|
{
|
||||||
|
SSD1306 ssd1306(i2c);
|
||||||
|
Display d(ssd1306);
|
||||||
|
|
||||||
|
d.set_text("Test test 12345678910",
|
||||||
|
"test-text1",
|
||||||
|
LV_LABEL_LONG_SCROLL,
|
||||||
|
LV_ALIGN_CENTER);
|
||||||
|
|
||||||
|
d.set_text("Test test changing text",
|
||||||
|
"test-text1",
|
||||||
|
LV_LABEL_LONG_SCROLL,
|
||||||
|
LV_ALIGN_CENTER);
|
||||||
|
|
||||||
|
d.set_text("Hello hello hello hello hello hello hello hello!", "test-text2");
|
||||||
|
|
||||||
|
d.set_text("A random sentence with no meaning at all.",
|
||||||
|
"test-text3",
|
||||||
|
LV_LABEL_LONG_CLIP,
|
||||||
|
LV_ALIGN_BOTTOM_MID);
|
||||||
|
}
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user