Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-26 01:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make 3 axis Accelerometers work in LiveWindow. Fixes artf3902.

Browse Source 
Change-Id: Iced12b3c408b0d7b8fe822a9f17a7992293bae7d
This commit is contained in:
Joe Ross
2014-12-30 18:20:35 -08:00
parent b94341a23e
commit 7db63055f6
8 changed files with 140 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibc/wpilibC++Devices/src/BuiltInAccelerometer.cpp
View File

@@ -7,6 +7,7 @@
#include "BuiltInAccelerometer.h"
#include "HAL/HAL.hpp"
#include "WPIErrors.h"
#include "LiveWindow/LiveWindow.h"
/**
* Constructor.
@@ -18,6 +19,7 @@ BuiltInAccelerometer::BuiltInAccelerometer(Range range)
SetRange(range);
HALReport(HALUsageReporting::kResourceType_Accelerometer, 0, 0, "Built-in accelerometer");
LiveWindow::GetInstance()->AddSensor((std::string)"BuiltInAccel",0, this);
}
BuiltInAccelerometer::~BuiltInAccelerometer()
@@ -62,7 +64,7 @@ double BuiltInAccelerometer::GetZ()
}
std::string BuiltInAccelerometer::GetSmartDashboardType() {
return "Accelerometer";
return "3AxisAccelerometer";
}
void BuiltInAccelerometer::InitTable(ITable *subtable) {