Removed merge conflict markers
This commit is contained in:
parent
de8c9f18ec
commit
5a69a3dc47
|
@ -41,7 +41,7 @@ void loop() {
|
|||
Serial.print("X Pos");
|
||||
Serial.println(myData.Xposition);
|
||||
if (myData.Yposition >= 700) {
|
||||
>>>>>>> Structs
|
||||
|
||||
digitalWrite(3, 1);
|
||||
digitalWrite(2, 0);
|
||||
digitalWrite(4, 0);
|
||||
|
@ -63,7 +63,6 @@ void loop() {
|
|||
digitalWrite(A4, 1);
|
||||
}
|
||||
if (myData.Xposition >= 700){
|
||||
>>>>>>> Structs
|
||||
digitalWrite(3, 1);
|
||||
digitalWrite(2, 0);
|
||||
digitalWrite(4, 1);
|
||||
|
|
|
@ -8,7 +8,7 @@ struct dataStruct {
|
|||
int Yposition;
|
||||
|
||||
} myData;
|
||||
>>>>>>> Structs
|
||||
|
||||
void setup() {
|
||||
radio.begin();
|
||||
radio.setPALevel(RF24_PA_MAX);
|
||||
|
@ -17,7 +17,6 @@ void setup() {
|
|||
radio.stopListening();
|
||||
Serial.begin(9600);
|
||||
|
||||
>>>>>>> Structs
|
||||
}
|
||||
|
||||
void loop() {
|
||||
|
@ -27,5 +26,4 @@ void loop() {
|
|||
myData.Yposition = analogRead(1);
|
||||
radio.write(&myData, sizeof(myData), 1);
|
||||
delay(10);
|
||||
>>>>>>> Structs
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue