Compare commits

..

No commits in common. "main" and "beta" have entirely different histories.
main ... beta

3 changed files with 3 additions and 6 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 423 KiB

View File

@ -16,7 +16,6 @@ Adafruit_SSD1306 display(SCREEN_WIDTH, SCREEN_HEIGHT, &Wire, OLED_RESET);
#define pin1_LASERTYPE 12 #define pin1_LASERTYPE 12
#define pin2_LASERTYPE 14 #define pin2_LASERTYPE 14
#define pin3_LASERTYPE 27
#define pin_MODE 13 #define pin_MODE 13
#define pin_RXD1 5 #define pin_RXD1 5
@ -71,13 +70,13 @@ void setup()
Serial.println("Lasertype set to : Linx 500SL - baudrate 19k2"); Serial.println("Lasertype set to : Linx 500SL - baudrate 19k2");
//init serial ports //init serial ports
MySerial1.begin(19200, SERIAL_8N1, pin_RXD1, pin_TXD1); MySerial1.begin(19200, SERIAL_8N1, pin_RXD1, pin_TXD1);
MySerial2.begin(19200, SERIAL_8N1, pin_RXD2, pin_TXD2); MySerial2.begin(19200, SERIAL_8N1, pin_RXD1, pin_TXD2);
} }
else { else {
Serial.println("Lasertype set to : Linx ??? - baudrate 9600"); Serial.println("Lasertype set to : Linx ??? - baudrate 9600");
//init serial ports //init serial ports
MySerial1.begin(9600, SERIAL_8N1, pin_RXD1, pin_TXD1); MySerial1.begin(9600, SERIAL_8N1, pin_RXD1, pin_TXD1);
MySerial2.begin(9600, SERIAL_8N1, pin_RXD2, pin_TXD2); MySerial2.begin(9600, SERIAL_8N1, pin_RXD1, pin_TXD2);
} }
//init I2C Display //init I2C Display
@ -145,7 +144,6 @@ void loop()
if (MySerial1.available() > 0) { if (MySerial1.available() > 0) {
// read the incoming byte: // read the incoming byte:
incomingByte = MySerial1.read(); incomingByte = MySerial1.read();
MySerial2.write(incomingByte);
// say what you got: // say what you got:
Serial.print("P1 received: "); Serial.print("P1 received: ");
@ -155,7 +153,6 @@ void loop()
if (MySerial2.available() > 0) { if (MySerial2.available() > 0) {
// read the incoming byte: // read the incoming byte:
incomingByte = MySerial2.read(); incomingByte = MySerial2.read();
MySerial1.write(incomingByte);
// say what you got: // say what you got:
Serial.print("P2 received: "); Serial.print("P2 received: ");

View File

@ -33,7 +33,7 @@ void SL500_generate_code()
delay(5000); delay(5000);
// ik even geen laser heb ;-) // ik even geen laser heb ;-)
// SL500_watchdog_send = true; SL500_watchdog_send = true;
} }
else { else {
Linx500SL_SendCode(); Linx500SL_SendCode();