diff --git a/wpilibc/src/main/native/cpp/ADXL345_I2C.cpp b/wpilibc/src/main/native/cpp/ADXL345_I2C.cpp index a760daaff3..aff0802e32 100644 --- a/wpilibc/src/main/native/cpp/ADXL345_I2C.cpp +++ b/wpilibc/src/main/native/cpp/ADXL345_I2C.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2020 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -21,7 +21,7 @@ ADXL345_I2C::ADXL345_I2C(I2C::Port port, Range range, int deviceAddress) m_simRange = m_simDevice.CreateEnum("Range", true, {"2G", "4G", "8G", "16G"}, 0); m_simX = m_simDevice.CreateDouble("X Accel", false, 0.0); - m_simX = m_simDevice.CreateDouble("Y Accel", false, 0.0); + m_simY = m_simDevice.CreateDouble("Y Accel", false, 0.0); m_simZ = m_simDevice.CreateDouble("Z Accel", false, 0.0); } // Turn on the measurements diff --git a/wpilibc/src/main/native/cpp/ADXL345_SPI.cpp b/wpilibc/src/main/native/cpp/ADXL345_SPI.cpp index 077a7ffb63..329b1485c3 100644 --- a/wpilibc/src/main/native/cpp/ADXL345_SPI.cpp +++ b/wpilibc/src/main/native/cpp/ADXL345_SPI.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2020 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -20,7 +20,7 @@ ADXL345_SPI::ADXL345_SPI(SPI::Port port, ADXL345_SPI::Range range) m_simRange = m_simDevice.CreateEnum("Range", true, {"2G", "4G", "8G", "16G"}, 0); m_simX = m_simDevice.CreateDouble("X Accel", false, 0.0); - m_simX = m_simDevice.CreateDouble("Y Accel", false, 0.0); + m_simY = m_simDevice.CreateDouble("Y Accel", false, 0.0); m_simZ = m_simDevice.CreateDouble("Z Accel", false, 0.0); } m_spi.SetClockRate(500000); diff --git a/wpilibc/src/main/native/cpp/ADXL362.cpp b/wpilibc/src/main/native/cpp/ADXL362.cpp index 6ed8c8cc48..aff572f85c 100644 --- a/wpilibc/src/main/native/cpp/ADXL362.cpp +++ b/wpilibc/src/main/native/cpp/ADXL362.cpp @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2020 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -40,7 +40,7 @@ ADXL362::ADXL362(SPI::Port port, Range range) m_simRange = m_simDevice.CreateEnum("Range", true, {"2G", "4G", "8G", "16G"}, 0); m_simX = m_simDevice.CreateDouble("X Accel", false, 0.0); - m_simX = m_simDevice.CreateDouble("Y Accel", false, 0.0); + m_simY = m_simDevice.CreateDouble("Y Accel", false, 0.0); m_simZ = m_simDevice.CreateDouble("Z Accel", false, 0.0); } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java index d901462296..c31782cbd8 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_I2C.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2020 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -98,7 +98,7 @@ public class ADXL345_I2C implements Accelerometer, Sendable, AutoCloseable { if (m_simDevice != null) { m_simRange = m_simDevice.createEnum("Range", true, new String[] {"2G", "4G", "8G", "16G"}, 0); m_simX = m_simDevice.createDouble("X Accel", false, 0.0); - m_simX = m_simDevice.createDouble("Y Accel", false, 0.0); + m_simY = m_simDevice.createDouble("Y Accel", false, 0.0); m_simZ = m_simDevice.createDouble("Z Accel", false, 0.0); } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_SPI.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_SPI.java index 6aed40eed4..842ffd6422 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_SPI.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL345_SPI.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2020 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -89,7 +89,7 @@ public class ADXL345_SPI implements Accelerometer, Sendable, AutoCloseable { if (m_simDevice != null) { m_simRange = m_simDevice.createEnum("Range", true, new String[] {"2G", "4G", "8G", "16G"}, 0); m_simX = m_simDevice.createDouble("X Accel", false, 0.0); - m_simX = m_simDevice.createDouble("Y Accel", false, 0.0); + m_simY = m_simDevice.createDouble("Y Accel", false, 0.0); m_simZ = m_simDevice.createDouble("Z Accel", false, 0.0); } init(range); diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL362.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL362.java index 54583ea89d..340a776115 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL362.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/ADXL362.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */ +/* Copyright (c) 2008-2020 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -97,7 +97,7 @@ public class ADXL362 implements Accelerometer, Sendable, AutoCloseable { if (m_simDevice != null) { m_simRange = m_simDevice.createEnum("Range", true, new String[] {"2G", "4G", "8G", "16G"}, 0); m_simX = m_simDevice.createDouble("X Accel", false, 0.0); - m_simX = m_simDevice.createDouble("Y Accel", false, 0.0); + m_simY = m_simDevice.createDouble("Y Accel", false, 0.0); m_simZ = m_simDevice.createDouble("Z Accel", false, 0.0); }