Ton/LinuxCNC_ArduinoConnector
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tidy up

Browse Source
This commit is contained in:
Alexander Richter 2023-05-02 16:20:24 +02:00
parent e72e94b94b
commit a153af176e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LinuxCNC_ArduinoConnector.ino
View File

@ -652,7 +652,7 @@ void commandReceived(char cmd, uint16_t io, uint16_t value){
#endif #endif
} }
//This Funktion checks if Received Command is valid. Insert your custom Letter here by inserting another "||cmd == 'X'" //This Funktion checks if Received Command is valid. Insert your custom Letter here by inserting another , for example: "||cmd == 'X'"
int isCmdChar(char cmd){ int isCmdChar(char cmd){
if(cmd == 'O'||cmd == 'P'||cmd == 'E'||cmd == 'D') {return true;} if(cmd == 'O'||cmd == 'P'||cmd == 'E'||cmd == 'D') {return true;}
else{return false;} else{return false;}

14
arduino.py
View File

@ -98,7 +98,7 @@ DLEDcount = 8
# You can specify special Charakters however, which will be handled as Inputs in LinuxCNC. Define those in the LCNC Array below. # You can specify special Charakters however, which will be handled as Inputs in LinuxCNC. Define those in the LCNC Array below.
UseMatrix = 1 Keypad = 1
LinuxKeyboardInput = 1 #Activate direct Keyboard integration to Linux. This requires you to install and test "xdotool". LinuxKeyboardInput = 1 #Activate direct Keyboard integration to Linux. This requires you to install and test "xdotool".
#You can install it by typing "sudo apt install xdotool" in your console. After installing "xdotool type "Hello World" should return Hello World in the Terminal. #You can install it by typing "sudo apt install xdotool" in your console. After installing "xdotool type "Hello World" should return Hello World in the Terminal.
# If it doesn't, something is not working and this program will not work either. Please get xdotool working first. # If it doesn't, something is not working and this program will not work either. Please get xdotool working first.
@ -177,12 +177,12 @@ if DLEDcount > 0:
c.newpin("DLED.{}".format(port), hal.HAL_BIT, hal.HAL_IN) c.newpin("DLED.{}".format(port), hal.HAL_BIT, hal.HAL_IN)
# setup MatrixKeyboard halpins # setup MatrixKeyboard halpins
if UseMatrix > 0: if Keypad > 0:
for port in range(Columns*Rows): for port in range(Columns*Rows):
if Destination[port] == 0 & LinuxKeyboardInput: if Destination[port] == 0 & LinuxKeyboardInput:
pass #if destination is set to Linux, don't register a Hal Pin for this key. pass #if destination is set to Linux, don't register a Hal Pin for this key.
else: else:
c.newpin("MKey.{}".format(Chars[port]), hal.HAL_BIT, hal.HAL_IN) c.newpin("Keypad.{}".format(Chars[port]), hal.HAL_BIT, hal.HAL_IN)
c.ready() c.ready()
#setup Serial connection #setup Serial connection
@ -317,12 +317,12 @@ while True:
subprocess.call(["xdotool", "key", Chars[io]]) subprocess.call(["xdotool", "key", Chars[io]])
if(Debug):print("Emulating Keypress{}".format(Chars[io])) if(Debug):print("Emulating Keypress{}".format(Chars[io]))
else: else:
c["MKey.{}".format(Chars[io])] = 1 c["Keypad.{}".format(Chars[io])] = 1
if(Debug):print("MKey{}:{}".format(Chars[io],1)) if(Debug):print("Keypad{}:{}".format(Chars[io],1))
if value == 0 & Destination[io] == 0: if value == 0 & Destination[io] == 0:
c["MKey.{}".format(Chars[io])] = 0 c["Keypad.{}".format(Chars[io])] = 0
if(Debug):print("MKey{}:{}".format(Chars[io],0)) if(Debug):print("Keypad{}:{}".format(Chars[io],0))