j/cable-length-cutter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add display-messages: cutting, countdown to cut

Browse Source
This commit is contained in:
jonny_ji7 2022-09-19 17:38:26 +02:00
parent 6dfa47e3e8
commit 8a265c2bae
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
main/control.cpp
View File

@ -339,6 +339,7 @@ void task_control(void *pvParameter)
} }
//- trigger cut if delay passed - //- trigger cut if delay passed -
if (cut_msRemaining <= 0){ if (cut_msRemaining <= 0){
cut_msRemaining = 0; //prevent negative number on display
cutter_start(); cutter_start();
changeState(systemState_t::CUTTING); changeState(systemState_t::CUTTING);
} }
@ -424,12 +425,18 @@ void task_control(void *pvParameter)
//-------------------------- //--------------------------
//run handle function //run handle function
displayTop.handle(); displayTop.handle();
//show current position on display //indicate upcoming cut when pending
sprintf(buf_tmp, "1ST %5.4f", (float)lengthNow/1000); if (controlState == systemState_t::TARGET_REACHED && SW_AUTO_CUT.state == true){
// 123456789 displayTop.blinkStrings(" CUT 1N ", " ", 100, 30);
//limit length to 8 digits + decimal point (drop decimal places when it does not fit) }
sprintf(buf_disp1, "%.9s", buf_tmp); //otherwise show current position
displayTop.showString(buf_disp1); else {
sprintf(buf_tmp, "1ST %5.4f", (float)lengthNow/1000);
// 123456789
//limit length to 8 digits + decimal point (drop decimal places when it does not fit)
sprintf(buf_disp1, "%.9s", buf_tmp);
displayTop.showString(buf_disp1);
}
//-------------------------- //--------------------------
@ -438,7 +445,7 @@ void task_control(void *pvParameter)
//run handle function //run handle function
displayBot.handle(); displayBot.handle();
//setting target length: blink target length //setting target length: blink target length
if (SW_SET.state == true){ if (SW_SET.state == true) {
sprintf(buf_tmp, "S0LL%5.3f", (float)lengthTarget/1000); sprintf(buf_tmp, "S0LL%5.3f", (float)lengthTarget/1000);
displayBot.blinkStrings(buf_tmp, "S0LL ", 300, 100); displayBot.blinkStrings(buf_tmp, "S0LL ", 300, 100);
} }
@ -446,6 +453,15 @@ void task_control(void *pvParameter)
else if (controlState == systemState_t::MANUAL) { else if (controlState == systemState_t::MANUAL) {
displayBot.blinkStrings(" MANUAL ", buf_disp2, 400, 800); displayBot.blinkStrings(" MANUAL ", buf_disp2, 400, 800);
} }
//notify that cutter is active
else if (cutter_isRunning()) {
displayBot.blinkStrings("CUTT1NG..", "CUTT1NG ", 100, 100);
}
//show ms countdown to cut when pending
else if (controlState == systemState_t::TARGET_REACHED && SW_AUTO_CUT.state == true) {
sprintf(buf_disp2, " %03d ", cut_msRemaining);
displayBot.showString(buf_disp2);
}
//otherwise show target length //otherwise show target length
else { else {
//sprintf(buf_disp2, "%06.1f cm", (float)lengthTarget/10); //cm //sprintf(buf_disp2, "%06.1f cm", (float)lengthTarget/10); //cm