mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-07-03 03:01:44 +00:00
Moves using namespace from ChipObject.h into hal namespace (#323)
This commit is contained in:
committed by
Peter Johnson
parent
5e54969f6b
commit
03d8f9193b
@@ -16,6 +16,8 @@
|
||||
#include "ChipObject.h"
|
||||
#include "HAL/HAL.h"
|
||||
|
||||
using namespace hal;
|
||||
|
||||
// The 7-bit I2C address with a 0 "send" bit
|
||||
static const uint8_t kSendAddress = (0x1c << 1) | 0;
|
||||
|
||||
|
||||
@@ -39,7 +39,9 @@
|
||||
#include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSPI.h"
|
||||
#include "FRC_FPGA_ChipObject/nRoboRIO_FPGANamespace/tSysWatchdog.h"
|
||||
|
||||
// FIXME: these should not be here!
|
||||
using namespace nFPGA; // NOLINT
|
||||
using namespace nRoboRIO_FPGANamespace; // NOLINT
|
||||
namespace hal {
|
||||
using namespace nFPGA;
|
||||
using namespace nRoboRIO_FPGANamespace;
|
||||
} // namespace hal
|
||||
|
||||
#pragma GCC diagnostic pop
|
||||
|
||||
@@ -27,6 +27,8 @@
|
||||
#include "ctre/ctre.h"
|
||||
#include "visa/visa.h"
|
||||
|
||||
using namespace hal;
|
||||
|
||||
static std::unique_ptr<tGlobal> global;
|
||||
static std::unique_ptr<tSysWatchdog> watchdog;
|
||||
|
||||
|
||||
@@ -21,6 +21,8 @@
|
||||
#include "HAL/handles/UnlimitedHandleResource.h"
|
||||
#include "support/SafeThread.h"
|
||||
|
||||
using namespace hal;
|
||||
|
||||
static const int32_t kTimerInterruptNumber = 28;
|
||||
|
||||
static priority_mutex notifierInterruptMutex;
|
||||
|
||||
@@ -11,6 +11,8 @@
|
||||
|
||||
#include "ChipObject.h"
|
||||
|
||||
using namespace hal;
|
||||
|
||||
static std::unique_ptr<tPower> power;
|
||||
|
||||
static void initializePower(int32_t* status) {
|
||||
|
||||
Reference in New Issue
Block a user