Skip to content

Fix task step touch goal success conditions #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterso merged 1 commit into from
May 5, 2025
Merged

Fix task step touch goal success conditions #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 37 additions & 19 deletions idf/taskboard/main/task/TaskStepTouchGoalFromPool.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,9 @@ struct TaskStepTouchGoalFromPool :
goal_ = goal_pool_->at(0);
goal_pool_->erase(goal_pool_->begin());

step_started_ = false;
initial_time_ = esp_timer_get_time();
last_touching_ = false;
tap_count_ = 0;

measured_path_.clear();
}
Expand All @@ -92,43 +93,61 @@ struct TaskStepTouchGoalFromPool :
sensor_value_aux.get_vector3().y * 240.0f / 100.0f,
sensor_value_aux.get_vector3().z};
bool pressing_screen = (sensor_value.z != 0);
if (!step_started_)

if (pressing_screen)
{
if (pressing_screen)
// Save the value
measured_path_.push_back(sensor_value);

// Update the timer for the first tap
if (tap_count_ == 0)
{
step_started_ = true;
first_tap_start_time_ = esp_timer_get_time();
first_tap_duration_ = 0;
tap_count_ = 0;
ESP_LOGI(TAG, "Step started");
}
}
else
{
if (pressing_screen)
else if (tap_count_ == 1)
{
measured_path_.push_back(sensor_value);
first_tap_duration_ = esp_timer_get_time() - first_tap_start_time_;
}
}

if (pressing_screen && !last_touching_)
{
tap_count_++;
ESP_LOGI(TAG, "Tap count: %d", tap_count_);
if (tap_count_ == 1)
// Update the tap count
if (!last_touching_)
{
first_tap_duration_ = esp_timer_get_time() - first_tap_start_time_;
tap_count_++;
ESP_LOGI(TAG, "Tap count: %d", tap_count_);
}
}

last_touching_ = pressing_screen;

// Check if the time limit has been reached+
// Check for success conditions
if (esp_timer_get_time() - initial_time_ > TIMEOUT_LIMIT)
{
// The time limit has been reached
ESP_LOGI(TAG, "Time limit reached");
return true;
}
else if (!pressing_screen)
{
// Has the tap count been reached?
int tap_count_limit = (goal_ == DoubleTapAGoal ||
goal_ == DoubleTapBGoal ||
goal_ == DoubleTapBackgroundGoal) ? 2 : 1;

if(tap_count_ >= tap_count_limit)
{
ESP_LOGI(TAG, "Step finished");
return true;
}
}
else if (first_tap_duration_ > 2000000)
{
// A long press has been detected
ESP_LOGI(TAG, "Long press detected");
tap_count_ = 1;
return true;
}

return false;
}
Expand Down Expand Up @@ -530,7 +549,6 @@ struct TaskStepTouchGoalFromPool :
}

mutable TouchGoalType goal_; ///< Shape type to be traced
mutable bool step_started_ = 0; ///< Flag to indicate if the step has started
mutable std::vector<SensorMeasurement>measured_path_ = {}; ///< Path measured
mutable int64_t initial_time_ = 0; ///< Time when the step started
mutable int tap_count_ = 0; ///< Number of taps detected
Expand Down