diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 5d6b769..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Uwe Sauerbrey - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/NMEAmonitor.ino b/NMEAmonitor.ino index e0a39ac..ae57e0c 100644 --- a/NMEAmonitor.ino +++ b/NMEAmonitor.ino @@ -329,6 +329,8 @@ Stream *OutputStream; // ********************************************************************* #define PressHumTempUpdatePeriod 2000 static unsigned long PressHumTempUpdated = millis(); +#define EngineUpdatePeriod 2000 +static unsigned long EngineUpdated = millis(); void loop() { @@ -349,11 +351,90 @@ void loop() ReadHumTemp(); ReadPressTemp(); - SetN2kEnvironmentalParameters(N2kMsg, 1, N2kts_OutsideTemperature, CToKelvin(TempAirHum_disp), N2khs_OutsideHumidity, Hum_disp, mBarToPascal(Press_disp)); // N2K: 130311 Environmental Parameters(Cabin Temp, Humidity, Pressure) + SetN2kOutsideEnvironmentalParameters(N2kMsg, 1, CToKelvin(TempAirHum_disp), CToKelvin(TempAirHum_disp), mBarToPascal(Press_disp)); + NMEA2000.SendMsg(N2kMsg); +//SetN2kOutsideEnvironmentalParameters(tN2kMsg &N2kMsg, unsigned char SID, double WaterTemperature, double OutsideAmbientAirTemperature=N2kDoubleNA, double AtmosphericPressure=N2kDoubleNA) + + SetN2kEnvironmentalParameters(N2kMsg, 1, N2kts_OutsideTemperature, CToKelvin(TempAirHum_disp), N2khs_OutsideHumidity, Hum_disp, mBarToPascal(Press_disp)); // N2K: 130311 Environmental Parameters(Cabin Temp, Humidity, Pressure) // SetN2kEnvironmentalParameters(N2kMsg, 1, N2kts_OutsideTemperature, CToKelvin(TempAirPress_disp), N2khs_OutsideHumidity, Hum_disp, mBarToPascal(Press_disp)); // N2K: 130311 Environmental Parameters(Cabin Temp, Humidity, Pressure) NMEA2000.SendMsg(N2kMsg); // i70: Air-temp, Humidity, Pressure } + if (EngineUpdated + EngineUpdatePeriod < millis()) { + EngineUpdated = millis(); + + SetN2kPGN127488(N2kMsg, 1 /*unsigned char EngineInstance*/, 1100 /*double EngineSpeed*/, + N2kDoubleNA /*double EngineBoostPressure = N2kDoubleNA*/, N2kInt8NA /*int8_t EngineTiltTrim = N2kInt8NA*/); + // Engine parameters rapid + // Input: + // - EngineInstance Engine instance. + // - EngineSpeed RPM (Revolutions Per Minute) + // - EngineBoostPressure in Pascal + // - EngineTiltTrim in % + NMEA2000.SendMsg(N2kMsg); +// trace("PGN: 127488:"); + + SetN2kPGN127489(N2kMsg, 1 /*unsigned char EngineInstance*/, N2kDoubleNA /*double EngineOilPress*/, 373 /*double EngineOilTemp*/, + 300 /*double EngineCoolantTemp*/, 13.6 /*double AltenatorVoltage*/, + 4 /*double FuelRate*/, 1300 /*double EngineHours*/, N2kDoubleNA /*double EngineCoolantPress=N2kDoubleNA*/, + N2kDoubleNA /*double EngineFuelPress=N2kDoubleNA*/, + N2kInt8NA /*int8_t EngineLoad=N2kInt8NA*/, N2kInt8NA /*int8_t EngineTorque=N2kInt8NA*/, + true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, + false, false, false, false, false, false, false, false); + // Engine parameters dynamic + // Input: + // - EngineInstance Engine instance. + // - EngineOilPress in Pascal + // - EngineOilTemp in Kelvin + // - EngineCoolantTemp in Kelvin + // - AltenatorVoltage in Voltage + // - FuelRate in litres/hour + // - EngineHours in seconds + // - EngineCoolantPress in Pascal + // - EngineFuelPress in Pascal + // - EngineLoad in % + // - EngineTorque in % + // - flagCheckEngine + // - flagOverTemp + // - flagLowOilPress + // - flagLowOilLevel + // - flagLowFuelPress + // - flagLowSystemVoltage + // - flagLowCoolantLevel + // - flagWaterFlow + // - flagWaterInFuel + // - flagChargeIndicator + // - flagPreheatIndicator + // - flagHighBoostPress + // - flagRevLimitExceeded + // - flagEgrSystem + // - flagTPS + // - flagEmergencyStopMode + // - flagWarning1 + // - flagWarning2 + // - flagPowerReduction + // - flagMaintenanceNeeded + // - flagEngineCommError + // - flagSubThrottle + // - flagNeutralStartProtect + // - flagEngineShuttingDown + NMEA2000.SendMsg(N2kMsg); +// trace("PGN: 127489:"); + + SetN2kPGN127493(N2kMsg, 1 /*unsigned char EngineInstance*/, N2kTG_Forward /*tN2kTransmissionGear TransmissionGear*/, + 200 /*double OilPressure*/, 300 /*double OilTemperature*/, 0 /*unsigned char DiscreteStatus1=0*/); + // Transmission parameters, dynamic + // Input: + // - EngineInstance Engine instance. + // - TransmissionGear Selected transmission. See tN2kTransmissionGear + // - OilPressure in Pascal + // - OilTemperature in K + // - EngineTiltTrim in % + NMEA2000.SendMsg(N2kMsg); +// trace("PGN: 127493:"); + } + + NMEA2000.ParseMessages(); // this function must called here, do not delete it diff --git a/NMEAmonitor.sln b/NMEAmonitor.sln deleted file mode 100644 index 543d26b..0000000 --- a/NMEAmonitor.sln +++ /dev/null @@ -1,22 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NMEAmonitor", "NMEAmonitor.vcxproj", "{BA1AD1E5-9AB8-46CE-AD10-7A81C8242CD6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x86 = Debug|x86 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BA1AD1E5-9AB8-46CE-AD10-7A81C8242CD6}.Debug|x86.ActiveCfg = Debug|Win32 - {BA1AD1E5-9AB8-46CE-AD10-7A81C8242CD6}.Debug|x86.Build.0 = Debug|Win32 - {BA1AD1E5-9AB8-46CE-AD10-7A81C8242CD6}.Release|x86.ActiveCfg = Release|Win32 - {BA1AD1E5-9AB8-46CE-AD10-7A81C8242CD6}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/NMEAmonitor.vcxproj b/NMEAmonitor.vcxproj deleted file mode 100644 index 50e4473..0000000 --- a/NMEAmonitor.vcxproj +++ /dev/null @@ -1,306 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {BA1AD1E5-9AB8-46CE-AD10-7A81C8242CD6} - $safeprojectname$ - NMEAmonitor - - - - Application - true - - - MultiByte - - - Application - false - - - true - MultiByte - - - - - - - - - - - - - - - Level3 - Disabled - true - $(ProjectDir)..\NMEAmonitor;$(ProjectDir)..\libraries\LCDMenuLib\src;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\libraries\LiquidCrystal\src;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\libraries\EEPROM;$(ProjectDir)..\libraries\NMEA2000\src;$(ProjectDir)..\libraries\NMEA2000_teensy;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\libraries\FlexCAN;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\libraries\Keypad\src;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\libraries\Wire;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\libraries\Wire\utility;$(ProjectDir)..\libraries\DHT-sensor-library;$(ProjectDir)..\libraries\BMP180_Breakout_Arduino_Library\src;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\libraries;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\libraries;$(ProjectDir)..\libraries;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\cores\teensy3;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\cores\teensy3\avr;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\cores\teensy3\util;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\tools\arm\arm-none-eabi\include;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\tools\arm\lib\gcc\arm-none-eabi\5.4.1\include;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy;%(AdditionalIncludeDirectories) - $(ProjectDir)__vm\.NMEAmonitor.vsarduino.h;%(ForcedIncludeFiles) - false - __HARDWARE_MK20dx256__;__HARDWARE_MK20DX256__;__MK20DX256__;TEENSYDUINO=141;ARDUINO=10805;F_CPU=96000000;USB_SERIAL;LAYOUT_GERMAN;__cplusplus=201103L;_VMICRO_INTELLISENSE;%(PreprocessorDefinitions) - - - true - - - - - Level3 - Disabled - true - true - true - $(ProjectDir)..\NMEAmonitor;$(ProjectDir)..\libraries\LCDMenuLib\src;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\libraries\LiquidCrystal\src;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\libraries\EEPROM;$(ProjectDir)..\libraries\NMEA2000\src;$(ProjectDir)..\libraries\FlexCAN_Library;$(ProjectDir)..\libraries\NMEA2000_teensy;$(ProjectDir)..\libraries\DHT-sensor-library;$(ProjectDir)..\libraries\BMP180_Breakout_Arduino_Library\src;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\libraries\Wire;$(ProjectDir)..\libraries\Adafruit_Sensor;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\libraries\Keypad\src;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\libraries\Wire\utility;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\libraries;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\libraries;$(ProjectDir)..\libraries;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\cores\teensy3;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\cores\teensy3\avr;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy\avr\cores\teensy3\util;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\tools\arm\arm-none-eabi\include;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\tools\arm\lib\gcc\arm-none-eabi\5.4.1\include;$(ProjectDir)..\..\..\..\..\Program Files (x86)\Arduino\hardware\teensy;%(AdditionalIncludeDirectories) - $(ProjectDir)__vm\.NMEAmonitor.vsarduino.h;%(ForcedIncludeFiles) - false - __HARDWARE_MK20dx256__;__HARDWARE_MK20DX256__;__MK20DX256__;TEENSYDUINO=144;ARDUINO=10807;F_CPU=96000000;USB_SERIAL;LAYOUT_GERMAN;__cplusplus=201103L;_VMICRO_INTELLISENSE;%(PreprocessorDefinitions) - - - true - true - true - - - - - - - - - - - - - - - - - - - - - - CppCode - - - CppCode - - - CppCode - - - CppCode - - - CppCode - - - CppCode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - VisualMicroDebugger - - - - - - - - - - \ No newline at end of file diff --git a/NMEAmonitor.vcxproj.filters b/NMEAmonitor.vcxproj.filters deleted file mode 100644 index dae46b6..0000000 --- a/NMEAmonitor.vcxproj.filters +++ /dev/null @@ -1,650 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {6f2a295e-14fc-403d-8004-2fdafd195ea9} - - - {d41d4e7a-72c3-41e5-be6c-3c95ae9e873e} - - - {0ad1110a-ea8f-4266-beaf-3edc04e754bf} - - - {eb21ce2d-abcc-4345-a7c1-29e0fcce08fb} - - - {03f357f0-38c6-4f3b-9a4d-6636c7ba8484} - - - {30c66993-944a-42c4-b7ad-8c198497349a} - - - {63109b07-cde9-47c3-a299-e0e3305cf28b} - - - {1cf17812-883b-4342-bb25-9d2d95743cb0} - - - {127201b1-88d7-43cb-b8c0-d0149bb8c2d2} - - - {9dca2a26-88cd-49e8-8626-bab187a91f46} - - - {5af4fd81-f3c9-4f3d-a599-27a12c400f29} - - - {889d1ea6-eefc-4692-8ffc-359d8624e2a9} - - - {45efb6c6-1140-40f2-b132-d2799ebc23fc} - - - {9466d75e-118d-48d8-804a-b73629b9768a} - - - {03b2a3fa-0038-4485-815a-1c48b6a229e2} - - - {4639b8a6-7358-4ece-b3f6-7032ec6c6a03} - - - {dbfb007a-e6b7-413f-af8d-41eb4731493d} - - - {927b8da2-0ab9-4824-b3ea-ffb196420144} - - - - - - - - - - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\libraries\LCDMenuLib - - - src\_micro-api-readonly\libraries\LiquidCrystal - - - src\_micro-api-readonly\libraries\EEPROM - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000_teensy - - - src\_micro-api-readonly\libraries\Keypad - - - src\_micro-api-readonly\libraries\Wire - - - src\_micro-api-readonly\libraries\DHT-sensor-library - - - src\_micro-api-readonly\libraries\DHT-sensor-library - - - src\_micro-api-readonly\libraries\BMP180_Breakout_Arduino_Library - - - src\_micro-api-readonly\libraries\Adafruit_Sensor - - - - - Header Files - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core\avr - - - src\_micro-api-readonly\core\avr - - - src\_micro-api-readonly\core\avr - - - src\_micro-api-readonly\core\avr - - - src\_micro-api-readonly\core\avr - - - src\_micro-api-readonly\core\avr - - - src\_micro-api-readonly\core\avr - - - src\_micro-api-readonly\core\util - - - src\_micro-api-readonly\core\util - - - src\_micro-api-readonly\core\util - - - src\_micro-api-readonly\core\util - - - src\_micro-api-readonly\libraries\LCDMenuLib - - - src\_micro-api-readonly\libraries\LCDMenuLib - - - src\_micro-api-readonly\libraries\LCDMenuLib - - - src\_micro-api-readonly\libraries\LiquidCrystal - - - src\_micro-api-readonly\libraries\LiquidCrystal - - - src\_micro-api-readonly\libraries\EEPROM - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000_teensy - - - src\_micro-api-readonly\libraries\Keypad - - - src\_micro-api-readonly\libraries\Keypad - - - src\_micro-api-readonly\libraries\Wire - - - src\_micro-api-readonly\libraries\Wire - - - src\_micro-api-readonly\libraries\Wire\utility - - - src\_micro-api-readonly\libraries\FlexCAN_Library - - - src\_micro-api-readonly\libraries\FlexCAN_Library - - - src\_micro-api-readonly\libraries\DHT-sensor-library - - - src\_micro-api-readonly\libraries\DHT-sensor-library - - - src\_micro-api-readonly\libraries\BMP180_Breakout_Arduino_Library - - - src\_micro-api-readonly\libraries\Adafruit_Sensor - - - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\core - - - src\_micro-api-readonly\libraries\LCDMenuLib - - - src\_micro-api-readonly\libraries\LCDMenuLib - - - src\_micro-api-readonly\libraries\LiquidCrystal - - - src\_micro-api-readonly\libraries\LiquidCrystal - - - src\_micro-api-readonly\libraries\EEPROM - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000_teensy - - - src\_micro-api-readonly\libraries\Keypad - - - src\_micro-api-readonly\libraries\Keypad - - - src\_micro-api-readonly\libraries\Wire - - - src\_micro-api-readonly\libraries\Wire - - - src\_micro-api-readonly\libraries\Wire\utility - - - src\_micro-api-readonly\libraries\FlexCAN_Library - - - src\_micro-api-readonly\libraries\DHT-sensor-library - - - src\_micro-api-readonly\libraries\DHT-sensor-library - - - src\_micro-api-readonly\libraries\BMP180_Breakout_Arduino_Library - - - - - src\_micro-api-readonly\libraries\LCDMenuLib - - - src\_micro-api-readonly\libraries\LiquidCrystal - - - src\_micro-api-readonly\libraries\EEPROM - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\NMEA2000 - - - src\_micro-api-readonly\libraries\Keypad - - - src\_micro-api-readonly\libraries\Wire - - - src\_micro-api-readonly\libraries\FlexCAN_Library - - - src\_micro-api-readonly\libraries\DHT-sensor-library - - - src\_micro-api-readonly\libraries\BMP180_Breakout_Arduino_Library - - - \ No newline at end of file diff --git a/NMEAmonitor.vcxproj.user b/NMEAmonitor.vcxproj.user deleted file mode 100644 index 12a5054..0000000 --- a/NMEAmonitor.vcxproj.user +++ /dev/null @@ -1,6 +0,0 @@ - - - - false - - \ No newline at end of file diff --git a/ProcessN2K.ino b/ProcessN2K.ino index aabc260..40d2223 100644 --- a/ProcessN2K.ino +++ b/ProcessN2K.ino @@ -701,9 +701,10 @@ void DCStatus(const tN2kMsg &N2kMsg) { unsigned char StateOfCharge; unsigned char StateOfHealth; double TimeRemaining; - double RippleVoltage; + double RippleVoltage; + double Capacity; - if (ParseN2kDCStatus(N2kMsg, SID, DCInstance, DCType, StateOfCharge, StateOfHealth, TimeRemaining, RippleVoltage)) { + if (ParseN2kDCStatus(N2kMsg, SID, DCInstance, DCType, StateOfCharge, StateOfHealth, TimeRemaining, RippleVoltage, Capacity)) { #if USE_SERIAL == 1 Serial.print("DC instance: "); Serial.println(DCInstance); @@ -712,6 +713,7 @@ void DCStatus(const tN2kMsg &N2kMsg) { Serial.print(" - state of health (%): "); Serial.println(StateOfHealth); Serial.print(" - time remaining (h): "); Serial.println(TimeRemaining / 60); Serial.print(" - ripple voltage: "); Serial.println(RippleVoltage); + Serial.print(" - capacity: "); Serial.println(Capacity); #endif } else { diff --git a/README.md b/README.md deleted file mode 100644 index 9afe7aa..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -# NMEAmonitor \ No newline at end of file