Bug Fixing
removed some Upsi
This commit is contained in:
parent
07003f05db
commit
a89c250b11
@ -16,7 +16,8 @@
|
|||||||
- digital Inputs
|
- digital Inputs
|
||||||
- digital Outputs
|
- digital Outputs
|
||||||
- Matrix Keypad
|
- Matrix Keypad
|
||||||
|
- Quadrature encoders
|
||||||
|
- Joysticks
|
||||||
|
|
||||||
The Send and receive Protocol is <Signal><PinNumber>:<Pin State>
|
The Send and receive Protocol is <Signal><PinNumber>:<Pin State>
|
||||||
To begin Transmitting Ready is send out and expects to receive E: to establish connection. Afterwards Data is exchanged.
|
To begin Transmitting Ready is send out and expects to receive E: to establish connection. Afterwards Data is exchanged.
|
||||||
@ -29,8 +30,8 @@
|
|||||||
Analog Inputs = 'A' -write only -Pin State: 0-1024
|
Analog Inputs = 'A' -write only -Pin State: 0-1024
|
||||||
Latching Potentiometers = 'L' -write only -Pin State: 0-max Position
|
Latching Potentiometers = 'L' -write only -Pin State: 0-max Position
|
||||||
binary encoded Selector = 'K' -write only -Pin State: 0-32
|
binary encoded Selector = 'K' -write only -Pin State: 0-32
|
||||||
rotary encoder = 'R' -write only -Pin State: up/ down / -32768 to 32767
|
rotary encoder = 'R' -write only -Pin State: up/ down / -2147483648 to 2147483647
|
||||||
joystick = 'R' -write only -Pin State: up/ down / -32768 to 32767
|
joystick = 'R' -write only -Pin State: up/ down / -2147483648 to 2147483647
|
||||||
|
|
||||||
Keyboard Input:
|
Keyboard Input:
|
||||||
Matrix Keypad = 'M' -write only -Pin State: Number of Matrix Key.
|
Matrix Keypad = 'M' -write only -Pin State: Number of Matrix Key.
|
||||||
@ -63,7 +64,7 @@ Communication Status = 'E' -read/Write -Pin State: 0:0
|
|||||||
//###################################################IO's###################################################
|
//###################################################IO's###################################################
|
||||||
|
|
||||||
|
|
||||||
#define INPUTS //Use Arduino IO's as Inputs. Define how many Inputs you want in total and then which Pins you want to be Inputs.
|
//#define INPUTS //Use Arduino IO's as Inputs. Define how many Inputs you want in total and then which Pins you want to be Inputs.
|
||||||
#ifdef INPUTS
|
#ifdef INPUTS
|
||||||
const int Inputs = 5; //number of inputs using internal Pullup resistor. (short to ground to trigger)
|
const int Inputs = 5; //number of inputs using internal Pullup resistor. (short to ground to trigger)
|
||||||
int InPinmap[] = {52,38,39,40,41};
|
int InPinmap[] = {52,38,39,40,41};
|
||||||
@ -259,7 +260,7 @@ Adafruit_NeoPixel strip(DLEDcount, DLEDPin, NEO_GRB + NEO_KHZ800);//Color sequen
|
|||||||
Matrix Keypads are supported. The input is NOT added as HAL Pin to LinuxCNC. Instead it is inserted to Linux as Keyboard direktly.
|
Matrix Keypads are supported. The input is NOT added as HAL Pin to LinuxCNC. Instead it is inserted to Linux as Keyboard direktly.
|
||||||
So you could attach a QWERT* Keyboard to the arduino and you will be able to write in Linux with it (only while LinuxCNC is running!)
|
So you could attach a QWERT* Keyboard to the arduino and you will be able to write in Linux with it (only while LinuxCNC is running!)
|
||||||
*/
|
*/
|
||||||
#define KEYPAD
|
//#define KEYPAD
|
||||||
#ifdef KEYPAD
|
#ifdef KEYPAD
|
||||||
const int numRows = 4; // Define the number of rows in the matrix
|
const int numRows = 4; // Define the number of rows in the matrix
|
||||||
const int numCols = 4; // Define the number of columns in the matrix
|
const int numCols = 4; // Define the number of columns in the matrix
|
||||||
@ -550,20 +551,26 @@ void readEncoders(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void comalive(){
|
void comalive(){
|
||||||
#ifdef STATUSLED
|
#ifdef STATUSLED
|
||||||
if(millis() - lastcom > timeout){
|
if(millis() - lastcom > timeout){
|
||||||
StatLedErr(500,200);
|
StatLedErr(500,200);
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
if(DLEDSTATUSLED){controlDLED(StatLedPin, 1);}
|
#ifdef DLED
|
||||||
else{digitalWrite(StatLedPin, HIGH);}
|
controlDLED(StatLedPin, 1);
|
||||||
|
#endif
|
||||||
|
#ifndef DLED
|
||||||
|
digitalWrite(StatLedPin, HIGH);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void sendData(char sig, int pin, int state){
|
void sendData(char sig, int pin, int state){
|
||||||
Serial.print(sig);
|
Serial.print(sig);
|
||||||
Serial.print(pin);
|
Serial.print(pin);
|
||||||
@ -582,14 +589,22 @@ void StatLedErr(int offtime, int ontime){
|
|||||||
unsigned long newMillis = millis();
|
unsigned long newMillis = millis();
|
||||||
|
|
||||||
if (newMillis - oldmillis >= offtime){
|
if (newMillis - oldmillis >= offtime){
|
||||||
|
#ifdef DLED
|
||||||
if(DLEDSTATUSLED){controlDLED(StatLedPin, 1);}
|
controlDLED(StatLedPin, 1);
|
||||||
else{digitalWrite(StatLedPin, HIGH);}
|
#endif
|
||||||
|
#ifndef DLED
|
||||||
|
digitalWrite(StatLedPin, HIGH);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
if (newMillis - oldmillis >= offtime+ontime){{
|
if (newMillis - oldmillis >= offtime+ontime){{
|
||||||
if(DLEDSTATUSLED){controlDLED(StatLedPin, 0);}
|
#ifdef DLED
|
||||||
else{digitalWrite(StatLedPin, LOW);}
|
controlDLED(StatLedPin, 0)
|
||||||
|
#endif
|
||||||
|
#ifndef DLED
|
||||||
|
digitalWrite(StatLedPin, LOW);
|
||||||
|
#endif
|
||||||
oldmillis = newMillis;
|
oldmillis = newMillis;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user