-
Notifications
You must be signed in to change notification settings - Fork 1
drs changes inshallah #27
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.
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
Open
MOABDeveloper
wants to merge
1
commit into
main
Choose a base branch
from
DRS
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| idf_component_register(SRCS "RearECU.cpp" "BMS.cpp" "Inverter.cpp" "Pedals.cpp" "Devices.cpp" "pwm.cpp" | ||
| idf_component_register(SRCS "RearECU.cpp" "BMS.cpp" "Inverter.cpp" "Pedals.cpp" "Devices.cpp" "pwm.cpp" "DRS.cpp" | ||
| INCLUDE_DIRS "." | ||
| REQUIRES CAN IO Sensors) |
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't send CAN stuff raw like this. I already have a CAN abstraction that you should be using. If you send me the servo data sheet I can work it in in a way that makes sense. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| #include "DRS.hpp" | ||
| #include "CAN_Config.hpp" | ||
| #include "esp_log.h" | ||
|
|
||
| static const char* TAG = "DRS"; | ||
|
|
||
| static void send_servo(bool open) { | ||
| uint16_t position = open ? DRS::POSITION_OPEN : DRS::POSITION_CLOSED; | ||
| uint8_t lo = position & 0xFF; | ||
| uint8_t hi = (position >> 8) & 0xFF; | ||
|
|
||
| twai_message_t msg = {}; | ||
| msg.identifier = 0; | ||
| msg.extd = 0; | ||
| msg.data_length_code = 5; | ||
| msg.data[0] = 'w'; | ||
| msg.data[1] = 0; | ||
| msg.data[2] = 0x1E; | ||
| msg.data[3] = lo; | ||
| msg.data[4] = hi; | ||
|
|
||
| twai_transmit(&msg, pdMS_TO_TICKS(10)); | ||
| } | ||
|
|
||
| void DRS::init() { | ||
| send_servo(false); // start closed | ||
| ESP_LOGI(TAG, "DRS initialised — wing CLOSED"); | ||
| } | ||
|
|
||
| void DRS::update() { | ||
| bool open = DRS_Request_ID103.get_bool(); | ||
| send_servo(open); | ||
| ESP_LOGD(TAG, ">DRS_open:%d", open); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| #pragma once | ||
| #include "driver/twai.h" | ||
|
|
||
| namespace DRS { | ||
| // Servo position values — calibrate to your actual wing travel | ||
| constexpr uint16_t POSITION_OPEN = 10922; // REG_POSITION_MAX_LIMIT default | ||
| constexpr uint16_t POSITION_CLOSED = 5462; // REG_POSITION_MIN_LIMIT default | ||
|
|
||
| void init(); | ||
| void update(); // call this in the RearECU loop | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need to add the steering wheel message to the CAN_Rx list at the bottom of the file too so that it actually get's processed.