-
Notifications
You must be signed in to change notification settings - Fork 68
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #109 from Tom-evnut/FeatureUpdateSept24
Feature update sept24 - Jamie Jones Special Edition
- Loading branch information
Showing
21 changed files
with
677 additions
and
52 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * This file is part of the Zombieverter VCU project. | ||
| * | ||
| * Copyright (C) 2018 Johannes Huebner <[email protected]> | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| #ifndef OUTLANDERCANHEATER_H | ||
| #define OUTLANDERCANHEATER_H | ||
|
|
||
| //#include <libopencm3/stm32/usart.h> | ||
| #include <heater.h> | ||
|
|
||
|
|
||
| class OutlanderCanHeater : public Heater | ||
| { | ||
| public: | ||
| void SetTargetTemperature(float temp); | ||
| void SetCanInterface(CanHardware* c); | ||
| void DecodeCAN(int id, uint32_t data[2]); | ||
| void SetPower(uint16_t power, bool HeatReq); | ||
| void Task100Ms(); | ||
|
|
||
| private: | ||
| int8_t currentTemperature; | ||
| int8_t desiredTemperature; | ||
|
|
||
| bool shouldHeat; | ||
| static void handle398(uint32_t data[2]); | ||
|
|
||
| }; | ||
|
|
||
| #endif // OUTLANDERCANHEATER_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /* | ||
| * This file is part of the ZombieVerter project. | ||
| * | ||
| * Copyright (C) 2021-2023 Johannes Huebner <[email protected]> | ||
| * Damien Maguire <[email protected]> | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| *Control of the Mitsubishi Outlander PHEV on board charger (OBC) and DCDC Converter. | ||
| * | ||
| */ | ||
| #ifndef OUTLANDERHEARTBEAT_H | ||
| #define OUTLANDERHEARTBEAT_H | ||
|
|
||
| #include <stdint.h> | ||
| #include "params.h" | ||
| #include "canhardware.h" | ||
|
|
||
| class OutlanderHeartBeat | ||
| { | ||
|
|
||
| public: | ||
| static void Task100Ms(); | ||
| static void SetCanInterface(CanHardware* c); | ||
| static void SetPullInEVSE(bool pullInEVSE); | ||
|
|
||
|
|
||
| protected: | ||
|
|
||
| }; | ||
|
|
||
| #endif // OUTLANDERHEARTBEAT_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * This file is part of the ZombieVerter project. | ||
| * | ||
| * Copyright (C) 2022 Charlie Smurthwaite | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| #ifndef KANGOOBMS_H | ||
| #define KANGOOBMS_H | ||
| #include <stdint.h> | ||
|
|
||
| class KangooBMS: public BMS | ||
| { | ||
| public: | ||
| virtual void SetCanInterface(CanHardware* c); | ||
| void DecodeCAN(int id, uint8_t * data); | ||
| float MaxChargeCurrent(); | ||
| float GetCurrent(); | ||
| void Task100Ms(); | ||
| private: | ||
| bool BMSDataValid(); | ||
| bool ChargeAllowed(); | ||
| int messageCounter = 0; | ||
| int chargeCurrentLimit = 0; | ||
| int timeoutCounter = 0; | ||
| uint16_t maxChargeAllowed = 0; | ||
| uint8_t maxInput = 0; | ||
| uint8_t maxOutput = 0; | ||
| uint16_t isolationResistance = 0; | ||
| float minCellV = 0; | ||
| float maxCellV = 0; | ||
| float minTempC = 0; | ||
| float maxTempC = 0; | ||
| float stateOfCharge = 0; | ||
| float current = 0; | ||
| float remainingKHW = 0; | ||
| float batteryVoltage = 500; //higher than possible so cannot complete precharge until BMS reports battery voltage | ||
| }; | ||
| #endif // SIMPBMS_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.