Merge pull request #123 from shinhub/unifying_name

Unifying name to ChameleonMini

.travis.yml

@@ -8,11 +8,11 @@ matrix:
 before_install: sudo apt-get update -qq
 install: sudo apt-get install -y gcc-avr avr-libc binutils-avr
 before_script: 
-script: cd Firmware/Chameleon-Mini/; make
+script: cd Firmware/ChameleonMini/; make
 deploy:
   provider: releases
   api_key: $GH_API_KEY
   file: 
-    - "$TRAVIS_BUILD_DIR/Firmware/Chameleon-Mini/Chameleon-Mini.hex"
-    - "$TRAVIS_BUILD_DIR/Firmware/Chameleon-Mini/Chameleon-Mini.eep"
-  skip_cleanup: true
+    - "$TRAVIS_BUILD_DIR/Firmware/ChameleonMini/ChameleonMini.hex"
+    - "$TRAVIS_BUILD_DIR/Firmware/ChameleonMini/ChameleonMini.eep"
+  skip_cleanup: true

Drivers/98-ChameleonMini.rules

@@ -1,8 +1,8 @@
 # Rule for ChameleonMini RFID Research tool (RevG)
-ATTRS{product}=="Chameleon-Mini", SUBSYSTEMS=="usb", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="04b2", GROUP="users", MODE="0666", SYMLINK+="chameleonG", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="16d0", ATTRS{idProduct}=="04b2", GROUP="users", MODE="0666", SYMLINK+="chameleonG", ENV{ID_MM_DEVICE_IGNORE}="1"
 
 # Rule for ChameleonMini RFID Research tool (RevE)
-ATTRS{product}=="Chameleon-Mini", SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2044", GROUP="users", MODE="0666", SYMLINK+="chameleonE", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2044", GROUP="users", MODE="0666", SYMLINK+="chameleonE", ENV{ID_MM_DEVICE_IGNORE}="1"
 
 # DFU mode (i.e., flashing the devices)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2fde", GROUP="users", MODE="0666"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2fde", GROUP="users", MODE="0666"

Firmware/Chameleon-Mini/Chameleon-Mini.c → Firmware/ChameleonMini/ChameleonMini.c

@@ -1,4 +1,4 @@
-#include "Chameleon-Mini.h"
+#include "ChameleonMini.h"
 
 int main(void) {
 	SystemInit();

Firmware/Chameleon-Mini/ITS_A_CARD.cproj → Firmware/ChameleonMini/ChameleonMini.cproj

@@ -12,9 +12,9 @@
     <OutputFileName>$(MSBuildProjectName)</OutputFileName>
     <OutputFileExtension>.elf</OutputFileExtension>
     <OutputDirectory>$(MSBuildProjectDirectory)\$(Configuration)</OutputDirectory>
-    <AssemblyName>ITS_A_CARD</AssemblyName>
-    <Name>ITS_A_CARD</Name>
-    <RootNamespace>ITS_A_CARD</RootNamespace>
+    <AssemblyName>ChameleonMini</AssemblyName>
+    <Name>ChameleonMini</Name>
+    <RootNamespace>ChameleonMini</RootNamespace>
     <ToolchainFlavour>Native</ToolchainFlavour>
     <KeepTimersRunning>true</KeepTimersRunning>
     <OverrideVtor>false</OverrideVtor>
@@ -637,7 +637,7 @@
     <Compile Include="Button.c">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="Chameleon-Mini.c">
+    <Compile Include="ChameleonMini.c">
       <SubType>compile</SubType>
     </Compile>
     <Compile Include="Common.c">
@@ -756,4 +756,4 @@
     </Compile>
   </ItemGroup>
   <Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\Compiler.targets" />
-</Project>
+</Project>

Firmware/Chameleon-Mini/LUFADescriptors.c → Firmware/ChameleonMini/LUFADescriptors.c

@@ -184,13 +184,13 @@ const USB_Descriptor_String_t PROGMEM LanguageString = USB_STRING_DESCRIPTOR_ARR
  *  form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
  *  Descriptor.
  */
-const USB_Descriptor_String_t PROGMEM ManufacturerString = USB_STRING_DESCRIPTOR(L"Chameleon Mini");
+const USB_Descriptor_String_t PROGMEM ManufacturerString = USB_STRING_DESCRIPTOR(L"ChameleonMini");
 
 /** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
  *  and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
  *  Descriptor.
  */
-const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"RevE Rebooted (iceman1001)");
+const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"RevE Rebooted (iceman)");
 
 /** This function is called by the library when in device mode, and must be overridden (see LUFA library "USB Descriptors"
  *  documentation) by the application code so that the address and size of a requested descriptor can be given

Firmware/Chameleon-Mini/Makefile → Firmware/ChameleonMini/Makefile

@@ -97,7 +97,7 @@ ARCH		 = XMEGA
 BOARD		 = NONE
 F_CPU		 = 32000000
 F_USB		 = 48000000
-TARGET		 = Chameleon-Mini
+TARGET		 = ChameleonMini
 OPTIMIZATION = s
 SRC			+= $(TARGET).c LUFADescriptors.c System.c Configuration.c Random.c Common.c Memory.c Button.c Settings.c LED.c Map.c AntennaLevel.c Uart.c
 SRC			+= Terminal/Terminal.c Terminal/Commands.c Terminal/XModem.c Terminal/CommandLine.c
@@ -121,8 +121,8 @@ AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep
 AVRDUDE_FLAGS = -p $(AVRDUDE_MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
 
 #AVRDUDE settings to program the precompiled firmware
-AVRDUDE_WRITE_APP_LATEST = -U application:w:Latest/Chameleon-Mini.hex
-AVRDUDE_WRITE_EEPROM_LATEST = -U eeprom:w:Latest/Chameleon-Mini.eep
+AVRDUDE_WRITE_APP_LATEST = -U application:w:Latest/$(TARGET).hex
+AVRDUDE_WRITE_EEPROM_LATEST = -U eeprom:w:Latest/$(TARGET).eep
 endif
 
 # Default target

Firmware/Chameleon-Mini/Terminal/Commands.c → Firmware/ChameleonMini/Terminal/Commands.c

@@ -58,7 +58,7 @@
 #include <avr/pgmspace.h>
 #include "XModem.h"
 #include "../Settings.h"
-#include "../Chameleon-Mini.h"
+#include "../ChameleonMini.h"
 #include "../src/LUFA/LUFA/Version.h"
 #include "../Configuration.h"
 #include "../Random.h"