Reverting back to static .a files for C++ and fixing lots of other assorted items

This commit is contained in:
Patrick Plenefisch
2014-05-02 17:54:01 -04:00
parent c1482cb267
commit 9b831ed34c
178 changed files with 1901 additions and 1846 deletions

View File

@@ -3,20 +3,24 @@
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in $(WIND_BASE)/WPILib. */
/*----------------------------------------------------------------------------*/
#ifndef MODULE_H_
#define MODULE_H_
#pragma once
#include "SensorBase.h"
#include "NetworkCommunication/LoadOut.h"
#define kMaxModules (nLoadOut::kModuleType_Solenoid * kMaxModuleNumber + (kMaxModuleNumber - 1))
#define kMaxModules (nLoadOut::kModuleType_Solenoid * kMaxModuleNumber + (kMaxModuleNumber - 1))
class Module: public SensorBase
class Module : public SensorBase
{
public:
nLoadOut::tModuleType GetType() {return m_moduleType;}
uint8_t GetNumber() {return m_moduleNumber;}
nLoadOut::tModuleType GetType()
{
return m_moduleType;
}
uint8_t GetNumber()
{
return m_moduleNumber;
}
static Module *GetModule(nLoadOut::tModuleType type, uint8_t number);
protected:
@@ -30,5 +34,3 @@ private:
static uint8_t ToIndex(nLoadOut::tModuleType type, uint8_t number);
static Module* m_modules[kMaxModules];
};
#endif