From 1d3fd3b5ff1ab4fa7a06b2243437d9ec793db3a8 Mon Sep 17 00:00:00 2001 From: peterso Date: Sun, 4 May 2025 00:03:33 +0000 Subject: [PATCH] removal of buttons never installed --- .../hal/board/TaskBoardDriver_TBv2025.hpp | 31 +++---------------- idf/taskboard/main/main_core0.cpp | 2 +- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/idf/taskboard/main/hal/board/TaskBoardDriver_TBv2025.hpp b/idf/taskboard/main/hal/board/TaskBoardDriver_TBv2025.hpp index 90023f7..6f19240 100644 --- a/idf/taskboard/main/hal/board/TaskBoardDriver_TBv2025.hpp +++ b/idf/taskboard/main/hal/board/TaskBoardDriver_TBv2025.hpp @@ -105,7 +105,7 @@ struct TaskBoardDriver_v1 : return SensorMeasurement(value); }); - Sensor* ball_goal_4 = new Sensor("BALL_GOAL_4", [&]() + Sensor* stylus_on_stand = new Sensor("STYLUS_ON_STAND", [&]() { bool value = hardware_low_level_controller_.pb_hub_controller_1.read_digital_IO0(PbHubController::Channel:: @@ -123,24 +123,6 @@ struct TaskBoardDriver_v1 : return SensorMeasurement(!value); // Button is inverted }); - Sensor* red_button_left = new Sensor("RED_BUTTON_LEFT", [&]() - { - bool value = - hardware_low_level_controller_.pb_hub_controller_2.read_digital_IO1(PbHubController::Channel:: - CHANNEL_0); - - return SensorMeasurement(!value); // Button is inverted - }); - - Sensor* blue_button_right = new Sensor("BLUE_BUTTON_RIGHT", [&]() - { - bool value = - hardware_low_level_controller_.pb_hub_controller_2.read_digital_IO1(PbHubController::Channel:: - CHANNEL_1); - - return SensorMeasurement(!value); // Button is inverted - }); - Sensor* red_button_right = new Sensor("RED_BUTTON_RIGHT", [&]() { bool value = @@ -240,10 +222,8 @@ struct TaskBoardDriver_v1 : sensors_.push_back(ball_goal_1); sensors_.push_back(ball_goal_2); sensors_.push_back(ball_goal_3); - sensors_.push_back(ball_goal_4); + sensors_.push_back(stylus_on_stand); sensors_.push_back(blue_button_left); - sensors_.push_back(red_button_left); - sensors_.push_back(blue_button_right); sensors_.push_back(red_button_right); sensors_.push_back(on_board_button_a); sensors_.push_back(on_board_button_b); @@ -350,7 +330,7 @@ struct TaskBoardDriver_v1 : new TaskStepActuator(*all_goal_leds, Actuator::State::OFF), new TaskStepActuator(*ball_drop_solenoid, Actuator::State::OFF), new TaskStepEqual(*get_sensor_by_name("BALL_GOAL_1"), SensorMeasurement(true)), - new TaskStepEqual(*get_sensor_by_name("BALL_GOAL_4"), SensorMeasurement(true)), + new TaskStepEqual(*get_sensor_by_name("STYLUS_ON_STAND"), SensorMeasurement(true)), new TaskStepEqual(*get_sensor_by_name("RED_BUTTON_RIGHT"), SensorMeasurement(true)), }; @@ -363,9 +343,8 @@ struct TaskBoardDriver_v1 : new TaskStepActuator(*blue_button_led, Actuator::State::OFF), new TaskStepEqual(*get_sensor_by_name("BLUE_BUTTON_LEFT"), SensorMeasurement(false)), new TaskStepActuator(*red_button_led, Actuator::State::LED_ON), - new TaskStepEqual(*get_sensor_by_name("BLUE_BUTTON_RIGHT"), SensorMeasurement(true)), + new TaskStepEqual(*get_sensor_by_name("RED_BUTTON_RIGHT"), SensorMeasurement(true)), new TaskStepActuator(*red_button_led, Actuator::State::OFF), - new TaskStepActuator(*all_goal_leds, Actuator::State::OFF), new TaskStepActuator(*goal_4_led, Actuator::State::LED_ON), new TaskStepTraceShapeFromPool(*get_sensor_by_name("TOUCH_SCREEN"), shape_pool), new TaskStepTraceShapeFromPool(*get_sensor_by_name("TOUCH_SCREEN"), shape_pool), @@ -390,7 +369,7 @@ struct TaskBoardDriver_v1 : new TaskStepEqual(*get_sensor_by_name("BALL_GOAL_3"), SensorMeasurement(true)), new TaskStepActuator(*goal_3_led, Actuator::State::OFF), new TaskStepActuator(*goal_4_led, Actuator::State::LED_ON), - new TaskStepEqual(*get_sensor_by_name("BALL_GOAL_4"), SensorMeasurement(true)), + new TaskStepEqual(*get_sensor_by_name("STYLUS_ON_STAND"), SensorMeasurement(true)), new TaskStepActuator(*goal_4_led, Actuator::State::OFF), }; diff --git a/idf/taskboard/main/main_core0.cpp b/idf/taskboard/main/main_core0.cpp index a5ffafb..3786fb8 100644 --- a/idf/taskboard/main/main_core0.cpp +++ b/idf/taskboard/main/main_core0.cpp @@ -145,7 +145,7 @@ extern "C" void app_main( const SensorReader& BUTTON_PWR = *task_board_driver.get_sensor_by_name("ON_BOARD_BUTTON_PWR"); const SensorReader& RED_BUTTON = nullptr != task_board_driver.get_sensor_by_name("RED_BUTTON") ? *task_board_driver.get_sensor_by_name("RED_BUTTON") : - *task_board_driver.get_sensor_by_name("RED_BUTTON_LEFT"); + *task_board_driver.get_sensor_by_name("RED_BUTTON_RIGHT"); const SensorReader& BLUE_BUTTON = nullptr != task_board_driver.get_sensor_by_name("BLUE_BUTTON") ? *task_board_driver.get_sensor_by_name("BLUE_BUTTON") : *task_board_driver.get_sensor_by_name("BLUE_BUTTON_LEFT");