Run wpiformat on merged repo (#1021)

2026-06-20 00:51:42 +00:00 · 2018-05-13 17:09:56 -07:00
parent 0babbf317c
commit 6729a7d6b1
481 changed files with 9581 additions and 6828 deletions
--- a/hal/src/main/native/cpp/jni/AnalogJNI.cpp
+++ b/hal/src/main/native/cpp/jni/AnalogJNI.cpp
@@ -1,23 +1,23 @@
 /*----------------------------------------------------------------------------*/
-/* Copyright (c) FIRST 2016. All Rights Reserved.                             */
+/* Copyright (c) 2016-2018 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.                                                               */
 /*----------------------------------------------------------------------------*/

-#include <assert.h>
 #include <jni.h>
-#include "HAL/cpp/Log.h"

-#include "edu_wpi_first_wpilibj_hal_AnalogJNI.h"
+#include <cassert>

+#include "HAL/AnalogAccumulator.h"
 #include "HAL/AnalogInput.h"
 #include "HAL/AnalogOutput.h"
-#include "HAL/AnalogAccumulator.h"
 #include "HAL/AnalogTrigger.h"
 #include "HAL/Ports.h"
-#include "HALUtil.h"
+#include "HAL/cpp/Log.h"
 #include "HAL/handles/HandlesInternal.h"
+#include "HALUtil.h"
+#include "edu_wpi_first_wpilibj_hal_AnalogJNI.h"

 using namespace frc;

@@ -28,7 +28,7 @@ TLogLevel analogJNILogLevel = logWARNING;
  if (level > analogJNILogLevel) \
    ;                            \
  else                           \
-  Log().Get(level)
+    Log().Get(level)

 extern "C" {

@@ -38,14 +38,15 @@ extern "C" {
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogInputPort(
-    JNIEnv *env, jclass, jint id) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogInputPort
+  (JNIEnv* env, jclass, jint id)
+{
  ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_PortHandle)id;
  int32_t status = 0;
  auto analog = HAL_InitializeAnalogInputPort((HAL_PortHandle)id, &status);
  ANALOGJNI_LOG(logDEBUG) << "Status = " << status;
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << analog;
-  CheckStatusRange(env, status, 0, HAL_GetNumAnalogInputs(), 
+  CheckStatusRange(env, status, 0, HAL_GetNumAnalogInputs(),
                   hal::getPortHandleChannel((HAL_PortHandle)id));
  return (jint)analog;
 }
@@ -56,8 +57,9 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogInputPort(
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_freeAnalogInputPort(
-    JNIEnv *env, jclass, jint id) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_freeAnalogInputPort
+  (JNIEnv* env, jclass, jint id)
+{
  ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_AnalogInputHandle)id;
  HAL_FreeAnalogInputPort((HAL_AnalogInputHandle)id);
 }
@@ -68,14 +70,16 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_freeAnalogInputPort(
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogOutputPort(
-    JNIEnv *env, jclass, jint id) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogOutputPort
+  (JNIEnv* env, jclass, jint id)
+{
  ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_PortHandle)id;
  int32_t status = 0;
-  HAL_AnalogOutputHandle analog = HAL_InitializeAnalogOutputPort((HAL_PortHandle)id, &status);
+  HAL_AnalogOutputHandle analog =
+      HAL_InitializeAnalogOutputPort((HAL_PortHandle)id, &status);
  ANALOGJNI_LOG(logDEBUG) << "Status = " << status;
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << analog;
-  CheckStatusRange(env, status, 0, HAL_GetNumAnalogOutputs(), 
+  CheckStatusRange(env, status, 0, HAL_GetNumAnalogOutputs(),
                   hal::getPortHandleChannel((HAL_PortHandle)id));
  return (jlong)analog;
 }
@@ -86,8 +90,9 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogOutputPort(
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_freeAnalogOutputPort(
-    JNIEnv *env, jclass, jint id) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_freeAnalogOutputPort
+  (JNIEnv* env, jclass, jint id)
+{
  ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << id;
  HAL_FreeAnalogOutputPort((HAL_AnalogOutputHandle)id);
 }
@@ -98,8 +103,9 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_freeAnalogOutputPort(
 * Signature: (B)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogModule(
-    JNIEnv *, jclass, jbyte value) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogModule
+  (JNIEnv*, jclass, jbyte value)
+{
  // ANALOGJNI_LOG(logDEBUG) << "Module = " << (jint)value;
  jboolean returnValue = HAL_CheckAnalogModule(value);
  // ANALOGJNI_LOG(logDEBUG) << "checkAnalogModuleResult = " <<
@@ -113,8 +119,9 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogModule(
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogInputChannel(
-    JNIEnv *, jclass, jint value) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogInputChannel
+  (JNIEnv*, jclass, jint value)
+{
  // ANALOGJNI_LOG(logDEBUG) << "Channel = " << value;
  jboolean returnValue = HAL_CheckAnalogInputChannel(value);
  // ANALOGJNI_LOG(logDEBUG) << "checkAnalogChannelResult = " <<
@@ -128,8 +135,9 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogInputChannel(
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogOutputChannel(
-    JNIEnv *, jclass, jint value) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogOutputChannel
+  (JNIEnv*, jclass, jint value)
+{
  // ANALOGJNI_LOG(logDEBUG) << "Channel = " << value;
  jboolean returnValue = HAL_CheckAnalogOutputChannel(value);
  // ANALOGJNI_LOG(logDEBUG) << "checkAnalogChannelResult = " <<
@@ -142,8 +150,10 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_checkAnalogOutputChannel(
 * Method:    setAnalogOutput
 * Signature: (ID)V
 */
-JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogOutput(
-    JNIEnv *env, jclass, jint id, jdouble voltage) {
+JNIEXPORT void JNICALL
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogOutput
+  (JNIEnv* env, jclass, jint id, jdouble voltage)
+{
  ANALOGJNI_LOG(logDEBUG) << "Calling setAnalogOutput";
  ANALOGJNI_LOG(logDEBUG) << "Voltage = " << voltage;
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << id;
@@ -158,8 +168,9 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogOutput(
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOutput(
-    JNIEnv *env, jclass, jint id) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOutput
+  (JNIEnv* env, jclass, jint id)
+{
  int32_t status = 0;
  double val = HAL_GetAnalogOutput((HAL_AnalogOutputHandle)id, &status);
  CheckStatus(env, status);
@@ -172,8 +183,9 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOutput(
 * Signature: (D)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogSampleRate(
-    JNIEnv *env, jclass, jdouble value) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogSampleRate
+  (JNIEnv* env, jclass, jdouble value)
+{
  ANALOGJNI_LOG(logDEBUG) << "SampleRate = " << value;
  int32_t status = 0;
  HAL_SetAnalogSampleRate(value, &status);
@@ -187,8 +199,9 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogSampleRate(
 * Signature: ()D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogSampleRate(
-    JNIEnv *env, jclass) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogSampleRate
+  (JNIEnv* env, jclass)
+{
  int32_t status = 0;
  double returnValue = HAL_GetAnalogSampleRate(&status);
  ANALOGJNI_LOG(logDEBUG) << "Status = " << status;
@@ -203,8 +216,9 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogSampleRate(
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogAverageBits(
-    JNIEnv *env, jclass, jint id, jint value) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogAverageBits
+  (JNIEnv* env, jclass, jint id, jint value)
+{
  ANALOGJNI_LOG(logDEBUG) << "AverageBits = " << value;
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
  int32_t status = 0;
@@ -219,11 +233,13 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogAverageBits(
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageBits(
-    JNIEnv *env, jclass, jint id) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageBits
+  (JNIEnv* env, jclass, jint id)
+{
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
  int32_t status = 0;
-  jint returnValue = HAL_GetAnalogAverageBits((HAL_AnalogInputHandle)id, &status);
+  jint returnValue =
+      HAL_GetAnalogAverageBits((HAL_AnalogInputHandle)id, &status);
  ANALOGJNI_LOG(logDEBUG) << "Status = " << status;
  ANALOGJNI_LOG(logDEBUG) << "AverageBits = " << returnValue;
  CheckStatus(env, status);
@@ -236,8 +252,9 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageBits(
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogOversampleBits(
-    JNIEnv *env, jclass, jint id, jint value) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogOversampleBits
+  (JNIEnv* env, jclass, jint id, jint value)
+{
  ANALOGJNI_LOG(logDEBUG) << "OversampleBits = " << value;
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
  int32_t status = 0;
@@ -252,11 +269,13 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogOversampleBits(
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOversampleBits(
-    JNIEnv *env, jclass, jint id) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOversampleBits
+  (JNIEnv* env, jclass, jint id)
+{
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
  int32_t status = 0;
-  jint returnValue = HAL_GetAnalogOversampleBits((HAL_AnalogInputHandle)id, &status);
+  jint returnValue =
+      HAL_GetAnalogOversampleBits((HAL_AnalogInputHandle)id, &status);
  ANALOGJNI_LOG(logDEBUG) << "Status = " << status;
  ANALOGJNI_LOG(logDEBUG) << "OversampleBits = " << returnValue;
  CheckStatus(env, status);
@@ -269,8 +288,9 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOversampleBits(
 * Signature: (I)S
 */
 JNIEXPORT jshort JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogValue(
-    JNIEnv *env, jclass, jint id) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogValue
+  (JNIEnv* env, jclass, jint id)
+{
  // ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (void*)id;
  int32_t status = 0;
  jshort returnValue = HAL_GetAnalogValue((HAL_AnalogInputHandle)id, &status);
@@ -286,11 +306,13 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogValue(
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageValue(
-    JNIEnv *env, jclass, jint id) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageValue
+  (JNIEnv* env, jclass, jint id)
+{
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
  int32_t status = 0;
-  jint returnValue = HAL_GetAnalogAverageValue((HAL_AnalogInputHandle)id, &status);
+  jint returnValue =
+      HAL_GetAnalogAverageValue((HAL_AnalogInputHandle)id, &status);
  ANALOGJNI_LOG(logDEBUG) << "Status = " << status;
  ANALOGJNI_LOG(logDEBUG) << "AverageValue = " << returnValue;
  CheckStatus(env, status);
@@ -303,12 +325,14 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageValue(
 * Signature: (ID)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogVoltsToValue(
-    JNIEnv *env, jclass, jint id, jdouble voltageValue) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogVoltsToValue
+  (JNIEnv* env, jclass, jint id, jdouble voltageValue)
+{
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
  ANALOGJNI_LOG(logDEBUG) << "VoltageValue = " << voltageValue;
  int32_t status = 0;
-  jint returnValue = HAL_GetAnalogVoltsToValue((HAL_AnalogInputHandle)id, voltageValue, &status);
+  jint returnValue = HAL_GetAnalogVoltsToValue((HAL_AnalogInputHandle)id,
+                                               voltageValue, &status);
  ANALOGJNI_LOG(logDEBUG) << "Status = " << status;
  ANALOGJNI_LOG(logDEBUG) << "Value = " << returnValue;
  CheckStatus(env, status);
@@ -321,11 +345,13 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogVoltsToValue(
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogVoltage(
-    JNIEnv *env, jclass, jint id) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogVoltage
+  (JNIEnv* env, jclass, jint id)
+{
  // ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (void*)id;
  int32_t status = 0;
-  jdouble returnValue = HAL_GetAnalogVoltage((HAL_AnalogInputHandle)id, &status);
+  jdouble returnValue =
+      HAL_GetAnalogVoltage((HAL_AnalogInputHandle)id, &status);
  // ANALOGJNI_LOG(logDEBUG) << "Status = " << status;
  // ANALOGJNI_LOG(logDEBUG) << "Voltage = " << returnValue;
  CheckStatus(env, status);
@@ -338,11 +364,13 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogVoltage(
 * Signature: (I)D
 */
 JNIEXPORT jdouble JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageVoltage(
-    JNIEnv *env, jclass, jint id) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageVoltage
+  (JNIEnv* env, jclass, jint id)
+{
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
  int32_t status = 0;
-  jdouble returnValue = HAL_GetAnalogAverageVoltage((HAL_AnalogInputHandle)id, &status);
+  jdouble returnValue =
+      HAL_GetAnalogAverageVoltage((HAL_AnalogInputHandle)id, &status);
  ANALOGJNI_LOG(logDEBUG) << "Status = " << status;
  ANALOGJNI_LOG(logDEBUG) << "AverageVoltage = " << returnValue;
  CheckStatus(env, status);
@@ -355,8 +383,9 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogAverageVoltage(
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogLSBWeight(
-    JNIEnv *env, jclass, jint id) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogLSBWeight
+  (JNIEnv* env, jclass, jint id)
+{
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
  int32_t status = 0;

@@ -372,8 +401,10 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogLSBWeight(
 * Method:    getAnalogOffset
 * Signature: (I)I
 */
-JNIEXPORT jint JNICALL Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOffset(
-    JNIEnv *env, jclass, jint id) {
+JNIEXPORT jint JNICALL
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOffset
+  (JNIEnv* env, jclass, jint id)
+{
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
  int32_t status = 0;

@@ -390,13 +421,15 @@ JNIEXPORT jint JNICALL Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogOffset(
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_isAccumulatorChannel(
-    JNIEnv *env, jclass, jint id) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_isAccumulatorChannel
+  (JNIEnv* env, jclass, jint id)
+{
  ANALOGJNI_LOG(logDEBUG) << "isAccumulatorChannel";
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
  int32_t status = 0;

-  jboolean returnValue = HAL_IsAccumulatorChannel((HAL_AnalogInputHandle)id, &status);
+  jboolean returnValue =
+      HAL_IsAccumulatorChannel((HAL_AnalogInputHandle)id, &status);
  ANALOGJNI_LOG(logDEBUG) << "Status = " << status;
  ANALOGJNI_LOG(logDEBUG) << "AnalogOffset = " << returnValue;
  CheckStatus(env, status);
@@ -408,8 +441,10 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_isAccumulatorChannel(
 * Method:    initAccumulator
 * Signature: (I)V
 */
-JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initAccumulator(
-    JNIEnv *env, jclass, jint id) {
+JNIEXPORT void JNICALL
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initAccumulator
+  (JNIEnv* env, jclass, jint id)
+{
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
  int32_t status = 0;
  HAL_InitAccumulator((HAL_AnalogInputHandle)id, &status);
@@ -423,8 +458,9 @@ JNIEXPORT void JNICALL Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initAccumulator(
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_resetAccumulator(
-    JNIEnv *env, jclass, jint id) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_resetAccumulator
+  (JNIEnv* env, jclass, jint id)
+{
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
  int32_t status = 0;
  HAL_ResetAccumulator((HAL_AnalogInputHandle)id, &status);
@@ -438,8 +474,9 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_resetAccumulator(
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAccumulatorCenter(
-    JNIEnv *env, jclass, jint id, jint center) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAccumulatorCenter
+  (JNIEnv* env, jclass, jint id, jint center)
+{
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
  int32_t status = 0;
  HAL_SetAccumulatorCenter((HAL_AnalogInputHandle)id, center, &status);
@@ -453,8 +490,9 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAccumulatorCenter(
 * Signature: (II)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAccumulatorDeadband(
-    JNIEnv *env, jclass, jint id, jint deadband) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAccumulatorDeadband
+  (JNIEnv* env, jclass, jint id, jint deadband)
+{
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
  int32_t status = 0;
  HAL_SetAccumulatorDeadband((HAL_AnalogInputHandle)id, deadband, &status);
@@ -468,11 +506,13 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAccumulatorDeadband(
 * Signature: (I)J
 */
 JNIEXPORT jlong JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorValue(
-    JNIEnv *env, jclass, jint id) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorValue
+  (JNIEnv* env, jclass, jint id)
+{
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
  int32_t status = 0;
-  jlong returnValue = HAL_GetAccumulatorValue((HAL_AnalogInputHandle)id, &status);
+  jlong returnValue =
+      HAL_GetAccumulatorValue((HAL_AnalogInputHandle)id, &status);
  ANALOGJNI_LOG(logDEBUG) << "Status = " << status;
  ANALOGJNI_LOG(logDEBUG) << "AccumulatorValue = " << returnValue;
  CheckStatus(env, status);
@@ -486,11 +526,13 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorValue(
 * Signature: (I)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorCount(
-    JNIEnv *env, jclass, jint id) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorCount
+  (JNIEnv* env, jclass, jint id)
+{
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
  int32_t status = 0;
-  jint returnValue = HAL_GetAccumulatorCount((HAL_AnalogInputHandle)id, &status);
+  jint returnValue =
+      HAL_GetAccumulatorCount((HAL_AnalogInputHandle)id, &status);
  ANALOGJNI_LOG(logDEBUG) << "Status = " << status;
  ANALOGJNI_LOG(logDEBUG) << "AccumulatorCount = " << returnValue;
  CheckStatus(env, status);
@@ -500,11 +542,12 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorCount(
 /*
 * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
 * Method:    getAccumulatorOutput
- * Signature: (ILedu/wpi/first/wpilibj/AccumulatorResult;)V
+ * Signature: (ILjava/lang/Object;)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorOutput(
-    JNIEnv *env, jclass, jint id, jobject accumulatorResult) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorOutput
+  (JNIEnv* env, jclass, jint id, jobject accumulatorResult)
+{
  ANALOGJNI_LOG(logDEBUG) << "Analog Handle = " << (HAL_AnalogInputHandle)id;
  int32_t status = 0;
  int64_t value = 0;
@@ -520,17 +563,20 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAccumulatorOutput(
 /*
 * Class:     edu_wpi_first_wpilibj_hal_AnalogJNI
 * Method:    initializeAnalogTrigger
- * Signature: (ILjava/nio/IntBuffer;)J
+ * Signature: (ILjava/lang/Object;)I
 */
 JNIEXPORT jint JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogTrigger(
-    JNIEnv *env, jclass, jint id, jobject index) {
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogTrigger
+  (JNIEnv* env, jclass, jint id, jobject index)
+{
  ANALOGJNI_LOG(logDEBUG) << "Port Handle = " << (HAL_AnalogInputHandle)id;
-  jint *indexHandle = (jint *)env->GetDirectBufferAddress(index);
+  jint* indexHandle =
+      reinterpret_cast<jint*>(env->GetDirectBufferAddress(index));
  ANALOGJNI_LOG(logDEBUG) << "Index Ptr = " << indexHandle;
  int32_t status = 0;
-  HAL_AnalogTriggerHandle analogTrigger =
-      HAL_InitializeAnalogTrigger((HAL_AnalogInputHandle)id, (int32_t *)indexHandle, &status);
+  HAL_AnalogTriggerHandle analogTrigger = HAL_InitializeAnalogTrigger(
+      (HAL_AnalogInputHandle)id, reinterpret_cast<int32_t*>(indexHandle),
+      &status);
  ANALOGJNI_LOG(logDEBUG) << "Status = " << status;
  ANALOGJNI_LOG(logDEBUG) << "AnalogTrigger Handle = " << analogTrigger;
  CheckStatus(env, status);
@@ -543,9 +589,11 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_initializeAnalogTrigger(
 * Signature: (I)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_cleanAnalogTrigger(
-    JNIEnv *env, jclass,jint id) {
-  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " << (HAL_AnalogTriggerHandle)id;
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_cleanAnalogTrigger
+  (JNIEnv* env, jclass, jint id)
+{
+  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = "
+                          << (HAL_AnalogTriggerHandle)id;
  int32_t status = 0;
  HAL_CleanAnalogTrigger((HAL_AnalogTriggerHandle)id, &status);
  CheckStatus(env, status);
@@ -557,11 +605,14 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_cleanAnalogTrigger(
 * Signature: (III)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerLimitsRaw(
-    JNIEnv *env, jclass,jint id, jint lower, jint upper) {
-  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " << (HAL_AnalogTriggerHandle)id;
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerLimitsRaw
+  (JNIEnv* env, jclass, jint id, jint lower, jint upper)
+{
+  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = "
+                          << (HAL_AnalogTriggerHandle)id;
  int32_t status = 0;
-  HAL_SetAnalogTriggerLimitsRaw((HAL_AnalogTriggerHandle)id, lower, upper, &status);
+  HAL_SetAnalogTriggerLimitsRaw((HAL_AnalogTriggerHandle)id, lower, upper,
+                                &status);
  CheckStatus(env, status);
 }

@@ -571,11 +622,14 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerLimitsRaw(
 * Signature: (IDD)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerLimitsVoltage(
-    JNIEnv *env, jclass,jint id, jdouble lower, jdouble upper) {
-  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " << (HAL_AnalogTriggerHandle)id;
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerLimitsVoltage
+  (JNIEnv* env, jclass, jint id, jdouble lower, jdouble upper)
+{
+  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = "
+                          << (HAL_AnalogTriggerHandle)id;
  int32_t status = 0;
-  HAL_SetAnalogTriggerLimitsVoltage((HAL_AnalogTriggerHandle)id, lower, upper, &status);
+  HAL_SetAnalogTriggerLimitsVoltage((HAL_AnalogTriggerHandle)id, lower, upper,
+                                    &status);
  CheckStatus(env, status);
 }

@@ -585,9 +639,11 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerLimitsVoltage(
 * Signature: (IZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerAveraged(
-    JNIEnv *env, jclass,jint id, jboolean averaged) {
-  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " << (HAL_AnalogTriggerHandle)id;
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerAveraged
+  (JNIEnv* env, jclass, jint id, jboolean averaged)
+{
+  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = "
+                          << (HAL_AnalogTriggerHandle)id;
  int32_t status = 0;
  HAL_SetAnalogTriggerAveraged((HAL_AnalogTriggerHandle)id, averaged, &status);
  CheckStatus(env, status);
@@ -599,9 +655,11 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerAveraged(
 * Signature: (IZ)V
 */
 JNIEXPORT void JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerFiltered(
-    JNIEnv *env, jclass,jint id, jboolean filtered) {
-  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " << (HAL_AnalogTriggerHandle)id;
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerFiltered
+  (JNIEnv* env, jclass, jint id, jboolean filtered)
+{
+  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = "
+                          << (HAL_AnalogTriggerHandle)id;
  int32_t status = 0;
  HAL_SetAnalogTriggerFiltered((HAL_AnalogTriggerHandle)id, filtered, &status);
  CheckStatus(env, status);
@@ -613,11 +671,14 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_setAnalogTriggerFiltered(
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogTriggerInWindow(
-    JNIEnv *env, jclass,jint id) {
-  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " << (HAL_AnalogTriggerHandle)id;
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogTriggerInWindow
+  (JNIEnv* env, jclass, jint id)
+{
+  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = "
+                          << (HAL_AnalogTriggerHandle)id;
  int32_t status = 0;
-  jboolean val = HAL_GetAnalogTriggerInWindow((HAL_AnalogTriggerHandle)id, &status);
+  jboolean val =
+      HAL_GetAnalogTriggerInWindow((HAL_AnalogTriggerHandle)id, &status);
  CheckStatus(env, status);
  return val;
 }
@@ -628,11 +689,14 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogTriggerInWindow(
 * Signature: (I)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogTriggerTriggerState(
-    JNIEnv *env, jclass,jint id) {
-  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " << (HAL_AnalogTriggerHandle)id;
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogTriggerTriggerState
+  (JNIEnv* env, jclass, jint id)
+{
+  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = "
+                          << (HAL_AnalogTriggerHandle)id;
  int32_t status = 0;
-  jboolean val = HAL_GetAnalogTriggerTriggerState((HAL_AnalogTriggerHandle)id, &status);
+  jboolean val =
+      HAL_GetAnalogTriggerTriggerState((HAL_AnalogTriggerHandle)id, &status);
  CheckStatus(env, status);
  return val;
 }
@@ -643,12 +707,14 @@ Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogTriggerTriggerState(
 * Signature: (II)Z
 */
 JNIEXPORT jboolean JNICALL
-Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogTriggerOutput(
-    JNIEnv *env, jclass,jint id, jint type) {
-  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = " << (HAL_AnalogTriggerHandle)id;
+Java_edu_wpi_first_wpilibj_hal_AnalogJNI_getAnalogTriggerOutput
+  (JNIEnv* env, jclass, jint id, jint type)
+{
+  ANALOGJNI_LOG(logDEBUG) << "Analog Trigger Handle = "
+                          << (HAL_AnalogTriggerHandle)id;
  int32_t status = 0;
-  jboolean val =
-      HAL_GetAnalogTriggerOutput((HAL_AnalogTriggerHandle)id, (HAL_AnalogTriggerType)type, &status);
+  jboolean val = HAL_GetAnalogTriggerOutput(
+      (HAL_AnalogTriggerHandle)id, (HAL_AnalogTriggerType)type, &status);
  CheckStatus(env, status);
  return val;
 }