Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-30 02:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

clang-tidy: modernize-concat-nested-namespaces (NFC)

Browse Source
This commit is contained in:
Peter Johnson
2020-12-28 01:19:59 -08:00
parent 67e03e625d
commit 6131f4e32b
162 changed files with 324 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hal/src/main/native/athena/Accelerometer.cpp
View File

@@ -75,11 +75,9 @@ enum Register {
kReg_OffZ = 0x31
};
namespace hal {
namespace init {
namespace hal::init {
void InitializeAccelerometer() {}
} // namespace init
} // namespace hal
} // namespace hal::init
namespace hal {

6
hal/src/main/native/athena/AddressableLED.cpp
View File

@@ -32,8 +32,7 @@ static LimitedHandleResource<
HAL_AddressableLEDHandle, AddressableLED, kNumAddressableLEDs,
HAL_HandleEnum::AddressableLED>* addressableLEDHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeAddressableLED() {
static LimitedHandleResource<HAL_AddressableLEDHandle, AddressableLED,
kNumAddressableLEDs,
@@ -41,8 +40,7 @@ void InitializeAddressableLED() {
alH;
addressableLEDHandles = &alH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/AnalogAccumulator.cpp
View File

@@ -9,11 +9,9 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeAnalogAccumulator() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/AnalogGyro.cpp
View File

@@ -36,16 +36,14 @@ using namespace hal;
static IndexedHandleResource<HAL_GyroHandle, AnalogGyro, kNumAccumulators,
HAL_HandleEnum::AnalogGyro>* analogGyroHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeAnalogGyro() {
static IndexedHandleResource<HAL_GyroHandle, AnalogGyro, kNumAccumulators,
HAL_HandleEnum::AnalogGyro>
agHandles;
analogGyroHandles = &agHandles;
}
} // namespace init
} // namespace hal
} // namespace hal::init
static void Wait(double seconds) {
if (seconds < 0.0) {

6
hal/src/main/native/athena/AnalogInput.cpp
View File

@@ -13,11 +13,9 @@
#include "hal/AnalogAccumulator.h"
#include "hal/handles/HandlesInternal.h"
namespace hal {
namespace init {
namespace hal::init {
void InitializeAnalogInput() {}
} // namespace init
} // namespace hal
} // namespace hal::init
using namespace hal;

6
hal/src/main/native/athena/AnalogOutput.cpp
View File

@@ -25,16 +25,14 @@ static IndexedHandleResource<HAL_AnalogOutputHandle, AnalogOutput,
kNumAnalogOutputs, HAL_HandleEnum::AnalogOutput>*
analogOutputHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeAnalogOutput() {
static IndexedHandleResource<HAL_AnalogOutputHandle, AnalogOutput,
kNumAnalogOutputs, HAL_HandleEnum::AnalogOutput>
aoH;
analogOutputHandles = &aoH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/AnalogTrigger.cpp
View File

@@ -30,8 +30,7 @@ static LimitedHandleResource<HAL_AnalogTriggerHandle, AnalogTrigger,
kNumAnalogTriggers, HAL_HandleEnum::AnalogTrigger>*
analogTriggerHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeAnalogTrigger() {
static LimitedHandleResource<HAL_AnalogTriggerHandle, AnalogTrigger,
kNumAnalogTriggers,
@@ -39,8 +38,7 @@ void InitializeAnalogTrigger() {
atH;
analogTriggerHandles = &atH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/CAN.cpp
View File

@@ -6,11 +6,9 @@
#include <FRC_NetworkCommunication/CANSessionMux.h>
namespace hal {
namespace init {
namespace hal::init {
void InitializeCAN() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/CANAPI.cpp
View File

@@ -44,15 +44,13 @@ static uint32_t GetPacketBaseTime() {
return ms & 0xFFFFFFFF;
}
namespace hal {
namespace init {
namespace hal::init {
void InitializeCANAPI() {
static UnlimitedHandleResource<HAL_CANHandle, CANStorage, HAL_HandleEnum::CAN>
cH;
canHandles = &cH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
static int32_t CreateCANId(CANStorage* storage, int32_t apiId) {
int32_t createdId = 0;

6
hal/src/main/native/athena/Compressor.cpp
View File

@@ -13,11 +13,9 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeCompressor() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/Constants.cpp
View File

@@ -8,11 +8,9 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializeConstants() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/Counter.cpp
View File

@@ -25,16 +25,14 @@ struct Counter {
static LimitedHandleResource<HAL_CounterHandle, Counter, kNumCounters,
HAL_HandleEnum::Counter>* counterHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeCounter() {
static LimitedHandleResource<HAL_CounterHandle, Counter, kNumCounters,
HAL_HandleEnum::Counter>
ch;
counterHandles = &ch;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/DIO.cpp
View File

@@ -25,8 +25,7 @@ static LimitedHandleResource<HAL_DigitalPWMHandle, uint8_t,
kNumDigitalPWMOutputs, HAL_HandleEnum::DigitalPWM>*
digitalPWMHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeDIO() {
static LimitedHandleResource<HAL_DigitalPWMHandle, uint8_t,
kNumDigitalPWMOutputs,
@@ -34,8 +33,7 @@ void InitializeDIO() {
dpH;
digitalPWMHandles = &dpH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/DMA.cpp
View File

@@ -70,15 +70,13 @@ enum DMAOffsetConstants {
static hal::LimitedHandleResource<HAL_DMAHandle, DMA, 1, HAL_HandleEnum::DMA>*
dmaHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeDMA() {
static hal::LimitedHandleResource<HAL_DMAHandle, DMA, 1, HAL_HandleEnum::DMA>
dH;
dmaHandles = &dH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/Encoder.cpp
View File

@@ -231,8 +231,7 @@ static LimitedClassedHandleResource<HAL_EncoderHandle, Encoder,
kNumEncoders + kNumCounters,
HAL_HandleEnum::Encoder>* encoderHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeEncoder() {
static LimitedClassedHandleResource<HAL_EncoderHandle, Encoder,
kNumEncoders + kNumCounters,
@@ -240,8 +239,7 @@ void InitializeEncoder() {
eH;
encoderHandles = &eH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
namespace hal {
bool GetEncoderBaseHandle(HAL_EncoderHandle handle,

6
hal/src/main/native/athena/FPGAEncoder.cpp
View File

@@ -27,16 +27,14 @@ static constexpr double DECODING_SCALING_FACTOR = 0.25;
static LimitedHandleResource<HAL_FPGAEncoderHandle, Encoder, kNumEncoders,
HAL_HandleEnum::FPGAEncoder>* fpgaEncoderHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeFPGAEncoder() {
static LimitedHandleResource<HAL_FPGAEncoderHandle, Encoder, kNumEncoders,
HAL_HandleEnum::FPGAEncoder>
feH;
fpgaEncoderHandles = &feH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/FRCDriverStation.cpp
View File

@@ -123,16 +123,14 @@ static wpi::mutex* newDSDataAvailableMutex;
static wpi::condition_variable* newDSDataAvailableCond;
static int newDSDataAvailableCounter{0};
namespace hal {
namespace init {
namespace hal::init {
void InitializeFRCDriverStation() {
static wpi::mutex newMutex;
newDSDataAvailableMutex = &newMutex;
static wpi::condition_variable newCond;
newDSDataAvailableCond = &newCond;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/HALInitializer.cpp
View File

@@ -6,11 +6,9 @@
#include "hal/HALBase.h"
namespace hal {
namespace init {
namespace hal::init {
std::atomic_bool HAL_IsInitialized{false};
void RunInitialize() {
HAL_Initialize(500, 0);
}
} // namespace init
} // namespace hal
} // namespace hal::init

6
hal/src/main/native/athena/I2C.cpp
View File

@@ -30,11 +30,9 @@ static int i2CMXPHandle{-1};
static HAL_DigitalHandle i2CMXPDigitalHandle1{HAL_kInvalidHandle};
static HAL_DigitalHandle i2CMXPDigitalHandle2{HAL_kInvalidHandle};
namespace hal {
namespace init {
namespace hal::init {
void InitializeI2C() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/Interrupts.cpp
View File

@@ -83,16 +83,14 @@ static void threadedInterruptHandler(uint32_t mask, void* param) {
static LimitedHandleResource<HAL_InterruptHandle, Interrupt, kNumInterrupts,
HAL_HandleEnum::Interrupt>* interruptHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeInterrupts() {
static LimitedHandleResource<HAL_InterruptHandle, Interrupt, kNumInterrupts,
HAL_HandleEnum::Interrupt>
iH;
interruptHandles = &iH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/Notifier.cpp
View File

@@ -125,14 +125,12 @@ static void cleanupNotifierAtExit() {
}
}
namespace hal {
namespace init {
namespace hal::init {
void InitializeNotifier() {
static NotifierHandleContainer nH;
notifierHandles = &nH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/PDP.cpp
View File

@@ -103,15 +103,13 @@ union PdpStatusEnergy {
static wpi::mutex pdpHandleMutex;
static HAL_PDPHandle pdpHandles[kNumPDPModules];
namespace hal {
namespace init {
namespace hal::init {
void InitializePDP() {
for (int i = 0; i < kNumPDPModules; i++) {
pdpHandles[i] = HAL_kInvalidHandle;
}
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/PWM.cpp
View File

@@ -58,11 +58,9 @@ static inline int32_t GetFullRangeScaleFactor(DigitalPort* port) {
return GetMaxPositivePwm(port) - GetMinNegativePwm(port);
} ///< The scale for positions.
namespace hal {
namespace init {
namespace hal::init {
void InitializePWM() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/Ports.cpp
View File

@@ -8,11 +8,9 @@
using namespace hal;
namespace hal {
namespace init {
namespace hal::init {
void InitializePorts() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/Power.cpp
View File

@@ -24,11 +24,9 @@ static void initializePower(int32_t* status) {
} // namespace hal
namespace hal {
namespace init {
namespace hal::init {
void InitializePower() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/Relay.cpp
View File

@@ -26,16 +26,14 @@ static IndexedHandleResource<HAL_RelayHandle, Relay, kNumRelayChannels,
// Create a mutex to protect changes to the relay values
static wpi::mutex digitalRelayMutex;
namespace hal {
namespace init {
namespace hal::init {
void InitializeRelay() {
static IndexedHandleResource<HAL_RelayHandle, Relay, kNumRelayChannels,
HAL_HandleEnum::Relay>
rH;
relayHandles = &rH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/SPI.cpp
View File

@@ -59,11 +59,9 @@ static bool SPIInUseByAuto(HAL_SPIPort port) {
(spiAutoPort == 4 && port == 4);
}
namespace hal {
namespace init {
namespace hal::init {
void InitializeSPI() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/SerialPort.cpp
View File

@@ -41,16 +41,14 @@ IndexedHandleResource<HAL_SerialPortHandle, SerialPort, 4,
HAL_HandleEnum::SerialPort>* serialPortHandles;
} // namespace hal
namespace hal {
namespace init {
namespace hal::init {
void InitializeSerialPort() {
static IndexedHandleResource<HAL_SerialPortHandle, SerialPort, 4,
HAL_HandleEnum::SerialPort>
spH;
serialPortHandles = &spH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
using namespace hal;

6
hal/src/main/native/athena/Solenoid.cpp
View File

@@ -27,8 +27,7 @@ static IndexedHandleResource<HAL_SolenoidHandle, Solenoid,
kNumPCMModules * kNumSolenoidChannels,
HAL_HandleEnum::Solenoid>* solenoidHandles;
namespace hal {
namespace init {
namespace hal::init {
void InitializeSolenoid() {
static IndexedHandleResource<HAL_SolenoidHandle, Solenoid,
kNumPCMModules * kNumSolenoidChannels,
@@ -36,8 +35,7 @@ void InitializeSolenoid() {
sH;
solenoidHandles = &sH;
}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {

6
hal/src/main/native/athena/Threads.cpp
View File

@@ -9,11 +9,9 @@
#include "hal/Errors.h"
namespace hal {
namespace init {
namespace hal::init {
void InitializeThreads() {}
} // namespace init
} // namespace hal
} // namespace hal::init
extern "C" {