Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-27 02:01:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[hal] Use better error for when console out is enabled while attempting to use onboard serial port (#3622)

Browse Source
This commit is contained in:
Thad House
2021-10-10 15:52:50 -07:00
committed by GitHub
parent cc31079a11
commit d347928e4d
4 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hal/src/main/native/athena/HAL.cpp
View File

@@ -226,6 +226,8 @@ const char* HAL_GetErrorMessage(int32_t code) {
return HAL_INVALID_DMA_ADDITION_MESSAGE;
case HAL_USE_LAST_ERROR:
return HAL_USE_LAST_ERROR_MESSAGE;
case HAL_CONSOLE_OUT_ENABLED_ERROR:
return HAL_CONSOLE_OUT_ENABLED_ERROR_MESSAGE;
default:
return "Unknown error status";
}

3
hal/src/main/native/athena/SerialPort.cpp
View File

@@ -84,6 +84,9 @@ HAL_SerialPortHandle HAL_InitializeSerialPortDirect(HAL_SerialPort port,
serialPort->portId = open(portName, O_RDWR | O_NOCTTY);
if (serialPort->portId < 0) {
*status = errno;
if (*status == EACCES) {
*status = HAL_CONSOLE_OUT_ENABLED_ERROR;
}
serialPortHandles->Free(handle);
return HAL_kInvalidHandle;
}

5
hal/src/main/native/include/hal/Errors.h
View File

@@ -135,6 +135,11 @@
#define HAL_USE_LAST_ERROR_MESSAGE \
"HAL: Use HAL_GetLastError(status) to get last error"
#define HAL_CONSOLE_OUT_ENABLED_ERROR -1157
#define HAL_CONSOLE_OUT_ENABLED_ERROR_MESSAGE \
"HAL: Onboard serial port is requested, but Console Out is enabled. " \
"Disable Console Out using imaging tool"
#define HAL_CAN_BUFFER_OVERRUN -35007
#define HAL_CAN_BUFFER_OVERRUN_MESSAGE \
"HAL: CAN Output Buffer Full. Ensure a device is attached"

2
hal/src/main/native/sim/HAL.cpp
View File

@@ -251,6 +251,8 @@ const char* HAL_GetErrorMessage(int32_t code) {
return HAL_LED_CHANNEL_ERROR_MESSAGE;
case HAL_USE_LAST_ERROR:
return HAL_USE_LAST_ERROR_MESSAGE;
case HAL_CONSOLE_OUT_ENABLED_ERROR:
return HAL_CONSOLE_OUT_ENABLED_ERROR_MESSAGE;
default:
return "Unknown error status";
}