Compare commits
34 Commits
38f7aa8a4d
...
lcd
| Author | SHA1 | Date | |
|---|---|---|---|
| a3d6a85516 | |||
| a91352ffcd | |||
| fc0fd98426 | |||
| 1a7da67bdb | |||
| 00ea5dae20 | |||
| 63899a606a | |||
| 25b4564a8b | |||
| e2bb406139 | |||
| 96b6a8bec9 | |||
| 509b57fedb | |||
| 75b51f0c7c | |||
| 74404b1a44 | |||
| 9140ba5fb4 | |||
| c9ec16d70c | |||
| 5c61fbd378 | |||
| 8636de8f2f | |||
| 6493988324 | |||
| 64d817e362 | |||
| b3d830cdeb | |||
| 670a523a16 | |||
| cc5bffd1e7 | |||
| 03784ac097 | |||
| 9e912048ab | |||
| 0743fc4a5e | |||
| 046dfbb6e6 | |||
| ef7a027cf0 | |||
| 2dd099f26e | |||
| 8aaed133e8 | |||
| 58a83590ca | |||
| dd5335815c | |||
| e9d5ef46d1 | |||
| 356d8ccd9a | |||
| 4063921340 | |||
| 043fa2fabb |
@@ -1,6 +1,6 @@
|
||||
################################################################################
|
||||
## Author: Shaun Reed ##
|
||||
## Legal: All Content (c) 2025 Shaun Reed, all rights reserved ##
|
||||
## Legal: All Content (c) 2022 Shaun Reed, all rights reserved ##
|
||||
## About: A root project for practicing C++ ##
|
||||
## This project can be built to debug and run all nested projects ##
|
||||
## Or, any subdirectory with a project() statement can be selected ##
|
||||
@@ -16,32 +16,10 @@ project(
|
||||
DESCRIPTION "A root project for several small cpp practice projects"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
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(catch2)
|
||||
add_subdirectory(cmake-example)
|
||||
@@ -50,15 +28,4 @@ add_subdirectory(datastructs)
|
||||
add_subdirectory(graphics)
|
||||
add_subdirectory(multithreading)
|
||||
add_subdirectory(patterns)
|
||||
|
||||
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()
|
||||
add_subdirectory(qt)
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for practicing various algorithms in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for practicing algorithms using graphs in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@ project(
|
||||
DESCRIPTION "Practice implementing and using object graphs in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
algo-graphs-object graph.cpp
|
||||
|
||||
@@ -14,7 +14,6 @@ project(
|
||||
DESCRIPTION "Practice implementing and using simple graphs in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
algo-graphs-simple graph.cpp
|
||||
|
||||
@@ -8,8 +8,9 @@
|
||||
################################################################################
|
||||
*/
|
||||
|
||||
#include "lib-graph.hpp"
|
||||
#include <algorithm>
|
||||
#include "lib-graph.hpp"
|
||||
|
||||
|
||||
void Graph::BFS(int startNode)
|
||||
{
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
#include <unordered_map>
|
||||
#include <unordered_set>
|
||||
#include <vector>
|
||||
#include <cstdint>
|
||||
|
||||
|
||||
class Graph {
|
||||
|
||||
@@ -14,6 +14,5 @@ project(
|
||||
DESCRIPTION "Practice implementing and using templated graphs in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(algo-graphs-templated graph.cpp)
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
#include <unordered_set>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
#include <cstdint>
|
||||
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
@@ -14,7 +14,6 @@ project(
|
||||
DESCRIPTION "Practice implementing and using weighted graphs in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
algo-graphs-weighted graph.cpp
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
#include <unordered_set>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
#include <cstdint>
|
||||
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for practicing various sorting algorithms in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for practicing insertion sort in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
algo-sort-insertion insertion-sort.cpp
|
||||
|
||||
@@ -14,8 +14,6 @@ project (
|
||||
DESCRIPTION "A project for practicing merge sort in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
algo-sort-merge merge-sort.cpp
|
||||
lib-merge.cpp lib-merge.h
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
#include <algorithm>
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
#include <cstdint>
|
||||
|
||||
void MergeSort(std::vector<int> &array, size_t lhs, size_t rhs)
|
||||
{
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for practicing quick sort in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
algo-sort-quick quick-sort.cpp
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for practicing radix sort in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
algo-sort-radix radix-sort.cpp
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for practicing selection sort in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
algo-sort-select select-sort.cpp
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for practicing algorithms using trees in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for testing BST algorithms"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
algo-trees-bst driver.cpp
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for testing red-black tree algorithms"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
algo-trees-redblack driver.cpp
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
#define REDBLACK_H
|
||||
|
||||
#include <iostream>
|
||||
#include <cstdint>
|
||||
|
||||
enum Color {Black, Red};
|
||||
|
||||
|
||||
@@ -14,22 +14,18 @@ project(
|
||||
DESCRIPTION "Practice project for learning Catch2"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_compile_options(-Wall)
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
|
||||
|
||||
Include(FetchContent)
|
||||
FetchContent_Declare(
|
||||
Catch2
|
||||
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
|
||||
GIT_TAG v3.4.0
|
||||
GIT_TAG v3.0.1
|
||||
)
|
||||
FetchContent_MakeAvailable(Catch2)
|
||||
|
||||
add_library(klips SHARED src/klips.cpp)
|
||||
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)
|
||||
add_subdirectory(src)
|
||||
add_subdirectory(test)
|
||||
|
||||
22
cpp/catch2/src/CMakeLists.txt
Normal file
22
cpp/catch2/src/CMakeLists.txt
Normal file
@@ -0,0 +1,22 @@
|
||||
################################################################################
|
||||
## 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)
|
||||
22
cpp/catch2/test/CMakeLists.txt
Normal file
22
cpp/catch2/test/CMakeLists.txt
Normal file
@@ -0,0 +1,22 @@
|
||||
################################################################################
|
||||
## 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)
|
||||
@@ -2,8 +2,7 @@
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include "catch2/catch_all.hpp"
|
||||
|
||||
#include "../bin/catch.hpp"
|
||||
#include "klips.hpp"
|
||||
#include "type_name.hpp"
|
||||
|
||||
@@ -140,7 +139,7 @@ template <> template <bool must_find> void test_config_get<std::string>::run() {
|
||||
TEMPLATE_PRODUCT_TEST_CASE("Test", "[test]", test_config_get,
|
||||
(int, std::string)) {
|
||||
TT();
|
||||
// TestType t;
|
||||
TestType t;
|
||||
test_config_get<int> s;
|
||||
s.template run<true>();
|
||||
// TestType t;
|
||||
@@ -22,7 +22,6 @@ project (
|
||||
DESCRIPTION "A basic CMake template for C++ projects"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
# Include any directories the compiler may need
|
||||
include_directories(./include)
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for practicing cryptography in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@ project(
|
||||
DESCRIPTION "Practice implementing columnar transposition in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
crypto-columnar-transposition driver.cpp
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for practicing various data structures in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for testing a basic implementation of a BST"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
data-bst driver.cpp
|
||||
|
||||
@@ -10,11 +10,10 @@
|
||||
|
||||
#include "bst.h"
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
/********************************************************************************
|
||||
* Constructors, Destructors, Operators
|
||||
*********************************************************************************/
|
||||
* Constructors, Destructors, Operators
|
||||
*********************************************************************************/
|
||||
|
||||
/** Copy Assignment Operator
|
||||
* @brief Empty the calling object's root BinaryNode, and copy the rhs data
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "Project for testing circular doubly linked list implementation"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
data-circular-doubly-linked-list driver.cpp
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
|
||||
#include "circledoublelist.h"
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
/******************************************************************************
|
||||
* Constructors, Destructors, Operators
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "Project for testing circular singly linked list implementation"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
data-circular-singly-linked-list driver.cpp
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
|
||||
#include "circlesinglelist.h"
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
/******************************************************************************
|
||||
* Constructors, Destructors, Operators
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for testing a doubly linked list implementation"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
data-doubly-linked-list driver.cpp
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
|
||||
#include "doublelist.h"
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
/******************************************************************************
|
||||
* Constructors, Destructors, Operators
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for testing a max heap implementation"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
data-max-heap driver.cpp
|
||||
|
||||
@@ -10,11 +10,10 @@
|
||||
|
||||
#include "maxheap.h"
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
/********************************************************************************
|
||||
* Constructors, Destructors, Operators
|
||||
*********************************************************************************/
|
||||
* Constructors, Destructors, Operators
|
||||
*********************************************************************************/
|
||||
|
||||
/** default constructor
|
||||
* Constructs a heap with the given default values
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "Project for testing queue implementation"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
data-queue driver.cpp
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
|
||||
#include "queuelist.h"
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
/******************************************************************************
|
||||
* Constructors, Destructors, Operators
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for testing a singly linked list implementation"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
data-singly-linked-list driver.cpp
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
|
||||
#include "singlelist.h"
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
/******************************************************************************
|
||||
* Constructors, Destructors, Operators
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for testing a Stack implementation"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
data-stack driver.cpp
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
|
||||
#include "stacklist.h"
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
/******************************************************************************
|
||||
* Constructors, Destructors, Operators
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for practicing templated data structures in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_subdirectory(doublelist)
|
||||
add_subdirectory(queuelist)
|
||||
|
||||
@@ -14,6 +14,5 @@ project (
|
||||
DESCRIPTION "A project for practicing templated doubly linked list implementations"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(data-templates-doubly-linked-list driver.cpp)
|
||||
|
||||
@@ -14,6 +14,5 @@ project (
|
||||
DESCRIPTION "A project for practicing templated queue implementations"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(data-templates-queue driver.cpp)
|
||||
|
||||
@@ -14,6 +14,5 @@ project (
|
||||
DESCRIPTION "A project for practicing templated Stack implementations"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(data-templates-stack driver.cpp)
|
||||
|
||||
@@ -14,6 +14,5 @@ project (
|
||||
DESCRIPTION "A project for practicing templated Vector implementations"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(data-templates-vectors driver.cpp)
|
||||
|
||||
@@ -14,7 +14,6 @@ project (
|
||||
DESCRIPTION "A project for testing a basic Vector implementation"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
data-vectors driver.cpp
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
|
||||
#include "vector.h"
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
/******************************************************************************
|
||||
* Constructors, Destructors, Operators
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
################################################################################
|
||||
## Author: Shaun Reed ##
|
||||
## Legal: All Content (c) 2025 Shaun Reed, all rights reserved ##
|
||||
## Legal: All Content (c) 2021 Shaun Reed, all rights reserved ##
|
||||
## About: A root project for practicing C++ ##
|
||||
## This project can be built to debug and run all nested projects ##
|
||||
## Or, any subdirectory with a project() statement can be selected ##
|
||||
@@ -16,7 +16,6 @@ project(
|
||||
DESCRIPTION "A root project for practicing graphics programming in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
################################################################################
|
||||
## Author: Shaun Reed ##
|
||||
## Legal: All Content (c) 2025 Shaun Reed, all rights reserved ##
|
||||
## Legal: All Content (c) 2021 Shaun Reed, all rights reserved ##
|
||||
## ##
|
||||
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
|
||||
################################################################################
|
||||
@@ -8,46 +8,40 @@
|
||||
# Define CMake version
|
||||
cmake_minimum_required(VERSION 3.15)
|
||||
|
||||
include(FetchContent)
|
||||
project(
|
||||
#[[NAME]] OpenGL-Cmake
|
||||
DESCRIPTION "Example project for building OpenGL projects with CMake"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_library(graphics-lib-opengl src/lib-opengl-test.cpp)
|
||||
target_include_directories(graphics-lib-opengl PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
|
||||
|
||||
# Find OpenGL package
|
||||
find_package(OpenGL)
|
||||
if (NOT OPENGL_FOUND)
|
||||
find_package(OpenGL REQUIRED)
|
||||
if (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(
|
||||
"[Klips] Error: CMake was unable to find OpenGL.\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"
|
||||
"Error: CMake was unable to find the OpenGL package\n"
|
||||
"Please install OpenGL and try again\n"
|
||||
)
|
||||
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_package(GLUT QUIET)
|
||||
if(NOT GLUT_FOUND)
|
||||
# Find GLUT package
|
||||
find_package(GLUT REQUIRED)
|
||||
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(
|
||||
FATAL_ERROR
|
||||
"[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"
|
||||
"Error: CMake was unable to find the GLUT package\n"
|
||||
"Please install GLUT (freeglut3-dev) and try again\n"
|
||||
)
|
||||
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_executable(graphics-cmake-opengl apps/test-gl.cpp)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
################################################################################
|
||||
## Author: Shaun Reed ##
|
||||
## Legal: All Content (c) 2025 Shaun Reed, all rights reserved ##
|
||||
## Legal: All Content (c) 2021 Shaun Reed, all rights reserved ##
|
||||
## ##
|
||||
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
|
||||
################################################################################
|
||||
@@ -13,7 +13,6 @@ project(
|
||||
DESCRIPTION "Example project for building SDL projects with CMake"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
# Add Library
|
||||
add_library(
|
||||
@@ -28,30 +27,31 @@ target_include_directories( # When calling library, include a directo
|
||||
)
|
||||
|
||||
# Search for SDL2 package
|
||||
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"
|
||||
find_package(SDL2 REQUIRED sdl2)
|
||||
|
||||
# If SDL2 was found successfully, link to lib-sdl-test
|
||||
if (SDL2_FOUND)
|
||||
# Any target that links with this library will also link to SDL2
|
||||
# + Because we choose PUBLIC visibility
|
||||
target_include_directories(graphics-lib-sdl PUBLIC ${SDL2_INCLUDE_DIRS})
|
||||
target_link_libraries(graphics-lib-sdl PUBLIC "${SDL2_LIBRARIES}")
|
||||
|
||||
# Creating executable
|
||||
add_executable(
|
||||
graphics-cmake-sdl # Exe name
|
||||
apps/sdl-test.cpp # Exe Source(s)
|
||||
)
|
||||
|
||||
# Linking the exe to library
|
||||
target_link_libraries(
|
||||
graphics-cmake-sdl # Executable to link
|
||||
PRIVATE # Visibility
|
||||
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()
|
||||
message(STATUS "[Klips] Found SDL2: ${SDL2_INCLUDE_DIRS}")
|
||||
|
||||
# Any target that links with this library will also link to SDL2
|
||||
# + Because we choose PUBLIC visibility
|
||||
target_include_directories(graphics-lib-sdl PUBLIC ${SDL2_INCLUDE_DIRS})
|
||||
target_link_libraries(graphics-lib-sdl PUBLIC "${SDL2_LIBRARIES}")
|
||||
|
||||
# Creating executable
|
||||
add_executable(
|
||||
graphics-cmake-sdl # Exe name
|
||||
apps/sdl-test.cpp # Exe Source(s)
|
||||
)
|
||||
|
||||
# Linking the exe to library
|
||||
target_link_libraries(
|
||||
graphics-cmake-sdl # Executable to link
|
||||
PRIVATE # Visibility
|
||||
graphics-lib-sdl # Library to link
|
||||
)
|
||||
@@ -14,7 +14,6 @@ project(
|
||||
DESCRIPTION "Practice with multithreaded programming in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
add_compile_options("-Wall")
|
||||
|
||||
@@ -18,7 +18,6 @@ project(
|
||||
DESCRIPTION "Example of condition_variables in multithreaded C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
multithread-conditions driver.cpp
|
||||
|
||||
@@ -18,7 +18,6 @@ project(
|
||||
DESCRIPTION "Example and solution for deadlocks in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
multithread-deadlock driver.cpp
|
||||
|
||||
@@ -18,7 +18,6 @@ project(
|
||||
DESCRIPTION "Example and solution for livelocks in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
multithread-livelock driver.cpp
|
||||
|
||||
@@ -14,7 +14,6 @@ project(
|
||||
DESCRIPTION "Example and solution for race conditions"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
multithread-race-condition driver.cpp
|
||||
|
||||
@@ -14,7 +14,6 @@ project(
|
||||
DESCRIPTION "A project for practicing various design patterns in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
|
||||
|
||||
@@ -13,7 +13,6 @@ project(
|
||||
DESCRIPTION "An example of the abstract factory design pattern in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
add_compile_options("-Wall")
|
||||
|
||||
add_executable(
|
||||
|
||||
@@ -14,7 +14,6 @@ project(
|
||||
DESCRIPTION "An example of the adapter design pattern in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
add_compile_options("-Wall")
|
||||
|
||||
add_executable(
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
#ifndef ADAPTER_HPP
|
||||
#define ADAPTER_HPP
|
||||
|
||||
#include <ctime>
|
||||
#include <random>
|
||||
|
||||
// Target implementation to adapt to a new interface
|
||||
|
||||
@@ -14,7 +14,6 @@ project(
|
||||
DESCRIPTION "An example of the bridge design pattern in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
add_compile_options("-Wall")
|
||||
|
||||
add_executable(
|
||||
|
||||
@@ -14,7 +14,6 @@ project(
|
||||
DESCRIPTION "An example of the factory design pattern in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
add_compile_options("-Wall")
|
||||
|
||||
add_executable(
|
||||
|
||||
@@ -14,7 +14,6 @@ project(
|
||||
DESCRIPTION "An example of the state design pattern in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
add_compile_options("-Wall")
|
||||
|
||||
add_executable(
|
||||
|
||||
@@ -14,7 +14,6 @@ project(
|
||||
DESCRIPTION "An example of the prototype design pattern in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
add_compile_options("-Wall")
|
||||
|
||||
add_executable(
|
||||
|
||||
@@ -14,7 +14,6 @@ project(
|
||||
DESCRIPTION "An example of the singleton design pattern in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_executable(
|
||||
patterns-singleton main.cpp
|
||||
|
||||
@@ -14,7 +14,6 @@ project(
|
||||
DESCRIPTION "An example of the state design pattern in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
add_compile_options("-Wall")
|
||||
|
||||
add_executable(
|
||||
|
||||
@@ -14,7 +14,6 @@ project(
|
||||
DESCRIPTION "An example of the visitor design pattern in C++"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
add_compile_options("-Wall")
|
||||
|
||||
add_executable(
|
||||
|
||||
@@ -14,7 +14,6 @@ project(
|
||||
DESCRIPTION "A root project for several small Qt6 practice projects"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
add_compile_options("-Wall")
|
||||
|
||||
@@ -14,9 +14,6 @@ project(
|
||||
DESCRIPTION "Example of a widget plugin collection for Qt Designer"
|
||||
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)
|
||||
|
||||
@@ -54,56 +51,43 @@ endif()
|
||||
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}")
|
||||
|
||||
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()
|
||||
find_package(Qt6 REQUIRED COMPONENTS UiPlugin Core Gui Widgets)
|
||||
|
||||
# Creating a library with two plugins for the collection.
|
||||
set(WIDGET_PLUGIN_LIBRARY widget-plugin-library_${PROJECT_NAME_LOWER})
|
||||
qt_add_library(${WIDGET_PLUGIN_LIBRARY}
|
||||
qt_add_library(widget-plugin-library
|
||||
textview.cpp textview.h
|
||||
widgetplugin.cpp widgetplugin.h
|
||||
)
|
||||
target_sources(${WIDGET_PLUGIN_LIBRARY} PRIVATE
|
||||
target_sources(widget-plugin-library PRIVATE
|
||||
textview.cpp textview.h
|
||||
treeview.cpp treeview.h
|
||||
widgetplugin.cpp widgetplugin.h
|
||||
)
|
||||
set_target_properties(${WIDGET_PLUGIN_LIBRARY} PROPERTIES
|
||||
set_target_properties(widget-plugin-library PROPERTIES
|
||||
WIN32_EXECUTABLE 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
|
||||
)
|
||||
|
||||
install(TARGETS ${WIDGET_PLUGIN_LIBRARY}
|
||||
install(TARGETS widget-plugin-library
|
||||
RUNTIME DESTINATION "${QT_PLUGIN_LIBRARY_DIR}"
|
||||
BUNDLE DESTINATION "${QT_PLUGIN_LIBRARY_DIR}"
|
||||
LIBRARY DESTINATION "${QT_PLUGIN_LIBRARY_DIR}"
|
||||
)
|
||||
|
||||
generate_export_header(${WIDGET_PLUGIN_LIBRARY}
|
||||
BASE_NAME widget_plugin_library
|
||||
EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/widget-plugin-library_export.h"
|
||||
)
|
||||
generate_export_header(widget-plugin-library)
|
||||
|
||||
# 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
|
||||
)
|
||||
target_link_libraries(${WIDGET_PLUGIN_COLLECTION}
|
||||
Qt6::Widgets Qt6::UiPlugin ${WIDGET_PLUGIN_LIBRARY}
|
||||
target_link_libraries(widget-plugin-collection
|
||||
Qt6::Widgets Qt6::UiPlugin widget-plugin-library
|
||||
)
|
||||
install(TARGETS ${WIDGET_PLUGIN_COLLECTION}
|
||||
install(TARGETS widget-plugin-collection
|
||||
RUNTIME DESTINATION "${QT_PLUGIN_INSTALL_DIR}"
|
||||
BUNDLE DESTINATION "${QT_PLUGIN_INSTALL_DIR}"
|
||||
LIBRARY DESTINATION "${QT_PLUGIN_INSTALL_DIR}"
|
||||
@@ -117,11 +101,10 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/app-dir.h.in"
|
||||
@ONLY
|
||||
)
|
||||
|
||||
set(WIDGET_APP widget-app_${PROJECT_NAME_LOWER})
|
||||
qt_add_executable(${WIDGET_APP}
|
||||
qt_add_executable(widget-app
|
||||
widgetapp.cpp widgetapp.h widgetapp.ui
|
||||
main.cpp
|
||||
)
|
||||
target_link_libraries(${WIDGET_APP}
|
||||
PRIVATE Qt::Widgets ${WIDGET_PLUGIN_LIBRARY}
|
||||
target_link_libraries(widget-app
|
||||
PRIVATE Qt::Widgets widget-plugin-library
|
||||
)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#ifndef APPDIR_H_IN
|
||||
#define APPDIR_H_IN
|
||||
|
||||
#define APP_DIR "/media/shaun/Storage/Code/klips/cpp/qt/designer-plugin-collection"
|
||||
#define APP_DIR "/home/kapper/Code/klips/cpp/qt/designer-plugin-collection"
|
||||
|
||||
#endif // APPDIR_H_IN
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
################################################################################
|
||||
## Author: Shaun Reed ##
|
||||
## Legal: All Content (c) 2025 Shaun Reed, all rights reserved ##
|
||||
## Legal: All Content (c) 2022 Shaun Reed, all rights reserved ##
|
||||
## About: Example of making widget plugins for Qt Designer ##
|
||||
## ##
|
||||
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
|
||||
@@ -14,9 +14,6 @@ project(
|
||||
DESCRIPTION "Example of a widget plugin for Qt Designer"
|
||||
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)
|
||||
|
||||
@@ -45,44 +42,35 @@ endif()
|
||||
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}")
|
||||
|
||||
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()
|
||||
find_package(Qt6 REQUIRED COMPONENTS UiPlugin Core Gui Widgets)
|
||||
|
||||
# Creating the plugin
|
||||
set(WIDGET_PLUGIN widget-plugin_${PROJECT_NAME_LOWER})
|
||||
qt_add_library(${WIDGET_PLUGIN})
|
||||
target_sources(${WIDGET_PLUGIN} PRIVATE
|
||||
|
||||
qt_add_library(widget-plugin)
|
||||
target_sources(widget-plugin PRIVATE
|
||||
text-view.cpp text-view.h
|
||||
widget-plugin.cpp widget-plugin.h
|
||||
)
|
||||
set_target_properties(${WIDGET_PLUGIN} PROPERTIES
|
||||
set_target_properties(widget-plugin PROPERTIES
|
||||
WIN32_EXECUTABLE TRUE
|
||||
MACOSX_BUNDLE TRUE
|
||||
)
|
||||
target_link_libraries(${WIDGET_PLUGIN} PUBLIC
|
||||
target_link_libraries(widget-plugin PUBLIC
|
||||
Qt::UiPlugin Qt::Core Qt::Gui Qt::Widgets
|
||||
)
|
||||
|
||||
install(TARGETS ${WIDGET_PLUGIN}
|
||||
install(TARGETS widget-plugin
|
||||
RUNTIME DESTINATION "${QT_PLUGIN_INSTALL_DIR}"
|
||||
BUNDLE DESTINATION "${QT_PLUGIN_INSTALL_DIR}"
|
||||
LIBRARY DESTINATION "${QT_PLUGIN_INSTALL_DIR}"
|
||||
)
|
||||
|
||||
# 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
|
||||
main.cpp
|
||||
)
|
||||
target_link_libraries(${WIDGET_APP} PRIVATE
|
||||
Qt::Widgets ${WIDGET_PLUGIN}
|
||||
target_link_libraries(widget-app PRIVATE
|
||||
Qt::Widgets widget-plugin
|
||||
)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
################################################################################
|
||||
## Author: Shaun Reed ##
|
||||
## Legal: All Content (c) 2025 Shaun Reed, all rights reserved ##
|
||||
## Legal: All Content (c) 2022 Shaun Reed, all rights reserved ##
|
||||
## About: Practice project for using Qt Designer with custom C++ widgets ##
|
||||
## ##
|
||||
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
|
||||
@@ -14,7 +14,6 @@ project(
|
||||
DESCRIPTION "Practice using Qt designer for desktop applications"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_compile_options(-Wall)
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
@@ -29,16 +28,7 @@ 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}")
|
||||
|
||||
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()
|
||||
find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
|
||||
|
||||
qt_add_executable(designer
|
||||
designer.cpp designer.h designer.ui
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
################################################################################
|
||||
## Author: Shaun Reed ##
|
||||
## Legal: All Content (c) 2025 Shaun Reed, all rights reserved ##
|
||||
## Legal: All Content (c) 2022 Shaun Reed, all rights reserved ##
|
||||
## About: Practice project for using signals and slots in Qt ##
|
||||
## ##
|
||||
## Contact: shaunrd0@gmail.com | URL: www.shaunreed.com | GitHub: shaunrd0 ##
|
||||
@@ -14,7 +14,6 @@ project(
|
||||
DESCRIPTION "Practice using signals and slots in Qt 6"
|
||||
LANGUAGES CXX
|
||||
)
|
||||
message(STATUS "[Klips] Configuring example: ${PROJECT_NAME}")
|
||||
|
||||
add_compile_options(-Wall)
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
@@ -29,16 +28,7 @@ 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}")
|
||||
|
||||
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()
|
||||
find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
|
||||
|
||||
qt_add_executable(slots
|
||||
text-view.cpp text-view.h
|
||||
|
||||
@@ -22,7 +22,7 @@ public:
|
||||
|
||||
public:
|
||||
signals:
|
||||
void sendTest();
|
||||
void sendTest()QWidget;
|
||||
|
||||
private:
|
||||
signals:
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
# esp
|
||||
|
||||
```bash
|
||||
shaunrd0/klips/esp/
|
||||
├── cpp # Examples of ESP32 projects written in C++
|
||||
├── rust # Examples of ESP32 projects written in Rust
|
||||
└── README.md
|
||||
```
|
||||
@@ -12,7 +12,6 @@ project(
|
||||
DESCRIPTION "Example ESP-IDF cmake project"
|
||||
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
|
||||
|
||||
@@ -12,7 +12,6 @@ project(
|
||||
DESCRIPTION "Temperature and humidity from DHT sensor served on a web page"
|
||||
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
|
||||
|
||||
@@ -12,7 +12,6 @@ project(
|
||||
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)
|
||||
|
||||
@@ -12,7 +12,6 @@ project(
|
||||
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)
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
## IDF Component Manager Manifest File
|
||||
dependencies:
|
||||
idf: '>=5.3.0'
|
||||
espressif/arduino-esp32: ^3.1.1
|
||||
lvgl/lvgl: "9.2.0"
|
||||
esp_lcd_sh1107: "^1"
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
I2C i2c(PIN_SDA, PIN_SCL, PIN_RST);
|
||||
|
||||
extern "C" void app_main(void)
|
||||
void setup()
|
||||
{
|
||||
SSD1306 ssd1306(i2c);
|
||||
Display d(ssd1306);
|
||||
@@ -37,3 +37,5 @@ extern "C" void app_main(void)
|
||||
LV_LABEL_LONG_CLIP,
|
||||
LV_ALIGN_BOTTOM_MID);
|
||||
}
|
||||
|
||||
void loop() { }
|
||||
|
||||
@@ -44,24 +44,21 @@ struct Pixel {
|
||||
*
|
||||
* Therefore, each uint8 in the draw buffer stores the state of 8 pixels.
|
||||
* Below is an example of calculating for [x, y] pixel coordinates [20, 10].
|
||||
* The example uses a horizontal resolution of 128.
|
||||
*
|
||||
* For the horizontal case, each row (y) of the image is represented by
|
||||
* `hor_res >> 3` bytes (16). The byte-offset of the first pixel in the 10th
|
||||
* For the horizontal case, each row (y_) of the image is represented by
|
||||
* `hor_res_ >> 3` bytes (16). The byte-offset of the first pixel in the 10th
|
||||
* row for example is `16 * 10` = 160.
|
||||
*
|
||||
* Since the pixels are stored horizontally we must calculate the 20th pixel
|
||||
* column (x) as `160 + (20 >> 3)`, or `160 + (20 / 8)` to get a final offset
|
||||
* column (x_) as `160 + (20 >> 3)`, or `160 + (20 / 8)` to get a final offset
|
||||
* of 162.
|
||||
*
|
||||
* @param x X pixel coordinate to find byte offset.
|
||||
* @param y Y pixel coordinate to find byte offset.
|
||||
* @param hor_res horizontal resolution of the display.
|
||||
* @return byte offset for a single-byte monochrome pixel at [x,y].
|
||||
*/
|
||||
[[maybe_unused]] [[nodiscard]] static ptrdiff_t
|
||||
horizontal_byte_offset(const int32_t &x, const int32_t &y,
|
||||
const int32_t &hor_res = LCD_V_RES)
|
||||
horizontal_byte_offset(const int32_t &x, const int32_t &y, const int32_t& hor_res)
|
||||
{
|
||||
// Convert pixel (bit) coordinates to byte coordinates in the draw buffer.
|
||||
return (hor_res >> 3) * y + (x >> 3);
|
||||
@@ -78,25 +75,22 @@ struct Pixel {
|
||||
*
|
||||
* Therefore, each uint8 in the draw buffer stores the state of 8 pixels.
|
||||
* Below is an example of calculating for [x, y] pixel coordinates [20, 10].
|
||||
* The example uses a horizontal resolution of 128.
|
||||
*
|
||||
* For the vertical case, each row (y) of the image is represented by
|
||||
* `hor_res` bytes (128) - one for each column (x). Because the pixels are
|
||||
* For the vertical case, each row (y_) of the image is represented by
|
||||
* `hor_res_` bytes (128) - one for each column (x_). Because the pixels are
|
||||
* stored vertically, the byte-offset of the first pixel in the 10th row is
|
||||
* `128 * (10 >> 3)` or * `128 * (10 / 8)` = 128.
|
||||
*
|
||||
* From this location we can simply calculate the 20th pixel column (x) as
|
||||
* From this location we can simply calculate the 20th pixel column (x_) as
|
||||
* `128 + 20` to get a final offset of 148, because the pixels are stored in a
|
||||
* columnar format.
|
||||
*
|
||||
* @param x X pixel coordinate to find byte offset.
|
||||
* @param y Y pixel coordinate to find byte offset.
|
||||
* @param hor_res horizontal resolution of the display.
|
||||
* @return byte offset for a single-byte monochrome pixel at [x,y].
|
||||
*/
|
||||
[[maybe_unused]] [[nodiscard]] static ptrdiff_t
|
||||
vertical_byte_offset(const int32_t &x, const int32_t &y,
|
||||
const int32_t &hor_res = LCD_V_RES)
|
||||
vertical_byte_offset(const int32_t &x, const int32_t &y, const int32_t& hor_res)
|
||||
{
|
||||
// Convert pixel (bit) coordinates to byte coordinates in the draw buffer.
|
||||
return hor_res * (y >> 3) + x;
|
||||
@@ -173,8 +167,7 @@ public:
|
||||
height_(height),
|
||||
rst_num_(i2c.rst_num_),
|
||||
lv_buf_size_(draw_buf_size),
|
||||
esp_io_config_(io_config),
|
||||
lv_buf_(nullptr) { }
|
||||
esp_io_config_(io_config) { }
|
||||
|
||||
virtual ~IPanelDevice() = default;
|
||||
|
||||
@@ -238,6 +231,24 @@ public:
|
||||
*/
|
||||
virtual void *vendor_config() = 0;
|
||||
|
||||
//
|
||||
// PUBLIC MEMBERS
|
||||
|
||||
/// Width of the device screen in pixels.
|
||||
int32_t width_;
|
||||
|
||||
/// Height of the device screen in pixels.
|
||||
int32_t height_;
|
||||
|
||||
/// RST GPIO pin number.
|
||||
int rst_num_;
|
||||
|
||||
/// LVGL draw buffer size for the device.
|
||||
size_t lv_buf_size_;
|
||||
|
||||
/// ESP LCD panel IO configuration.
|
||||
esp_lcd_panel_io_i2c_config_t esp_io_config_;
|
||||
|
||||
/**
|
||||
* Registers LVGL draw buffers and callbacks for this display.
|
||||
*
|
||||
@@ -258,24 +269,6 @@ public:
|
||||
*/
|
||||
virtual void register_lvgl_tick_timer();
|
||||
|
||||
//
|
||||
// PUBLIC MEMBERS
|
||||
|
||||
/// Width of the device screen in pixels.
|
||||
int32_t width_;
|
||||
|
||||
/// Height of the device screen in pixels.
|
||||
int32_t height_;
|
||||
|
||||
/// RST GPIO pin number.
|
||||
int rst_num_;
|
||||
|
||||
/// LVGL draw buffer size for the device.
|
||||
size_t lv_buf_size_;
|
||||
|
||||
/// ESP LCD panel IO configuration.
|
||||
esp_lcd_panel_io_i2c_config_t esp_io_config_;
|
||||
|
||||
protected:
|
||||
/**
|
||||
* Static accessor to a static buffer to store draw buffer data for the panel.
|
||||
@@ -374,10 +367,10 @@ private:
|
||||
* 0, 0, 0, 0,
|
||||
* 0] 0] 0] 0]
|
||||
*
|
||||
* These layouts in memory have no opinion on the shape of the image. The
|
||||
* beginning and end of a row or a column for example is entirely dependent
|
||||
* on how the data is accessed. The vertical and horitzontal resolution may
|
||||
* vary between displays.
|
||||
* These layouts in memory have no opinion on the shape of the image. The
|
||||
* beginning and end of a row or a column for example is entirely dependent
|
||||
* on how the data is accessed. The vertical and horitzontal resolution may
|
||||
* vary between displays.
|
||||
*
|
||||
* For the LV_COLOR_FORMAT_I1 color format we are using, an additional buffer
|
||||
* is needed for transposing the bits to the vertical arrangement required by
|
||||
|
||||
@@ -386,6 +386,123 @@ CONFIG_PARTITION_TABLE_OFFSET=0x8000
|
||||
CONFIG_PARTITION_TABLE_MD5=y
|
||||
# end of Partition Table
|
||||
|
||||
#
|
||||
# Arduino Configuration
|
||||
#
|
||||
CONFIG_ARDUINO_VARIANT="esp32"
|
||||
CONFIG_ENABLE_ARDUINO_DEPENDS=y
|
||||
CONFIG_AUTOSTART_ARDUINO=y
|
||||
# CONFIG_ARDUINO_RUN_CORE0 is not set
|
||||
CONFIG_ARDUINO_RUN_CORE1=y
|
||||
# CONFIG_ARDUINO_RUN_NO_AFFINITY is not set
|
||||
CONFIG_ARDUINO_RUNNING_CORE=1
|
||||
CONFIG_ARDUINO_LOOP_STACK_SIZE=8192
|
||||
# CONFIG_ARDUINO_EVENT_RUN_CORE0 is not set
|
||||
CONFIG_ARDUINO_EVENT_RUN_CORE1=y
|
||||
# CONFIG_ARDUINO_EVENT_RUN_NO_AFFINITY is not set
|
||||
CONFIG_ARDUINO_EVENT_RUNNING_CORE=1
|
||||
# CONFIG_ARDUINO_SERIAL_EVENT_RUN_CORE0 is not set
|
||||
# CONFIG_ARDUINO_SERIAL_EVENT_RUN_CORE1 is not set
|
||||
CONFIG_ARDUINO_SERIAL_EVENT_RUN_NO_AFFINITY=y
|
||||
CONFIG_ARDUINO_SERIAL_EVENT_TASK_RUNNING_CORE=-1
|
||||
CONFIG_ARDUINO_SERIAL_EVENT_TASK_STACK_SIZE=2048
|
||||
CONFIG_ARDUINO_SERIAL_EVENT_TASK_PRIORITY=24
|
||||
CONFIG_ARDUINO_UDP_RUN_CORE0=y
|
||||
# CONFIG_ARDUINO_UDP_RUN_CORE1 is not set
|
||||
# CONFIG_ARDUINO_UDP_RUN_NO_AFFINITY is not set
|
||||
CONFIG_ARDUINO_UDP_RUNNING_CORE=0
|
||||
CONFIG_ARDUINO_UDP_TASK_PRIORITY=3
|
||||
# CONFIG_ARDUINO_ISR_IRAM is not set
|
||||
# CONFIG_DISABLE_HAL_LOCKS is not set
|
||||
|
||||
#
|
||||
# Debug Log Configuration
|
||||
#
|
||||
# CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_NONE is not set
|
||||
CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR=y
|
||||
# CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_WARN is not set
|
||||
# CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_INFO is not set
|
||||
# CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_DEBUG is not set
|
||||
# CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_VERBOSE is not set
|
||||
CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL=1
|
||||
# CONFIG_ARDUHAL_LOG_COLORS is not set
|
||||
# CONFIG_ARDUHAL_ESP_LOG is not set
|
||||
# end of Debug Log Configuration
|
||||
|
||||
CONFIG_ARDUHAL_PARTITION_SCHEME_DEFAULT=y
|
||||
# CONFIG_ARDUHAL_PARTITION_SCHEME_MINIMAL is not set
|
||||
# CONFIG_ARDUHAL_PARTITION_SCHEME_NO_OTA is not set
|
||||
# CONFIG_ARDUHAL_PARTITION_SCHEME_HUGE_APP is not set
|
||||
# CONFIG_ARDUHAL_PARTITION_SCHEME_MIN_SPIFFS is not set
|
||||
CONFIG_ARDUHAL_PARTITION_SCHEME="default"
|
||||
# CONFIG_AUTOCONNECT_WIFI is not set
|
||||
# CONFIG_ARDUINO_SELECTIVE_COMPILATION is not set
|
||||
# end of Arduino Configuration
|
||||
|
||||
#
|
||||
# ESP RainMaker Config
|
||||
#
|
||||
CONFIG_ESP_RMAKER_NO_CLAIM=y
|
||||
# CONFIG_ESP_RMAKER_USE_ESP_SECURE_CERT_MGR is not set
|
||||
CONFIG_ESP_RMAKER_USE_NVS=y
|
||||
CONFIG_ESP_RMAKER_CLAIM_TYPE=0
|
||||
# CONFIG_ESP_RMAKER_READ_MQTT_HOST_FROM_CONFIG is not set
|
||||
# CONFIG_ESP_RMAKER_READ_NODE_ID_FROM_CERT_CN is not set
|
||||
CONFIG_ESP_RMAKER_MQTT_USE_BASIC_INGEST_TOPICS=y
|
||||
CONFIG_ESP_RMAKER_MQTT_ENABLE_BUDGETING=y
|
||||
CONFIG_ESP_RMAKER_MQTT_DEFAULT_BUDGET=100
|
||||
CONFIG_ESP_RMAKER_MQTT_MAX_BUDGET=1024
|
||||
CONFIG_ESP_RMAKER_MQTT_BUDGET_REVIVE_PERIOD=5
|
||||
CONFIG_ESP_RMAKER_MQTT_BUDGET_REVIVE_COUNT=1
|
||||
CONFIG_ESP_RMAKER_MAX_PARAM_DATA_SIZE=1024
|
||||
# CONFIG_ESP_RMAKER_DISABLE_USER_MAPPING_PROV is not set
|
||||
# CONFIG_ESP_RMAKER_USER_ID_CHECK is not set
|
||||
# CONFIG_RMAKER_NAME_PARAM_CB is not set
|
||||
# CONFIG_ESP_RMAKER_LOCAL_CTRL_FEATURE_ENABLE is not set
|
||||
# CONFIG_ESP_RMAKER_LOCAL_CTRL_AUTO_ENABLE is not set
|
||||
CONFIG_ESP_RMAKER_CONSOLE_UART_NUM_0=y
|
||||
# CONFIG_ESP_RMAKER_CONSOLE_UART_NUM_1 is not set
|
||||
CONFIG_ESP_RMAKER_CONSOLE_UART_NUM=0
|
||||
CONFIG_ESP_RMAKER_USE_CERT_BUNDLE=y
|
||||
|
||||
#
|
||||
# ESP RainMaker OTA Config
|
||||
#
|
||||
CONFIG_ESP_RMAKER_OTA_AUTOFETCH=y
|
||||
CONFIG_ESP_RMAKER_OTA_AUTOFETCH_PERIOD=0
|
||||
# CONFIG_ESP_RMAKER_SKIP_COMMON_NAME_CHECK is not set
|
||||
# CONFIG_ESP_RMAKER_SKIP_VERSION_CHECK is not set
|
||||
# CONFIG_ESP_RMAKER_SKIP_SECURE_VERSION_CHECK is not set
|
||||
# CONFIG_ESP_RMAKER_SKIP_PROJECT_NAME_CHECK is not set
|
||||
CONFIG_ESP_RMAKER_OTA_HTTP_RX_BUFFER_SIZE=1024
|
||||
CONFIG_ESP_RMAKER_OTA_ROLLBACK_WAIT_PERIOD=90
|
||||
# CONFIG_ESP_RMAKER_OTA_DISABLE_AUTO_REBOOT is not set
|
||||
CONFIG_ESP_RMAKER_OTA_TIME_SUPPORT=y
|
||||
# end of ESP RainMaker OTA Config
|
||||
|
||||
#
|
||||
# ESP RainMaker Scheduling
|
||||
#
|
||||
CONFIG_ESP_RMAKER_SCHEDULING_MAX_SCHEDULES=10
|
||||
# end of ESP RainMaker Scheduling
|
||||
|
||||
#
|
||||
# ESP RainMaker Scenes
|
||||
#
|
||||
CONFIG_ESP_RMAKER_SCENES_MAX_SCENES=10
|
||||
# CONFIG_ESP_RMAKER_SCENES_DEACTIVATE_SUPPORT is not set
|
||||
# end of ESP RainMaker Scenes
|
||||
|
||||
#
|
||||
# ESP RainMaker Command-Response
|
||||
#
|
||||
CONFIG_ESP_RMAKER_CMD_RESP_ENABLE=y
|
||||
# CONFIG_ESP_RMAKER_CMD_RESP_TEST_ENABLE is not set
|
||||
# end of ESP RainMaker Command-Response
|
||||
|
||||
CONFIG_ESP_RMAKER_USING_NETWORK_PROV=y
|
||||
# end of ESP RainMaker Config
|
||||
|
||||
#
|
||||
# Compiler options
|
||||
#
|
||||
@@ -1812,6 +1929,260 @@ CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
|
||||
# CONFIG_WIFI_PROV_STA_FAST_SCAN is not set
|
||||
# end of Wi-Fi Provisioning Manager
|
||||
|
||||
#
|
||||
# DSP Library
|
||||
#
|
||||
CONFIG_DSP_OPTIMIZATIONS_SUPPORTED=y
|
||||
# CONFIG_DSP_ANSI is not set
|
||||
CONFIG_DSP_OPTIMIZED=y
|
||||
CONFIG_DSP_OPTIMIZATION=1
|
||||
# CONFIG_DSP_MAX_FFT_SIZE_512 is not set
|
||||
# CONFIG_DSP_MAX_FFT_SIZE_1024 is not set
|
||||
# CONFIG_DSP_MAX_FFT_SIZE_2048 is not set
|
||||
CONFIG_DSP_MAX_FFT_SIZE_4096=y
|
||||
# CONFIG_DSP_MAX_FFT_SIZE_8192 is not set
|
||||
# CONFIG_DSP_MAX_FFT_SIZE_16384 is not set
|
||||
# CONFIG_DSP_MAX_FFT_SIZE_32768 is not set
|
||||
CONFIG_DSP_MAX_FFT_SIZE=4096
|
||||
# end of DSP Library
|
||||
|
||||
#
|
||||
# Modbus configuration
|
||||
#
|
||||
CONFIG_FMB_COMM_MODE_TCP_EN=y
|
||||
CONFIG_FMB_TCP_PORT_DEFAULT=502
|
||||
CONFIG_FMB_TCP_PORT_MAX_CONN=5
|
||||
CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20
|
||||
# CONFIG_FMB_TCP_UID_ENABLED is not set
|
||||
CONFIG_FMB_COMM_MODE_RTU_EN=y
|
||||
CONFIG_FMB_COMM_MODE_ASCII_EN=y
|
||||
CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000
|
||||
CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200
|
||||
CONFIG_FMB_QUEUE_LENGTH=20
|
||||
CONFIG_FMB_PORT_TASK_STACK_SIZE=4096
|
||||
CONFIG_FMB_SERIAL_BUF_SIZE=256
|
||||
CONFIG_FMB_SERIAL_ASCII_BITS_PER_SYMB=8
|
||||
CONFIG_FMB_ASCII_TIMEOUT_WAIT_BEFORE_SEND_MS=0
|
||||
CONFIG_FMB_SERIAL_ASCII_TIMEOUT_RESPOND_MS=1000
|
||||
CONFIG_FMB_PORT_TASK_PRIO=10
|
||||
# CONFIG_FMB_PORT_TASK_AFFINITY_NO_AFFINITY is not set
|
||||
CONFIG_FMB_PORT_TASK_AFFINITY_CPU0=y
|
||||
# CONFIG_FMB_PORT_TASK_AFFINITY_CPU1 is not set
|
||||
CONFIG_FMB_PORT_TASK_AFFINITY=0x0
|
||||
CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT=y
|
||||
CONFIG_FMB_CONTROLLER_SLAVE_ID=0x00112233
|
||||
CONFIG_FMB_CONTROLLER_SLAVE_ID_MAX_SIZE=32
|
||||
CONFIG_FMB_CONTROLLER_NOTIFY_TIMEOUT=20
|
||||
CONFIG_FMB_CONTROLLER_NOTIFY_QUEUE_SIZE=20
|
||||
CONFIG_FMB_CONTROLLER_STACK_SIZE=4096
|
||||
CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20
|
||||
# CONFIG_FMB_TIMER_PORT_ENABLED is not set
|
||||
# CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD is not set
|
||||
# CONFIG_FMB_EXT_TYPE_SUPPORT is not set
|
||||
# end of Modbus configuration
|
||||
|
||||
#
|
||||
# ESP serial flasher
|
||||
#
|
||||
CONFIG_SERIAL_FLASHER_MD5_ENABLED=y
|
||||
CONFIG_SERIAL_FLASHER_RESET_HOLD_TIME_MS=100
|
||||
CONFIG_SERIAL_FLASHER_BOOT_HOLD_TIME_MS=50
|
||||
# end of ESP serial flasher
|
||||
|
||||
#
|
||||
# Zigbee
|
||||
#
|
||||
# CONFIG_ZB_ENABLED is not set
|
||||
# end of Zigbee
|
||||
|
||||
#
|
||||
# Diagnostics data store
|
||||
#
|
||||
CONFIG_DIAG_DATA_STORE_RTC=y
|
||||
# CONFIG_DIAG_DATA_STORE_FLASH is not set
|
||||
CONFIG_DIAG_DATA_STORE_REPORTING_WATERMARK_PERCENT=80
|
||||
|
||||
#
|
||||
# RTC Store
|
||||
#
|
||||
CONFIG_RTC_STORE_DATA_SIZE=3072
|
||||
CONFIG_RTC_STORE_CRITICAL_DATA_SIZE=2048
|
||||
# end of RTC Store
|
||||
# end of Diagnostics data store
|
||||
|
||||
#
|
||||
# Diagnostics
|
||||
#
|
||||
CONFIG_DIAG_LOG_MSG_ARG_FORMAT_TLV=y
|
||||
# CONFIG_DIAG_LOG_MSG_ARG_FORMAT_STRING is not set
|
||||
CONFIG_DIAG_LOG_MSG_ARG_MAX_SIZE=64
|
||||
CONFIG_DIAG_LOG_DROP_WIFI_LOGS=y
|
||||
CONFIG_DIAG_ENABLE_METRICS=y
|
||||
CONFIG_DIAG_METRICS_MAX_COUNT=20
|
||||
CONFIG_DIAG_ENABLE_HEAP_METRICS=y
|
||||
CONFIG_DIAG_ENABLE_WIFI_METRICS=y
|
||||
CONFIG_DIAG_ENABLE_VARIABLES=y
|
||||
CONFIG_DIAG_VARIABLES_MAX_COUNT=20
|
||||
CONFIG_DIAG_ENABLE_NETWORK_VARIABLES=y
|
||||
# CONFIG_DIAG_MORE_NETWORK_VARS is not set
|
||||
# CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP is not set
|
||||
# end of Diagnostics
|
||||
|
||||
#
|
||||
# ESP Insights
|
||||
#
|
||||
# CONFIG_ESP_INSIGHTS_ENABLED is not set
|
||||
# CONFIG_ESP_INSIGHTS_TRANSPORT_MQTT is not set
|
||||
CONFIG_ESP_INSIGHTS_TRANSPORT_HTTPS=y
|
||||
CONFIG_ESP_INSIGHTS_TRANSPORT_HTTPS_HOST="https://client.insights.espressif.com"
|
||||
CONFIG_ESP_INSIGHTS_CLOUD_POST_MIN_INTERVAL_SEC=60
|
||||
CONFIG_ESP_INSIGHTS_CLOUD_POST_MAX_INTERVAL_SEC=240
|
||||
# end of ESP Insights
|
||||
|
||||
#
|
||||
# esp-modem
|
||||
#
|
||||
CONFIG_ESP_MODEM_CMUX_DEFRAGMENT_PAYLOAD=y
|
||||
# CONFIG_ESP_MODEM_USE_INFLATABLE_BUFFER_IF_NEEDED is not set
|
||||
CONFIG_ESP_MODEM_CMUX_DELAY_AFTER_DLCI_SETUP=0
|
||||
# CONFIG_ESP_MODEM_CMUX_USE_SHORT_PAYLOADS_ONLY is not set
|
||||
# CONFIG_ESP_MODEM_ADD_CUSTOM_MODULE is not set
|
||||
CONFIG_ESP_MODEM_C_API_STR_MAX=128
|
||||
# CONFIG_ESP_MODEM_URC_HANDLER is not set
|
||||
# CONFIG_ESP_MODEM_PPP_ESCAPE_BEFORE_EXIT is not set
|
||||
# CONFIG_ESP_MODEM_ADD_DEBUG_LOGS is not set
|
||||
# end of esp-modem
|
||||
|
||||
#
|
||||
# OpenThread RCP Update
|
||||
#
|
||||
# CONFIG_AUTO_UPDATE_RCP is not set
|
||||
# CONFIG_CREATE_OTA_IMAGE_WITH_RCP_FW is not set
|
||||
# end of OpenThread RCP Update
|
||||
|
||||
#
|
||||
# ESP Secure Cert Manager
|
||||
#
|
||||
# CONFIG_ESP_SECURE_CERT_SUPPORT_LEGACY_FORMATS is not set
|
||||
# end of ESP Secure Cert Manager
|
||||
|
||||
#
|
||||
# jsmn
|
||||
#
|
||||
# CONFIG_JSMN_PARENT_LINKS is not set
|
||||
# CONFIG_JSMN_STRICT is not set
|
||||
# CONFIG_JSMN_STATIC is not set
|
||||
# end of jsmn
|
||||
|
||||
#
|
||||
# libsodium
|
||||
#
|
||||
# end of libsodium
|
||||
|
||||
#
|
||||
# mDNS
|
||||
#
|
||||
CONFIG_MDNS_MAX_INTERFACES=3
|
||||
CONFIG_MDNS_MAX_SERVICES=10
|
||||
CONFIG_MDNS_TASK_PRIORITY=1
|
||||
CONFIG_MDNS_ACTION_QUEUE_LEN=16
|
||||
CONFIG_MDNS_TASK_STACK_SIZE=4096
|
||||
# CONFIG_MDNS_TASK_AFFINITY_NO_AFFINITY is not set
|
||||
CONFIG_MDNS_TASK_AFFINITY_CPU0=y
|
||||
# CONFIG_MDNS_TASK_AFFINITY_CPU1 is not set
|
||||
CONFIG_MDNS_TASK_AFFINITY=0x0
|
||||
|
||||
#
|
||||
# MDNS Memory Configuration
|
||||
#
|
||||
CONFIG_MDNS_TASK_CREATE_FROM_INTERNAL=y
|
||||
CONFIG_MDNS_MEMORY_ALLOC_INTERNAL=y
|
||||
# CONFIG_MDNS_MEMORY_CUSTOM_IMPL is not set
|
||||
# end of MDNS Memory Configuration
|
||||
|
||||
CONFIG_MDNS_SERVICE_ADD_TIMEOUT_MS=2000
|
||||
CONFIG_MDNS_TIMER_PERIOD_MS=100
|
||||
# CONFIG_MDNS_NETWORKING_SOCKET is not set
|
||||
# CONFIG_MDNS_SKIP_SUPPRESSING_OWN_QUERIES is not set
|
||||
# CONFIG_MDNS_ENABLE_DEBUG_PRINTS is not set
|
||||
CONFIG_MDNS_ENABLE_CONSOLE_CLI=y
|
||||
# CONFIG_MDNS_RESPOND_REVERSE_QUERIES is not set
|
||||
CONFIG_MDNS_MULTIPLE_INSTANCE=y
|
||||
|
||||
#
|
||||
# MDNS Predefined interfaces
|
||||
#
|
||||
CONFIG_MDNS_PREDEF_NETIF_STA=y
|
||||
CONFIG_MDNS_PREDEF_NETIF_AP=y
|
||||
CONFIG_MDNS_PREDEF_NETIF_ETH=y
|
||||
# end of MDNS Predefined interfaces
|
||||
# end of mDNS
|
||||
|
||||
#
|
||||
# Network Provisioning Manager
|
||||
#
|
||||
CONFIG_NETWORK_PROV_NETWORK_TYPE_WIFI=y
|
||||
CONFIG_NETWORK_PROV_SCAN_MAX_ENTRIES=16
|
||||
CONFIG_NETWORK_PROV_AUTOSTOP_TIMEOUT=30
|
||||
# CONFIG_NETWORK_PROV_BLE_FORCE_ENCRYPTION is not set
|
||||
CONFIG_NETWORK_PROV_WIFI_STA_ALL_CHANNEL_SCAN=y
|
||||
# CONFIG_NETWORK_PROV_WIFI_STA_FAST_SCAN is not set
|
||||
# end of Network Provisioning Manager
|
||||
|
||||
#
|
||||
# ESP RainMaker Common
|
||||
#
|
||||
CONFIG_ESP_RMAKER_LIB_ESP_MQTT=y
|
||||
# CONFIG_ESP_RMAKER_LIB_AWS_IOT is not set
|
||||
CONFIG_ESP_RMAKER_MQTT_GLUE_LIB=1
|
||||
CONFIG_ESP_RMAKER_MQTT_PORT_443=y
|
||||
# CONFIG_ESP_RMAKER_MQTT_PORT_8883 is not set
|
||||
CONFIG_ESP_RMAKER_MQTT_PORT=1
|
||||
# CONFIG_ESP_RMAKER_MQTT_PERSISTENT_SESSION is not set
|
||||
CONFIG_ESP_RMAKER_MQTT_SEND_USERNAME=y
|
||||
CONFIG_ESP_RMAKER_MQTT_PRODUCT_NAME="RMDev"
|
||||
CONFIG_ESP_RMAKER_MQTT_PRODUCT_VERSION="1x0"
|
||||
CONFIG_ESP_RMAKER_MQTT_PRODUCT_SKU="EX00"
|
||||
CONFIG_ESP_RMAKER_MQTT_USE_CERT_BUNDLE=y
|
||||
CONFIG_ESP_RMAKER_MAX_MQTT_SUBSCRIPTIONS=10
|
||||
CONFIG_ESP_RMAKER_MQTT_KEEP_ALIVE_INTERVAL=120
|
||||
CONFIG_ESP_RMAKER_NETWORK_OVER_WIFI=y
|
||||
CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK=4096
|
||||
CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_PRIORITY=5
|
||||
CONFIG_ESP_RMAKER_FACTORY_PARTITION_NAME="fctry"
|
||||
CONFIG_ESP_RMAKER_FACTORY_NAMESPACE="rmaker_creds"
|
||||
CONFIG_ESP_RMAKER_DEF_TIMEZONE="Asia/Shanghai"
|
||||
CONFIG_ESP_RMAKER_SNTP_SERVER_NAME="pool.ntp.org"
|
||||
CONFIG_ESP_RMAKER_MAX_COMMANDS=10
|
||||
# end of ESP RainMaker Common
|
||||
|
||||
#
|
||||
# LittleFS
|
||||
#
|
||||
# CONFIG_LITTLEFS_SDMMC_SUPPORT is not set
|
||||
CONFIG_LITTLEFS_MAX_PARTITIONS=3
|
||||
CONFIG_LITTLEFS_PAGE_SIZE=256
|
||||
CONFIG_LITTLEFS_OBJ_NAME_LEN=64
|
||||
CONFIG_LITTLEFS_READ_SIZE=128
|
||||
CONFIG_LITTLEFS_WRITE_SIZE=128
|
||||
CONFIG_LITTLEFS_LOOKAHEAD_SIZE=128
|
||||
CONFIG_LITTLEFS_CACHE_SIZE=512
|
||||
CONFIG_LITTLEFS_BLOCK_CYCLES=512
|
||||
CONFIG_LITTLEFS_USE_MTIME=y
|
||||
# CONFIG_LITTLEFS_USE_ONLY_HASH is not set
|
||||
# CONFIG_LITTLEFS_HUMAN_READABLE is not set
|
||||
CONFIG_LITTLEFS_MTIME_USE_SECONDS=y
|
||||
# CONFIG_LITTLEFS_MTIME_USE_NONCE is not set
|
||||
# CONFIG_LITTLEFS_SPIFFS_COMPAT is not set
|
||||
# CONFIG_LITTLEFS_FLUSH_FILE_EVERY_WRITE is not set
|
||||
# CONFIG_LITTLEFS_FCNTL_GET_PATH is not set
|
||||
# CONFIG_LITTLEFS_MULTIVERSION is not set
|
||||
# CONFIG_LITTLEFS_MALLOC_STRATEGY_DISABLE is not set
|
||||
CONFIG_LITTLEFS_MALLOC_STRATEGY_DEFAULT=y
|
||||
# CONFIG_LITTLEFS_MALLOC_STRATEGY_INTERNAL is not set
|
||||
CONFIG_LITTLEFS_ASSERTS=y
|
||||
# end of LittleFS
|
||||
|
||||
#
|
||||
# LVGL configuration
|
||||
#
|
||||
@@ -2212,6 +2583,7 @@ CONFIG_LOG_BOOTLOADER_LEVEL=3
|
||||
CONFIG_FLASHMODE_DIO=y
|
||||
# CONFIG_FLASHMODE_DOUT is not set
|
||||
CONFIG_MONITOR_BAUD=115200
|
||||
# CONFIG_ESP_RMAKER_LOCAL_CTRL_ENABLE is not set
|
||||
CONFIG_OPTIMIZATION_LEVEL_DEBUG=y
|
||||
CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG=y
|
||||
CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y
|
||||
@@ -2403,4 +2775,17 @@ CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y
|
||||
CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y
|
||||
CONFIG_SUPPORT_TERMIOS=y
|
||||
CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1
|
||||
CONFIG_MB_MASTER_TIMEOUT_MS_RESPOND=3000
|
||||
CONFIG_MB_MASTER_DELAY_MS_CONVERT=200
|
||||
CONFIG_MB_QUEUE_LENGTH=20
|
||||
CONFIG_MB_SERIAL_TASK_STACK_SIZE=4096
|
||||
CONFIG_MB_SERIAL_BUF_SIZE=256
|
||||
CONFIG_MB_SERIAL_TASK_PRIO=10
|
||||
CONFIG_MB_CONTROLLER_SLAVE_ID_SUPPORT=y
|
||||
CONFIG_MB_CONTROLLER_SLAVE_ID=0x00112233
|
||||
CONFIG_MB_CONTROLLER_NOTIFY_TIMEOUT=20
|
||||
CONFIG_MB_CONTROLLER_NOTIFY_QUEUE_SIZE=20
|
||||
CONFIG_MB_CONTROLLER_STACK_SIZE=4096
|
||||
CONFIG_MB_EVENT_QUEUE_TIMEOUT=20
|
||||
# CONFIG_MB_TIMER_PORT_ENABLED is not set
|
||||
# End of deprecated options
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# esp/cpp
|
||||
# esp
|
||||
|
||||
```bash
|
||||
shaunrd0/klips/esp/cpp
|
||||
shaunrd0/klips/esp/
|
||||
├── 01_led-button # Simple LED circuit controlled by an on board button.
|
||||
├── 02_led-button-web # LED controlled by a button or within a web browser.
|
||||
├── 03_temp-humidity-web # Temperature and humidity sensor within a web browser.
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
[build]
|
||||
target = "xtensa-esp32-espidf"
|
||||
|
||||
[target.xtensa-esp32-espidf]
|
||||
linker = "ldproxy"
|
||||
runner = "espflash flash --monitor"
|
||||
rustflags = [ "--cfg", "espidf_time64"]
|
||||
|
||||
[unstable]
|
||||
build-std = ["std", "panic_abort"]
|
||||
|
||||
[env]
|
||||
MCU="esp32"
|
||||
# Note: this variable is not used by the pio builder (`cargo build --features pio`)
|
||||
ESP_IDF_VERSION = "v5.2.3"
|
||||
|
||||
5
esp/rust/01_esp-idf-std/.gitignore
vendored
5
esp/rust/01_esp-idf-std/.gitignore
vendored
@@ -1,5 +0,0 @@
|
||||
/.vscode
|
||||
/.idea
|
||||
/.embuild
|
||||
/target
|
||||
/Cargo.lock
|
||||
@@ -1,49 +0,0 @@
|
||||
[package]
|
||||
name = "esp-idf-std"
|
||||
version = "0.1.0"
|
||||
authors = ["Shaun Reed <shaunrd0@gmail.com>"]
|
||||
edition = "2021"
|
||||
resolver = "2"
|
||||
rust-version = "1.77"
|
||||
|
||||
[[bin]]
|
||||
name = "esp-idf-std"
|
||||
harness = false # do not use the built in cargo test harness -> resolve rust-analyzer errors
|
||||
|
||||
[profile.release]
|
||||
opt-level = "s"
|
||||
|
||||
[profile.dev]
|
||||
debug = true # Symbols are nice and they don't increase the size on Flash
|
||||
opt-level = "z"
|
||||
|
||||
[features]
|
||||
default = []
|
||||
|
||||
experimental = ["esp-idf-svc/experimental"]
|
||||
|
||||
[dependencies]
|
||||
log = "0.4"
|
||||
esp-idf-svc = "0.51"
|
||||
esp-idf-hal = "0.45.2"
|
||||
anyhow = "1.0.98"
|
||||
|
||||
# --- Optional Embassy Integration ---
|
||||
# esp-idf-svc = { version = "0.51", features = ["critical-section", "embassy-time-driver", "embassy-sync"] }
|
||||
|
||||
# If you enable embassy-time-driver, you MUST also add one of:
|
||||
|
||||
# a) Standalone Embassy libs ( embassy-time, embassy-sync etc) with a foreign async runtime:
|
||||
# embassy-time = { version = "0.4.0", features = ["generic-queue-8"] } # NOTE: any generic-queue variant will work
|
||||
|
||||
# b) With embassy-executor:
|
||||
# embassy-executor = { version = "0.7", features = ["executor-thread", "arch-std"] }
|
||||
|
||||
# NOTE: if you use embassy-time with embassy-executor you don't need the generic-queue-8 feature
|
||||
|
||||
# --- Temporary workaround for embassy-executor < 0.8 ---
|
||||
# esp-idf-svc = { version = "0.51", features = ["embassy-time-driver", "embassy-sync"] }
|
||||
# critical-section = { version = "1.1", features = ["std"], default-features = false }
|
||||
|
||||
[build-dependencies]
|
||||
embuild = "0.33"
|
||||
@@ -1,32 +0,0 @@
|
||||
# esp-idf-std
|
||||
|
||||
This is an example of using ESP-IDF with std enabled in Rust
|
||||
When flashed to a device, the application just adjusts the intensity of the on-board LED for visual verification that flashing works correctly.
|
||||
|
||||
Steps used to generate this project
|
||||
|
||||
```bash
|
||||
cargo install cargo-generate
|
||||
cargo generate --git https://github.com/esp-rs/esp-idf-template.git --name esp-idf-rust-std -d mcu=esp32 -d std=true
|
||||
```
|
||||
|
||||
Steps to build and flash this project
|
||||
|
||||
```bash
|
||||
# Install espflash if you don't have it already
|
||||
cargo install espflash
|
||||
|
||||
# Export esp-idf build environment
|
||||
. ~/export-esp.sh
|
||||
|
||||
# Build and flash to the device
|
||||
cargo build
|
||||
cargo run
|
||||
|
||||
# Check the serial monitor (optional)
|
||||
sudo usermod -aG dialout $USER
|
||||
newgrp dialout
|
||||
espflash monitor
|
||||
```
|
||||
|
||||
For more detailed information on setting up a development environment, see [the esp/rust README](/esp/rust/README.md)
|
||||
@@ -1,3 +0,0 @@
|
||||
fn main() {
|
||||
embuild::espidf::sysenv::output();
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
[toolchain]
|
||||
channel = "esp"
|
||||
@@ -1,10 +0,0 @@
|
||||
# Rust often needs a bit of an extra main task stack size compared to C (the default is 3K)
|
||||
CONFIG_ESP_MAIN_TASK_STACK_SIZE=8000
|
||||
|
||||
# Use this to set FreeRTOS kernel tick frequency to 1000 Hz (100 Hz by default).
|
||||
# This allows to use 1 ms granularity for thread sleeps (10 ms by default).
|
||||
#CONFIG_FREERTOS_HZ=1000
|
||||
|
||||
# Workaround for https://github.com/espressif/esp-idf/issues/7631
|
||||
#CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=n
|
||||
#CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=n
|
||||
@@ -1,35 +0,0 @@
|
||||
use esp_idf_hal::delay::FreeRtos;
|
||||
use esp_idf_hal::ledc::*;
|
||||
use esp_idf_hal::peripherals::Peripherals;
|
||||
use esp_idf_hal::prelude::*;
|
||||
|
||||
fn main() -> anyhow::Result<()> {
|
||||
esp_idf_hal::sys::link_patches();
|
||||
|
||||
println!("Configuring output channel");
|
||||
|
||||
let peripherals = Peripherals::take()?;
|
||||
// Channel for on-board LED on ESP32
|
||||
let mut channel = LedcDriver::new(
|
||||
peripherals.ledc.channel0,
|
||||
LedcTimerDriver::new(
|
||||
peripherals.ledc.timer0,
|
||||
&config::TimerConfig::new().frequency(25_u32.kHz().into()),
|
||||
)?,
|
||||
peripherals.pins.gpio2,
|
||||
)?;
|
||||
|
||||
println!("Starting duty-cycle loop");
|
||||
let max_duty = channel.get_max_duty();
|
||||
// Cycle the channel duty every 2s to visually show that things are working when flashed.
|
||||
for numerator in [0, 1, 2, 3, 4, 5].iter().cycle() {
|
||||
println!("Duty {numerator}/5");
|
||||
channel.set_duty(max_duty * numerator / 5)?;
|
||||
FreeRtos::delay_ms(2000);
|
||||
}
|
||||
|
||||
// We want this to run forever, so don't let the application terminate.
|
||||
loop {
|
||||
FreeRtos::delay_ms(1000);
|
||||
}
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
[build]
|
||||
target = "xtensa-esp32-espidf"
|
||||
|
||||
[target.xtensa-esp32-espidf]
|
||||
linker = "ldproxy"
|
||||
runner = "espflash flash --monitor"
|
||||
rustflags = [ "--cfg", "espidf_time64"]
|
||||
|
||||
[unstable]
|
||||
build-std = ["std", "panic_abort"]
|
||||
|
||||
[env]
|
||||
MCU="esp32"
|
||||
# Note: this variable is not used by the pio builder (`cargo build --features pio`)
|
||||
ESP_IDF_VERSION = "v5.3.3"
|
||||
|
||||
42
esp/rust/03_aht20/.github/workflows/rust_ci.yml
vendored
42
esp/rust/03_aht20/.github/workflows/rust_ci.yml
vendored
@@ -1,42 +0,0 @@
|
||||
name: Continuous Integration
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
paths-ignore:
|
||||
- "**/README.md"
|
||||
pull_request:
|
||||
workflow_dispatch:
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
jobs:
|
||||
rust-checks:
|
||||
name: Rust Checks
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
action:
|
||||
- command: build
|
||||
args: --release
|
||||
- command: fmt
|
||||
args: --all -- --check --color always
|
||||
- command: clippy
|
||||
args: --all-targets --all-features --workspace -- -D warnings
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
- name: Setup Rust
|
||||
uses: esp-rs/xtensa-toolchain@v1.6
|
||||
with:
|
||||
default: true
|
||||
buildtargets: esp32
|
||||
ldproxy: true
|
||||
- name: Enable caching
|
||||
uses: Swatinem/rust-cache@v2
|
||||
- name: Run command
|
||||
run: cargo ${{ matrix.action.command }} ${{ matrix.action.args }}
|
||||
4
esp/rust/03_aht20/.gitignore
vendored
4
esp/rust/03_aht20/.gitignore
vendored
@@ -1,4 +0,0 @@
|
||||
/.vscode
|
||||
/.embuild
|
||||
/target
|
||||
/Cargo.lock
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user