first commit
Update README.md
pull from master
Merge https://github.com/njozsef/cheali-charger-test1

Conflicts:
	CMakeLists.txt
	README.md
	arduino/CMakeLists.txt
	arduino/arduino.cmake
	arduino/boards.txt
	arduino/cores/arduino/Arduino.h
	arduino/cores/arduino/CDC.cpp
	arduino/cores/arduino/CMakeLists.txt
	arduino/cores/arduino/Client.h
	arduino/cores/arduino/HID.cpp
	arduino/cores/arduino/HardwareSerial.cpp
	arduino/cores/arduino/HardwareSerial.h
	arduino/cores/arduino/IPAddress.cpp
	arduino/cores/arduino/IPAddress.h
	arduino/cores/arduino/Platform.h
	arduino/cores/arduino/Print.cpp
	arduino/cores/arduino/Print.h
	arduino/cores/arduino/Printable.h
	arduino/cores/arduino/Server.h
	arduino/cores/arduino/Stream.cpp
	arduino/cores/arduino/Stream.h
	arduino/cores/arduino/Tone.cpp
	arduino/cores/arduino/USBAPI.h
	arduino/cores/arduino/USBCore.cpp
	arduino/cores/arduino/USBCore.h
	arduino/cores/arduino/USBDesc.h
	arduino/cores/arduino/Udp.h
	arduino/cores/arduino/WCharacter.h
	arduino/cores/arduino/WInterrupts.c
	arduino/cores/arduino/WMath.cpp
	arduino/cores/arduino/WString.cpp
	arduino/cores/arduino/WString.h
	arduino/cores/arduino/binary.h
	arduino/cores/arduino/main.cpp
	arduino/cores/arduino/new.cpp
	arduino/cores/arduino/new.h
	arduino/cores/arduino/wiring.c
	arduino/cores/arduino/wiring_analog.c
	arduino/cores/arduino/wiring_digital.c
	arduino/cores/arduino/wiring_private.h
	arduino/cores/arduino/wiring_pulse.c
	arduino/cores/arduino/wiring_shift.c
	arduino/variants/atmega32/pins_arduino.h
	docs/GTPowerA6-10/back.jpg
	docs/GTPowerA6-10/front.jpg
	docs/imaxB6/imaxB6-clone-front.jpg
	docs/imaxB6/imaxB6-original-back.jpg
	docs/imaxB6/imaxB6-original-front.jpg
	hex/beta/cheali-charger-Turnigy-Accucel-6-50W-5A-0.31.hex
	hex/beta/cheali-charger-Turnigy-MEGA200-0.31.hex
	hex/beta/cheali-charger-Turnigy-MEGA400-0.31.hex
	hex/cheali-charger-GTPowerA6-10-0.31.hex
	hex/cheali-charger-imaxB6-clone-0.31.hex
	hex/cheali-charger-imaxB6-original-0.31.hex
	src/TODO
	src/core/AnalogInputs.cpp
	src/core/AnalogInputs.h
	src/core/Balancer.cpp
	src/core/Balancer.h
	src/core/Blink.cpp
	src/core/Blink.h
	src/core/Buzzer.cpp
	src/core/Buzzer.h
	src/core/CMakeLists.txt
	src/core/CMakeListsPost.txt
	src/core/Calibrate.cpp
	src/core/Calibrate.h
	src/core/ChealiCharger2.cpp
	src/core/ChealiCharger2.h
	src/core/DeltaChargeStrategy.cpp
	src/core/DeltaChargeStrategy.h
	src/core/Discharger.cpp
	src/core/Discharger.h
	src/core/DummyLiquidCrystal.h
	src/core/EditMenu.cpp
	src/core/EditMenu.h
	src/core/EditName.cpp
	src/core/EditName.h
	src/core/Keyboard.cpp
	src/core/Keyboard.h
	src/core/LcdPrint.cpp
	src/core/LcdPrint.h
	src/core/LiquidCrystal.cpp
	src/core/LiquidCrystal.h
	src/core/MainMenu.h
	src/core/Menu.cpp
	src/core/Menu.h
	src/core/Monitor.cpp
	src/core/Monitor.h
	src/core/Multiplexer.cpp
	src/core/Multiplexer.h
	src/core/Options.cpp
	src/core/Options.h
	src/core/PolarityCheck.cpp
	src/core/PolarityCheck.h
	src/core/Program.cpp
	src/core/Program.h
	src/core/ProgramData.cpp
	src/core/ProgramData.h
	src/core/ProgramDataMenu.cpp
	src/core/ProgramDataMenu.h
	src/core/SMPS.cpp
	src/core/SMPS.h
	src/core/Screen.cpp
	src/core/Screen.h
	src/core/Serial.cpp
	src/core/Serial.h
	src/core/SerialLog.cpp
	src/core/SerialLog.h
	src/core/Settings.cpp
	src/core/Settings.h
	src/core/SettingsMenu.cpp
	src/core/SettingsMenu.h
	src/core/SimpleChargeStrategy.cpp
	src/core/SimpleChargeStrategy.h
	src/core/SimpleDischargeStrategy.cpp
	src/core/SimpleDischargeStrategy.h
	src/core/StackInfo.cpp
	src/core/StackInfo.h
	src/core/StartInfoStrategy.cpp
	src/core/StartInfoStrategy.h
	src/core/StaticMenu.h
	src/core/StorageStrategy.cpp
	src/core/StorageStrategy.h
	src/core/Strategy.cpp
	src/core/Strategy.h
	src/core/Thevenin.cpp
	src/core/Thevenin.h
	src/core/TheveninChargeStrategy.cpp
	src/core/TheveninChargeStrategy.h
	src/core/TheveninDischargeStrategy.cpp
	src/core/TheveninDischargeStrategy.h
	src/core/TheveninMethod.cpp
	src/core/TheveninMethod.h
	src/core/Timer.cpp
	src/core/Timer.h
	src/core/Utils.cpp
	src/core/Utils.h
	src/core/Version.cpp
	src/core/Version.h.in
	src/core/cheali-charger.size
	src/core/memory.h
	src/hardware/GTPowerA6-10-generic/CMakeLists.txt
	src/hardware/GTPowerA6-10-generic/GTPowerA6-10-pins.h
	src/hardware/GTPowerA6-10-generic/GTPowerA6-10.cpp
	src/hardware/GTPowerA6-10-generic/GTPowerA6-10.h
	src/hardware/GTPowerA6-10-generic/TimerOne.cpp
	src/hardware/GTPowerA6-10-generic/TimerOne.h
	src/hardware/GTPowerA6-10-generic/adc.cpp
	src/hardware/GTPowerA6-10-generic/adc.h
	src/hardware/GTPowerA6-10-original/CMakeLists.txt
	src/hardware/GTPowerA6-10-original/GTPowerA6-10-original.h
	src/hardware/GTPowerA6-10-original/Hardware.h
	src/hardware/GTPowerA6-10-original/cheali-charger-GTPowerA6-10.size
	src/hardware/GTPowerA6-10-original/defaultCalibration.cpp
	src/hardware/Turnigy-A-6-10-200W/CMakeLists.txt
	src/hardware/Turnigy-A-6-10-200W/Hardware.h
	src/hardware/Turnigy-A-6-10-200W/Turnigy-A-6-10-200W.h
	src/hardware/Turnigy-A-6-10-200W/cheali-charger-Turnigy-A-6-10-200W.size
	src/hardware/Turnigy-A-6-10-200W/defaultCalibration.cpp
	src/hardware/Turnigy-Accucel-6-50W-5A/CMakeLists.txt
	src/hardware/Turnigy-Accucel-6-50W-5A/Hardware.h
	src/hardware/Turnigy-Accucel-6-50W-5A/Turnigy-Accucel-6-50W-5A.h
	src/hardware/Turnigy-Accucel-6-50W-5A/cheali-charger-Turnigy-Accucel-6-50W-5A.size
	src/hardware/Turnigy-Accucel-6-50W-5A/defaultCalibration.cpp
	src/hardware/Turnigy-MEGA-400Wx2/CMakeLists.txt
	src/hardware/Turnigy-MEGA-400Wx2/Hardware.h
	src/hardware/Turnigy-MEGA-400Wx2/Turnigy-MEGA-400Wx2.h
	src/hardware/Turnigy-MEGA-400Wx2/cheali-charger-Turnigy-MEGA-400Wx2.size
	src/hardware/Turnigy-MEGA-400Wx2/defaultCalibration.cpp
	src/hardware/imaxB6-clone/CMakeLists.txt
	src/hardware/imaxB6-clone/Hardware.h
	src/hardware/imaxB6-clone/cheali-charger-imaxB6-clone.size
	src/hardware/imaxB6-clone/defaultCalibration.cpp
	src/hardware/imaxB6-clone/imaxB6-clone.h
	src/hardware/imaxB6-generic/CMakeLists.txt
	src/hardware/imaxB6-generic/SMPS_PID.cpp
	src/hardware/imaxB6-generic/SMPS_PID.h
	src/hardware/imaxB6-generic/TimerOne.cpp
	src/hardware/imaxB6-generic/TimerOne.h
	src/hardware/imaxB6-generic/adc.cpp
	src/hardware/imaxB6-generic/adc.h
	src/hardware/imaxB6-generic/imaxB6-pins.h
	src/hardware/imaxB6-generic/imaxB6.cpp
	src/hardware/imaxB6-generic/imaxB6.h
	src/hardware/imaxB6-original/CMakeLists.txt
	src/hardware/imaxB6-original/Hardware.h
	src/hardware/imaxB6-original/cheali-charger-imaxB6-original.size
	src/hardware/imaxB6-original/defaultCalibration.cpp
	src/hardware/imaxB6-original/imaxB6-original.h
	utils/LogView/Cheali Charger.ini
	utils/dumpUSB/defaultCalibration.cpp.template
Merge https://github.com/stawel/cheali-charger

Conflicts:
	src/hardware/GTPowerA6-10-original/cheali-charger-GTPowerA6-10.size
	src/hardware/Turnigy-A-6-10-200W/cheali-charger-Turnigy-A-6-10-200W.size
	src/hardware/Turnigy-Accucel-6-50W-5A/cheali-charger-Turnigy-Accucel-6-50W-5A.size
	src/hardware/Turnigy-MEGA-400Wx2/cheali-charger-Turnigy-MEGA-400Wx2.size
	src/hardware/imaxB6-clone/cheali-charger-imaxB6-clone.size
	src/hardware/imaxB6-original/cheali-charger-imaxB6-original.size
nothing
merged
MEGA400 modify max. calibration parameters
modify README.MD
added Energy screen.
added Timedata charger end.
added types for Energyscreen (Power,Work)
add two unit for 'lcdPrintAnalog' (Watt and WattHour)
added Energyscreen on charge and discharge screentype.
dot=true on lcdprintanalog (power, work)
mod displayenergy
powerscreen moving after vout,vbal and simplify
change sortorder
added valid percentage calculation for Lipo batteries.
fix
Update README.md