Tueflerclub/Radio_FahrzeugV2
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Removed merge conflict markers

Browse source
This commit is contained in:
DenialOfIntelligence 2023-06-27 18:07:14 +02:00
parent de8c9f18ec
commit 5a69a3dc47
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Receiver/Receiver.ino
View file

@ -41,7 +41,7 @@ void loop() {
Serial.print("X Pos"); Serial.print("X Pos");
Serial.println(myData.Xposition); Serial.println(myData.Xposition);
if (myData.Yposition >= 700) { if (myData.Yposition >= 700) {
>>>>>>> Structs
digitalWrite(3, 1); digitalWrite(3, 1);
digitalWrite(2, 0); digitalWrite(2, 0);
digitalWrite(4, 0); digitalWrite(4, 0);
@ -63,7 +63,6 @@ void loop() {
digitalWrite(A4, 1); digitalWrite(A4, 1);
} }
if (myData.Xposition >= 700){ if (myData.Xposition >= 700){
>>>>>>> Structs
digitalWrite(3, 1); digitalWrite(3, 1);
digitalWrite(2, 0); digitalWrite(2, 0);
digitalWrite(4, 1); digitalWrite(4, 1);

4
Transceiver/Transceiver.ino
View file

@ -8,7 +8,7 @@ struct dataStruct {
int Yposition; int Yposition;
} myData; } myData;
>>>>>>> Structs
void setup() { void setup() {
radio.begin(); radio.begin();
radio.setPALevel(RF24_PA_MAX); radio.setPALevel(RF24_PA_MAX);
@ -17,7 +17,6 @@ void setup() {
radio.stopListening(); radio.stopListening();
Serial.begin(9600); Serial.begin(9600);
>>>>>>> Structs
} }
void loop() { void loop() {
@ -27,5 +26,4 @@ void loop() {
myData.Yposition = analogRead(1); myData.Yposition = analogRead(1);
radio.write(&myData, sizeof(myData), 1); radio.write(&myData, sizeof(myData), 1);
delay(10); delay(10);
>>>>>>> Structs
} }