Skip to content

Daniel/chromadeck solve updi yellow #275

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
merged 1 commit into from
Dec 27, 2024
Merged

Daniel/chromadeck solve updi yellow #275

Show file tree
Hide file tree
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
14 changes: 3 additions & 11 deletions VortexEngine/src/Menus/MenuList/EditorConnection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,16 +428,13 @@ void EditorConnection::handleState()
break;
}
UPDI::eraseMemory();


m_curStep = 0;
m_firmwareOffset = 0;
Leds::setAll(RGB_YELLOW3);
m_receiveBuffer.clear();
Leds::setAll(RGB_YELLOW3);
SerialComs::write(EDITOR_VERB_READY);
// TODO: this god awful delay idk why it's necessary but without
// it the serial seems to get stuck. It appears like an esp internals
// issue with serial but maybe this logic is just buggy -- it runs fine
// when simulated in test framework connected to editor though
Time::delayMilliseconds(300);
m_state = STATE_CHROMALINK_FLASH_FIRMWARE_RECEIVE;
break;
case STATE_CHROMALINK_FLASH_FIRMWARE_RECEIVE:
Expand All @@ -447,11 +444,6 @@ void EditorConnection::handleState()
}
// send ack
SerialComs::write(EDITOR_VERB_FLASH_FIRMWARE_ACK);
// TODO: this god awful delay idk why it's necessary but without
// it the serial seems to get stuck. It appears like an esp internals
// issue with serial but maybe this logic is just buggy -- it runs fine
// when simulated in test framework connected to editor though
Time::delayMilliseconds(5);
// only once the entire firmware is written
if (m_firmwareOffset >= m_firmwareSize) {
// then done
Expand Down
7 changes: 3 additions & 4 deletions VortexEngine/src/UPDI/updi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,12 +720,12 @@ void UPDI::enterProgrammingMode()
stcs(Control_A, 0x6);
mode = cpu_mode<0xEF>();
if (mode != 0x82 && mode != 0x21 && mode != 0xA2 && mode != 0x08) {
sendDoubleBreak();
//sendDoubleBreak();
sendBreak();
uint8_t status = ldcs(Status_B);
ERROR_LOGF("Bad CPU Mode 0x%02x... error: 0x%02x", mode, status);
reset();
//reset();
continue;
//return false;
}
if (mode != 0x08) {
sendProgKey();
Expand All @@ -734,7 +734,6 @@ void UPDI::enterProgrammingMode()
ERROR_LOGF("Bad prog key status: 0x%02x", status);
reset();
continue;
//return false;
}
reset();
}
Expand Down