Skip to content

Allow COM-port numbers >= 10 (#25) #26

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
Discriminator merged 1 commit into from
Apr 14, 2026
Merged

Allow COM-port numbers >= 10 (#25) #26

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
21 changes: 11 additions & 10 deletions utils/rs232.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,24 @@ BYTE byRS232Data[SLICER_BUFSIZE * (sizeof(WORD) + sizeof(BYTE))] ;

#define assert(a) if(!(a)) { OUTPUTDEBUGMSG(("SIMULATE ASSERT in file %s at %d\n", __FILE__, __LINE__ )); }

int rs232_connect(SLICER_IN_STR *pInSlicer, SLICER_OUT_STR *pOutSlicer)
int rs232_connect(const SLICER_IN_STR *pInSlicer, SLICER_OUT_STR *pOutSlicer)
{
extern double ct1600;
int rc = RS232_NO_DUT;
char pcComPort[] = "COM1:";
DCB m_comDCB = { 0 } ;
COMMPROP ComProp = { 0 } ;
COMMTIMEOUTS ComTimeOuts = { 0 } ;
char pcComPort[32] = "COM1:";
DCB m_comDCB = {} ;
COMMPROP ComProp = {} ;
COMMTIMEOUTS ComTimeOuts = {} ;

// This as user can switch to slicer/rs232 without ports are close/opened (yet)
bOrgcomPortRS232 = Profile.comPortRS232 ;
if(pInSlicer->com_port > 9) {
sprintf(pcComPort, "\\\\.\\COM%d", pInSlicer->com_port) ;
_snprintf(pcComPort, sizeof(pcComPort) - 1, R"(\\.\COM%d)", pInSlicer->com_port) ;
pcComPort[sizeof(pcComPort) - 1] = '\0';
}
else {
sprintf(pcComPort, "COM%d", pInSlicer->com_port) ;
_snprintf(pcComPort, sizeof(pcComPort) - 1, "COM%d", pInSlicer->com_port) ;
pcComPort[sizeof(pcComPort) - 1] = '\0';
}

switch (Profile.comPortRS232)
Expand Down Expand Up @@ -319,9 +321,8 @@ BOOL m_bConnectedToComport2 = FALSE;
int OpenComPort(void)
{
int rc = RS232_NO_DUT;
char pcComPort[] = "COM1:";
DCB m_comDCB = { 0 } ;
COMMPROP ComProp = { 0 } ;
char pcComPort[32] = "COM1:";
DCB m_comDCB = {} ;

OUTPUTDEBUGMSG((("calling: OpenComPort()\n")));

Expand Down
2 changes: 1 addition & 1 deletion utils/rs232.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@



EXTERN_C int rs232_connect(SLICER_IN_STR *pInSlicer, SLICER_OUT_STR *pOutSlicer);
EXTERN_C int rs232_connect(const SLICER_IN_STR *pInSlicer, SLICER_OUT_STR *pOutSlicer);
EXTERN_C int rs232_transmit_data(unsigned char buffer[], int nBytes);
EXTERN_C int rs232_get_rx_data(unsigned char buffer[], int nBytes);
EXTERN_C int rs232_disconnect(void);
Expand Down
Loading