Skip to content

Commit f9c5299

Browse files
authored
Merge branch 'main' into feat/screen-wrapper-api
2 parents 4a9bf5e + b4e9983 commit f9c5299

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

src/system/startup.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
#include "pros/competition.hpp"
1717
#include "pros/rtos.hpp"
18+
#include "src/system/system_daemon.hpp"
1819
#include "v5_api_patched.h"
1920

2021
#include <cstdint>
@@ -49,8 +50,6 @@ static void pros_init() {
4950
vfs_initialize();
5051
}
5152

52-
// forward-declare system daemon initialization function
53-
void initialize_system_daemon();
5453
// forward-declare main function
5554
int main();
5655

@@ -75,7 +74,7 @@ void _start() {
7574
__libc_init_array();
7675

7776
// initialize the system daemon
78-
initialize_system_daemon();
77+
zest::initialize_system_daemon();
7978

8079
// start main task
8180
// these pragmas are needed to silence the same warning on clang and gcc

src/system/system_daemon.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ namespace zest {
1515
// This means it needs to be initialized by the _start function in startup.cpp
1616
static std::optional<pros::Task> system_daemon;
1717

18-
/**
19-
* @brief Initialize the system daemon task
20-
*
21-
*/
2218
void initialize_system_daemon() {
2319
if (!system_daemon) {
2420
system_daemon = pros::Task::create([]() {

src/system/system_daemon.hpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#pragma once
2+
3+
namespace zest {
4+
/**
5+
* @brief Initialize the system daemon task
6+
*
7+
*/
8+
void initialize_system_daemon();
9+
} // namespace zest

0 commit comments

Comments
 (0)