Added a method to automatically list enabled and disabled devices so …

…that this information needn't be manually created any longer.

Now devices are pretty much plug-n-play without a whole lot of manual work.

BrusaMotorController.cpp

@@ -45,6 +45,8 @@ BrusaMotorController::BrusaMotorController() : MotorController() {
 	limiterStateNumber = 0;
 
 	tickCounter = 0;
+
+	commonName = "Brusa DMC5 Inverter";
 }
 
 /*

CanBrake.cpp

@@ -36,6 +36,8 @@ CanBrake::CanBrake() : Throttle() {
 	responseId = 0;
 	responseMask = 0x7ff;
 	responseExtended = false;
+
+	commonName = "CANBus brake";
 }
 
 void CanBrake::setup() {

CanThrottle.cpp

@@ -35,6 +35,8 @@ CanThrottle::CanThrottle() : Throttle() {
 	responseId = 0;
 	responseMask = 0x7ff;
 	responseExtended = false;
+
+	commonName = "CANBus accelerator";
 }
 
 void CanThrottle::setup() {

Device.cpp

@@ -32,13 +32,18 @@ Device::Device() {
 	prefsHandler = NULL;
 	//since all derived classes eventually call this base method this will cause every device to auto register itself with the device manager
 	DeviceManager::getInstance()->addDevice(this); 
+	commonName = "Generic Device";
 }
 
 //Empty functions to handle these callbacks if the derived classes don't
 
 void Device::setup() {
 }
 
+char* Device::getCommonName() {
+	return commonName;
+}
+
 void Device::handleTick() {
 }
 

Device.h

@@ -56,6 +56,7 @@ class Device: public TickObserver {
 	void handleTick();
 	bool isEnabled();
 	virtual uint32_t getTickInterval();
+	char* getCommonName();
 
 	virtual void loadConfiguration();
 	virtual void saveConfiguration();
@@ -64,6 +65,7 @@ class Device: public TickObserver {
 
 protected:
 	PrefHandler *prefsHandler;
+	char *commonName;
 
 private:
 	DeviceConfiguration *deviceConfiguration; // reference to the currently active configuration

DeviceManager.cpp

@@ -276,3 +276,19 @@ uint8_t DeviceManager::countDeviceType(DeviceType deviceType) {
 	}
 	return count;
 }
+
+void DeviceManager::printDeviceList() {
+	Logger::console("Currently enabled devices: (DISABLE= to disable)");
+	for (int i = 0; i < CFG_DEV_MGR_MAX_DEVICES; i++) {
+		if (devices[i] && devices[i]->isEnabled()) {
+			Logger::console("     %X     %s", devices[i]->getId(), devices[i]->getCommonName());
+		}	
+	}
+
+	Logger::console("Currently disabled devices: (ENABLE= to enable)");
+	for (int i = 0; i < CFG_DEV_MGR_MAX_DEVICES; i++) {
+		if (devices[i] && !devices[i]->isEnabled()) {
+			Logger::console("     %X     %s", devices[i]->getId(), devices[i]->getCommonName());
+		}	
+	}
+}

DeviceManager.h

@@ -56,6 +56,7 @@ class DeviceManager {
 	MotorController *getMotorController();
 	Device *getDeviceByID(DeviceId);
 	Device *getDeviceByType(DeviceType);
+	void printDeviceList();
 
 protected:
 

DmocMotorController.cpp

@@ -53,6 +53,7 @@ DmocMotorController::DmocMotorController() : MotorController() {
 	online = 0;
 	activityCount = 0;
 //	maxTorque = 2000;
+	commonName = "DMOC645 Inverter";
 }
 
 void DmocMotorController::setup() {

ELM327_Emu.cpp

@@ -45,6 +45,8 @@ ELM327Emu::ELM327Emu() {
 		serialInterface = &Serial2;
 	else //older hardware used this instead
 		serialInterface = &Serial3; 
+
+	commonName = "ELM327 Emulator over Bluetooth";
 }
 
 /*

GEVCU.vcxproj

@@ -43,14 +43,14 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>__SAM3X8E__;USB_VID=0x2341;USB_PID=0x003e;USBCON;ARDUINO=154;ARDUINO_MAIN;printf=iprintf;__SAM__;F_CPU=84000000L;__cplusplus;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>__SAM3X8E__;USB_VID=0x2341;USB_PID=0x003e;USBCON;USB_MANUFACTURER="Unknown";USB_PRODUCT="Arduino Due";ARDUINO=154;ARDUINO_MAIN;printf=iprintf;__SAM__;__sam__;F_CPU=84000000L;__cplusplus;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
       <BrowseInformation>true</BrowseInformation>
-      <AdditionalIncludeDirectories>c:\arduino\hardware\arduino\sam\cores\arduino;c:\arduino\hardware\arduino\sam\variants\arduino_due_x;C:\Users\Collin\Documents\Arduino\libraries\due_rtc;C:\Users\Collin\Documents\Arduino\libraries\due_rtc\utility;C:\Users\Collin\Documents\Arduino\libraries\due_can;C:\Users\Collin\Documents\Arduino\libraries\due_can\utility;C:\Users\Collin\Documents\Arduino\libraries\due_wire;C:\Users\Collin\Documents\Arduino\libraries\due_wire\utility;C:\Users\Collin\Documents\Arduino\libraries\DueTimer;C:\Users\Collin\Documents\Arduino\libraries\DueTimer\utility;c:\arduino\hardware\arduino\sam\system\CMSIS\CMSIS\Include\;c:\arduino\hardware\arduino\sam\system\CMSIS\Device\ATMEL\;c:\arduino\hardware\arduino\sam\system\libsam;c:\arduino\hardware\arduino\sam\system\libsam\include;c:\arduino/hardware/tools/g++_arm_none_eabi\arm-none-eabi\include;c:\arduino/hardware/tools/g++_arm_none_eabi\arm_none_eabi\include\;c:\arduino/hardware/tools/g++_arm_none_eabi\lib\gcc\arm-none-eabi\4.4.1\include;c:\arduino/hardware/tools/g++_arm_none_eabi\lib\gcc\arm-none-eabi\4.4.1\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>C:\Users\Collin\Desktop\GEVCU\Visual Micro\.GEVCU.vsarduino.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+      <AdditionalIncludeDirectories>c:\arduino-1.5.4\hardware\arduino\sam\cores\arduino;c:\arduino-1.5.4\hardware\arduino\sam\variants\arduino_due_x;C:\Users\collin\Documents\Arduino\libraries\due_rtc;C:\Users\collin\Documents\Arduino\libraries\due_rtc\utility;C:\Users\collin\Documents\Arduino\libraries\due_can;C:\Users\collin\Documents\Arduino\libraries\due_can\utility;C:\Users\collin\Documents\Arduino\libraries\due_wire;C:\Users\collin\Documents\Arduino\libraries\due_wire\utility;C:\Users\collin\Documents\Arduino\libraries\DueTimer;C:\Users\collin\Documents\Arduino\libraries\DueTimer\utility;c:\arduino-1.5.4\libraries;c:\arduino-1.5.4\hardware\arduino\sam\libraries;C:\Program Files (x86)\Visual Micro\Visual Micro for Arduino\Micro Platforms\default\debuggers;C:\Users\collin\Documents\Arduino\libraries;c:\arduino-1.5.4\hardware\arduino\sam\system\CMSIS\CMSIS\Include\;c:\arduino-1.5.4\hardware\arduino\sam\system\CMSIS\Device\ATMEL\;c:\arduino-1.5.4\hardware\arduino\sam\system\libsam;c:\arduino-1.5.4\hardware\arduino\sam\system\libsam\include;c:\arduino-1.5.4/hardware/tools/g++_arm_none_eabi\arm-none-eabi\include;c:\arduino-1.5.4/hardware/tools/g++_arm_none_eabi\arm_none_eabi\include\;c:\arduino-1.5.4/hardware/tools/g++_arm_none_eabi\lib\gcc\arm-none-eabi\4.4.1\include;c:\arduino-1.5.4/hardware/tools/g++_arm_none_eabi\lib\gcc\arm-none-eabi\4.4.1\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ForcedIncludeFiles>C:\Users\collin\Desktop\GEVCU\Visual Micro\.GEVCU.vsarduino.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
       <IgnoreStandardIncludePath>true</IgnoreStandardIncludePath>
     </ClCompile>
     <Link>
@@ -87,6 +87,9 @@
     <ClInclude Include="CanPIDListener.h" />
     <ClInclude Include="CanThrottle.h" />
     <ClInclude Include="config.h" />
+    <ClInclude Include="constants.h">
+      <FileType>CppCode</FileType>
+    </ClInclude>
     <ClInclude Include="Device.h" />
     <ClInclude Include="DeviceManager.h" />
     <ClInclude Include="DeviceTypes.h">

GEVCU.vcxproj.filters

@@ -114,6 +114,9 @@
     <ClInclude Include="CanBrake.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="constants.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="GEVCU.ino" />

PotBrake.cpp

@@ -32,6 +32,7 @@
  */
 PotBrake::PotBrake() : Throttle() {
 	prefsHandler = new PrefHandler(POTBRAKEPEDAL);
+	commonName = "Potentiometer (analog) brake";
 }
 
 /*

PotThrottle.cpp

@@ -31,6 +31,7 @@
  */
 PotThrottle::PotThrottle() : Throttle() {
 	prefsHandler = new PrefHandler(POTACCELPEDAL);
+	commonName = "Potentiometer (analog) accelerator";
 }
 
 /*

SerialConsole.cpp

@@ -96,19 +96,9 @@ void SerialConsole::printMenu() {
 	uint8_t systype;
 	sysPrefs->read(EESYS_SYSTEM_TYPE, &systype);
 	Logger::console("SYSTYPE=%i - Set board revision (Dued=2, GEVCU3=3, GEVCU4=4)", systype);
-    SerialUSB.println("ENABLE - Enable the given device by ID");
-	SerialUSB.println("DISABLE - Disable the given device by ID");
-    Logger::console("     %X     DMOC645 Inverter", DMOC645);
-	Logger::console("     %X     Brusa DMC5 Inverter", BRUSA_DMC5);
-	//Logger::console("     Brusa Charger = %X", BRUSACHARGE);
-	//Logger::console("     TCCH Charger = %X", TCCHCHARGE);
-	Logger::console("     %X     Potentiometer (analog) accelerator", POTACCELPEDAL);
-	Logger::console("     %X     Potentiometer (analog) brake", POTBRAKEPEDAL);
-	Logger::console("     %X     CANBus accelerator", CANACCELPEDAL);
-	Logger::console("     %X     CANBus brake", CANBRAKEPEDAL);
-	Logger::console("     %X     WIFI (iChip2128)", ICHIP2128);
-	Logger::console("     %X     ELM327 Emulator over Bluetooth", ELM327EMU);
-
+
+	DeviceManager::getInstance()->printDeviceList();
+
 	if (motorController && motorController->getConfiguration()) {
 		MotorControllerConfiguration *config = (MotorControllerConfiguration *) motorController->getConfiguration();
          SerialUSB.println();

ichip_2128.cpp

@@ -40,6 +40,8 @@ ICHIPWIFI::ICHIPWIFI() {
 		serialInterface = &Serial2;
 	else //older hardware used this instead
 		serialInterface = &Serial3; 
+
+	commonName = "WIFI (iChip2128)";
 }
 
 /*