2fcf17feda
- All files:
Modify almost all files to adjust functions and classes to
work with pointers to objects passed at task creation
instead of global variables from config.hpp
- Remove/clear config.hpp to get rid of all global variables
- main.cpp
- Create pointer to all shared (used in multiple tasks) objects in main
- remove evaluatedSwitch button object,
since joystick library is used to get switch events
- changes HTTP-mode
- always init http-server (do not enable/disable at mode change)
- pass url-handle function to init-htpp function
- add lambda function to pass method of instance for thatMajor Rework all files - Remove global variables, pass pointers to tasks
- All files:
Modify almost all files to adjust functions and classes to
work with pointers to objects passed at task creation
instead of global variables from config.hpp
- Remove/clear config.hpp to get rid of all global variables
- main.cpp
- Create pointer to all shared (used in multiple tasks) objects in main
- remove evaluatedSwitch button object,
since joystick library is used to get switch events
- changes HTTP-mode
- always init http-server (do not enable/disable at mode change)
- pass url-handle function to init-htpp function
- add lambda function to pass method of instance for that
NOTES: - tested on breakoutboard only
- known issue that slow encoder events are not recognized
(especially in menu) - slowing down motorctl helps
81 lines
2.8 KiB
C++
81 lines
2.8 KiB
C++
#pragma once
|
|
|
|
extern "C"
|
|
{
|
|
#include "esp_http_server.h"
|
|
}
|
|
|
|
#include "joystick.hpp"
|
|
|
|
|
|
|
|
//============================
|
|
//===== init http server =====
|
|
//============================
|
|
//function that initializes http server and configures available urls
|
|
//parameter: provide pointer to function that handles incomming joystick data (for configuring the url)
|
|
//TODO add handle functions to future additional endpoints/urls here too
|
|
typedef esp_err_t (*http_handler_t)(httpd_req_t *req);
|
|
void http_init_server(http_handler_t onJoystickUrl);
|
|
|
|
//example with lambda function to pass method of a class instance:
|
|
//esp_err_t (httpJoystick::*pointerToReceiveFunc)(httpd_req_t *req) = &httpJoystick::receiveHttpData;
|
|
//esp_err_t on_joystick_url(httpd_req_t *req){
|
|
// //run pointer to receiveHttpData function of httpJoystickMain instance
|
|
// return (httpJoystickMain->*pointerToReceiveFunc)(req);
|
|
//}
|
|
//http_init_server(on_joystick_url);
|
|
|
|
|
|
//==============================
|
|
//===== start mdns service =====
|
|
//==============================
|
|
//function that initializes and starts mdns server for host discovery
|
|
void start_mdns_service();
|
|
|
|
|
|
//============================
|
|
//===== stop http server =====
|
|
//============================
|
|
//function that destroys the http server
|
|
void http_stop_server(httpd_handle_t * httpServer);
|
|
|
|
|
|
//==============================
|
|
//===== httpJoystick class =====
|
|
//==============================
|
|
//class that receices that from a HTTP post request, generates and scales joystick data and provides the data in a queue
|
|
|
|
//struct with configuration parameters
|
|
typedef struct httpJoystick_config_t {
|
|
float toleranceZeroX_Per;//percentage around joystick axis the coordinate snaps to 0
|
|
float toleranceZeroY_Per;
|
|
float toleranceEndPer; //percentage before joystick end the coordinate snaps to 1/-1
|
|
uint32_t timeoutMs; //time no new data was received before the motors get turned off
|
|
} httpJoystick_config_t;
|
|
|
|
|
|
class httpJoystick{
|
|
public:
|
|
//--- constructor ---
|
|
httpJoystick(httpJoystick_config_t config_f);
|
|
|
|
//--- functions ---
|
|
joystickData_t getData(); //wait for and return joystick data from queue, if timeout return CENTER
|
|
|
|
esp_err_t receiveHttpData(httpd_req_t *req); //function that is called when data is received with post request at /api/joystick
|
|
|
|
private:
|
|
//--- variables ---
|
|
httpJoystick_config_t config;
|
|
QueueHandle_t joystickDataQueue = xQueueCreate( 1, sizeof( struct joystickData_t ) );
|
|
//struct for receiving data from http function, and storing data of last update
|
|
joystickData_t dataRead;
|
|
const joystickData_t dataCenter = {
|
|
.position = joystickPos_t::CENTER,
|
|
.x = 0,
|
|
.y = 0,
|
|
.radius = 0,
|
|
.angle = 0
|
|
};
|
|
}; |