Moves using namespace from ChipObject.h into hal namespace (#323)

This commit is contained in:
Thad House
2016-11-03 23:01:13 -07:00
committed by Peter Johnson
parent 5e54969f6b
commit 03d8f9193b
5 changed files with 13 additions and 3 deletions

View File

@@ -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;

View File

@@ -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

View File

@@ -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;

View File

@@ -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;

View File

@@ -11,6 +11,8 @@
#include "ChipObject.h"
using namespace hal;
static std::unique_ptr<tPower> power;
static void initializePower(int32_t* status) {