3cb5bc410b
- Create http.cpp and http.hpp
- functions for initializing a http server
- function for URL api/joystick
- receive joystick data from http post request
- parse json, define joystick position (function from joystick.hpp)
- send data to control task via queue
- control.hpp/cpp:
- add HTTP mode to handle loop
- receive joystick commands from queue, generate commands, send to
motorctl
- upgrade changeMode function with ability to run functions at switch
FROM and TO certain modes
- add code to start/stop wifi and webserver when switching to/from
HTTP mode
- change toggleModes and toggleIdle to use the changeMode function
- main.cpp:
- add several sections with code for testing new functions (commented
out)
- add http loglevel
- buzzer.cpp:
- add command (press 4 times) to toggle between HTTP and JOYSTICK mode
FIXME: moved initialization of wifi to main.cpp at startup because of an
error -> resolve this and place wifi start and stop functions into
mode-change as intended
currently works best in accesspoint mode with laptop connected using the
react-webapp
118 lines
3.7 KiB
C++
118 lines
3.7 KiB
C++
extern "C"
|
|
{
|
|
#include <stdio.h>
|
|
#include <esp_system.h>
|
|
#include <esp_event.h>
|
|
#include "freertos/FreeRTOS.h"
|
|
#include "esp_log.h"
|
|
}
|
|
|
|
#include "button.hpp"
|
|
|
|
|
|
|
|
//tag for logging
|
|
static const char * TAG = "button";
|
|
|
|
|
|
|
|
//-----------------------------
|
|
//-------- constructor --------
|
|
//-----------------------------
|
|
buttonCommands::buttonCommands(gpio_evaluatedSwitch * button_f, controlledArmchair * control_f, buzzer_t * buzzer_f ){
|
|
//copy object pointers
|
|
button = button_f;
|
|
control = control_f;
|
|
buzzer = buzzer_f;
|
|
//TODO declare / configure evaluatedSwitch here instead of config (unnecessary that button object is globally available - only used here)?
|
|
}
|
|
|
|
|
|
|
|
//----------------------------
|
|
//--------- action -----------
|
|
//----------------------------
|
|
//function that runs commands depending on a count value
|
|
void buttonCommands::action (uint8_t count){
|
|
switch (count){
|
|
//no such command
|
|
default:
|
|
ESP_LOGE(TAG, "no command for count=%d defined", count);
|
|
buzzer->beep(3, 400, 100);
|
|
break;
|
|
|
|
case 1:
|
|
ESP_LOGW(TAG, "running command for count 1");
|
|
buzzer->beep(1,500,1);
|
|
break;
|
|
|
|
case 2:
|
|
ESP_LOGW(TAG, "cmd %d: toggle IDLE", count);
|
|
control->toggleIdle(); //toggle between idle and previous/default mode
|
|
break;
|
|
|
|
case 4:
|
|
ESP_LOGW(TAG, "cmd %d: toggle between HTTP and JOYSTICK", count);
|
|
control->toggleModes(controlMode_t::HTTP, controlMode_t::JOYSTICK); //toggle between HTTP and JOYSTICK mode
|
|
break;
|
|
|
|
case 6:
|
|
ESP_LOGW(TAG, "cmd %d: toggle between MASSAGE and JOYSTICK", count);
|
|
control->toggleModes(controlMode_t::MASSAGE, controlMode_t::JOYSTICK); //toggle between MASSAGE and JOYSTICK mode
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
//-----------------------------
|
|
//------ startHandleLoop ------
|
|
//-----------------------------
|
|
//this function has to be started once in a separate task
|
|
//repeatedly evaluates and processes button events then takes the corresponding action
|
|
void buttonCommands::startHandleLoop() {
|
|
|
|
while(1) {
|
|
vTaskDelay(20 / portTICK_PERIOD_MS);
|
|
//run handle function of evaluatedSwitch object
|
|
button->handle();
|
|
|
|
//--- count button presses and run action ---
|
|
switch(state) {
|
|
case inputState_t::IDLE: //wait for initial button press
|
|
if (button->risingEdge) {
|
|
count = 1;
|
|
buzzer->beep(1, 60, 0);
|
|
timestamp_lastAction = esp_log_timestamp();
|
|
state = inputState_t::WAIT_FOR_INPUT;
|
|
ESP_LOGI(TAG, "first button press detected -> waiting for further events");
|
|
}
|
|
break;
|
|
|
|
case inputState_t::WAIT_FOR_INPUT: //wait for further presses
|
|
//button pressed again
|
|
if (button->risingEdge){
|
|
count++;
|
|
buzzer->beep(1, 60, 0);
|
|
timestamp_lastAction = esp_log_timestamp();
|
|
ESP_LOGI(TAG, "another press detected -> count=%d -> waiting for further events", count);
|
|
}
|
|
//timeout
|
|
else if (esp_log_timestamp() - timestamp_lastAction > 1000) {
|
|
state = inputState_t::IDLE;
|
|
buzzer->beep(count, 50, 50);
|
|
//TODO: add optional "bool wait" parameter to beep function to delay until finished beeping
|
|
//run action function with current count of button presses
|
|
ESP_LOGI(TAG, "timeout - running action function for count=%d", count);
|
|
action(count);
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|