Cleaned up and updated .styleguide for new build system file locations and ran wpiformat (#612)

This commit is contained in:
Tyler Veness
2017-08-19 22:14:34 -07:00
committed by Peter Johnson
parent 1a9a6c3678
commit 2a9c454baa
6 changed files with 39 additions and 61 deletions

View File

@@ -1,8 +1,6 @@
cExtensions {
}
cppHeaderExtensions {
h
hpp
inc
}
@@ -14,54 +12,27 @@ otherExtensions {
java
}
genFolderExclude {
FRC_FPGA_ChipObject
NetworkCommunication
ctre
frccansae
gmock
gtest
i2clib
msgs
ni-libraries
ni/vision
spilib
wpilibj/src/athena/cpp/nivision
visa
}
genFileExclude {
NIIMAQdx\.h$
can_proto\.h$
nivision\.h$
gmock/
ni-libraries/
hal/src/main/native/athena/ctre/
hal/src/main/native/athena/frccansae/
hal/src/main/native/athena/visa/
hal/src/main/native/include/ctre/
simulation/JavaGazebo/build/classes/main/gazebo/msgs/
wpilibj/src/athena/cpp/nivision/
UsageReporting\.h$
}
modifiableFolderExclude {
\.git
wpilibj/src/arm-linux-jni
wpilibj/src/main/native/cpp
}
modifiableFileExclude {
wpilibj/src/arm-linux-jni/
wpilibj/src/main/native/cpp/
\.patch$
\.png$
\.py$
\.so$
}
includeRelated {
}
includeCSys {
}
includeCppSys {
}
includeOtherLibs {
}
includeProject {
^ctre/
}

View File

@@ -99,4 +99,4 @@ model {
}
}
}
}
}

View File

@@ -710,4 +710,4 @@ void CameraServer::SetSize(int size) {
it->second.SetResolution(320, 240);
else if (size == kSize640x480)
it->second.SetResolution(640, 480);
}
}

View File

@@ -73,4 +73,4 @@ void VisionRunnerBase::RunForever() {
while (true) {
RunOnce();
}
}
}

View File

@@ -41,7 +41,7 @@ class CameraServer : public ErrorBase {
static CameraServer* GetInstance();
#ifdef __linux__
// USBCamera does not work on anything except linux
// USBCamera does not work on anything except linux
/**
* Start automatically capturing images to send to the dashboard.
*

View File

@@ -1,17 +1,24 @@
package edu.wpi.first.wpilibj;
import edu.wpi.first.wpiutil.RuntimeDetector;
import edu.wpi.first.wpilibj.hal.HALUtil;
import edu.wpi.first.wpilibj.networktables.NetworkTablesJNI;
public class DevMain {
/**
* Main entry point.
*/
public static void main(String[] args) {
System.out.println("Hello World!");
System.out.println(RuntimeDetector.getPlatformPath());
System.out.println(NetworkTablesJNI.now());
System.out.println(HALUtil.getHALRuntimeType());
}
}
/*----------------------------------------------------------------------------*/
/* Copyright (c) FIRST 2017. 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. */
/*----------------------------------------------------------------------------*/
package edu.wpi.first.wpilibj;
import edu.wpi.first.wpiutil.RuntimeDetector;
import edu.wpi.first.wpilibj.hal.HALUtil;
import edu.wpi.first.wpilibj.networktables.NetworkTablesJNI;
public class DevMain {
/**
* Main entry point.
*/
public static void main(String[] args) {
System.out.println("Hello World!");
System.out.println(RuntimeDetector.getPlatformPath());
System.out.println(NetworkTablesJNI.now());
System.out.println(HALUtil.getHALRuntimeType());
}
}