From 650efeb6c4a58c5e9f47045a4ac7cfb2178824b0 Mon Sep 17 00:00:00 2001 From: Josh Stewart Date: Fri, 6 Oct 2023 15:01:23 +1100 Subject: [PATCH] 202311-dev signatures and updates file --- README.md | 6 +++--- reference/speeduino.ini | 2 +- speeduino/comms.cpp | 8 ++++---- speeduino/comms_legacy.cpp | 8 ++++---- speeduino/updates.ino | 13 +++++++++++-- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 0689e112..79ea6ad1 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ [![License](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://github.com/noisymime/speeduino/blob/master/LICENSE) [![Build Status](https://img.shields.io/github/actions/workflow/status/noisymime/speeduino/build-firmware.yml?label=Build%20Status&branch=master)](https://github.com/noisymime/speeduino/actions/workflows/build-firmware.yml) [![Unit Tests](https://img.shields.io/github/actions/workflow/status/noisymime/speeduino/unit-tests.yml?label=Unit%20Tests&branch=master)](https://github.com/noisymime/speeduino/actions/workflows/unit-tests.yml) -[![Open Bounties](https://img.shields.io/bountysource/team/speeduino/activity.svg)](https://www.bountysource.com/teams/speeduino) -[![GitHub commits](https://img.shields.io/github/commits-since/noisymime/speeduino/202305.svg)](https://github.com/noisymime/speeduino/compare/202305...master) ![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/noisymime/d8a449a3f6d3307dab457431512502f9/raw/misra_results.json) +[![Sponsors](https://img.shields.io/github/sponsors/noisymime)](https://github.com/sponsors/noisymime) +[![GitHub commits](https://img.shields.io/github/commits-since/noisymime/speeduino/202310.svg)](https://github.com/noisymime/speeduino/compare/202310...master) [![https://img.shields.io/discord/879495735912071269 ](https://img.shields.io/discord/879495735912071269?label=Discord&logo=Discord)](https://discord.gg/YWCEexaNDe) ##### A low cost, DIY friendly Engine Management System (ECU) based on the Arduino framework @@ -31,8 +31,8 @@ Of course, being open source, you are free to use the design files provided here ## Support In addition the manual referenced above, Speeduino has a large and very vibrant community of people to help out with your setup or any questions you might add. -* [Speeduino Forum](https://speeduino.com/forum) * [Discord](https://discord.gg/YWCEexaNDe) +* [Speeduino Forum](https://speeduino.com/forum) * [Facebook](https://www.facebook.com/groups/191918764521976/) ## Contributors diff --git a/reference/speeduino.ini b/reference/speeduino.ini index e0f50b71..2c862ffd 100644 --- a/reference/speeduino.ini +++ b/reference/speeduino.ini @@ -5,7 +5,7 @@ MTversion = 2.25 queryCommand = "Q" - signature = "speeduino 202310" + signature = "speeduino 202311-dev" versionInfo = "S" ;This info is what is displayed to user [TunerStudio] diff --git a/speeduino/comms.cpp b/speeduino/comms.cpp index 91c119a5..78dfafa7 100644 --- a/speeduino/comms.cpp +++ b/speeduino/comms.cpp @@ -63,10 +63,10 @@ void sendCompositeLog(void); */ constexpr byte serialVersion[] PROGMEM = {SERIAL_RC_OK, '0', '0', '2'}; constexpr byte canId[] PROGMEM = {SERIAL_RC_OK, 0}; -//constexpr byte codeVersion[] PROGMEM = { SERIAL_RC_OK, 's','p','e','e','d','u','i','n','o',' ','2','0','2','3','0','6','-','d','e','v'} ; //Note no null terminator in array and statu variable at the start -//constexpr byte productString[] PROGMEM = { SERIAL_RC_OK, 'S', 'p', 'e', 'e', 'd', 'u', 'i', 'n', 'o', ' ', '2', '0', '2', '3', '.', '0', '6', '-', 'd', 'e', 'v'}; -constexpr byte codeVersion[] PROGMEM = { SERIAL_RC_OK, 's','p','e','e','d','u','i','n','o',' ','2','0','2','3','1','0'} ; //Note no null terminator in array and statu variable at the start -constexpr byte productString[] PROGMEM = { SERIAL_RC_OK, 'S', 'p', 'e', 'e', 'd', 'u', 'i', 'n', 'o', ' ', '2', '0', '2', '3', '.', '1', '0'}; +constexpr byte codeVersion[] PROGMEM = { SERIAL_RC_OK, 's','p','e','e','d','u','i','n','o',' ','2','0','2','3','1','1','-','d','e','v'} ; //Note no null terminator in array and statu variable at the start +constexpr byte productString[] PROGMEM = { SERIAL_RC_OK, 'S', 'p', 'e', 'e', 'd', 'u', 'i', 'n', 'o', ' ', '2', '0', '2', '3', '.', '1', '1', '-', 'd', 'e', 'v'}; +//constexpr byte codeVersion[] PROGMEM = { SERIAL_RC_OK, 's','p','e','e','d','u','i','n','o',' ','2','0','2','3','1','0'} ; //Note no null terminator in array and statu variable at the start +//constexpr byte productString[] PROGMEM = { SERIAL_RC_OK, 'S', 'p', 'e', 'e', 'd', 'u', 'i', 'n', 'o', ' ', '2', '0', '2', '3', '.', '1', '0'}; constexpr byte testCommsResponse[] PROGMEM = { SERIAL_RC_OK, 255 }; //!@} diff --git a/speeduino/comms_legacy.cpp b/speeduino/comms_legacy.cpp index 4fe5f5c9..97482b6b 100644 --- a/speeduino/comms_legacy.cpp +++ b/speeduino/comms_legacy.cpp @@ -618,8 +618,8 @@ void legacySerialHandler(byte cmd, Stream &targetPort, SerialStatus &targetStatu break; case 'Q': // send code version - //targetPort.print(F("speeduino 202306-dev")); - targetPort.print(F("speeduino 202310")); + targetPort.print(F("speeduino 202311-dev")); + //targetPort.print(F("speeduino 202310")); break; case 'r': //New format for the optimised OutputChannels @@ -651,8 +651,8 @@ void legacySerialHandler(byte cmd, Stream &targetPort, SerialStatus &targetStatu break; case 'S': // send code version - //targetPort.print(F("Speeduino 2023.06-dev")); - targetPort.print(F("Speeduino 2023.10")); + targetPort.print(F("Speeduino 2023.11-dev")); + //targetPort.print(F("Speeduino 2023.10")); break; } } diff --git a/speeduino/updates.ino b/speeduino/updates.ino index e5fa1e85..2bdc03e1 100644 --- a/speeduino/updates.ino +++ b/speeduino/updates.ino @@ -16,7 +16,7 @@ void doUpdates(void) { - #define CURRENT_DATA_VERSION 22 + #define CURRENT_DATA_VERSION 23 //Only the latest update for small flash devices must be retained #ifndef SMALL_FLASH_MODE @@ -717,12 +717,21 @@ void doUpdates(void) configPage15.rollingProtCutPercent[2] = 80; configPage15.rollingProtCutPercent[3] = 95; - //DFCO Hyster was mlutipled by 2 to allow a range of 0-500. Existing values must be halved + //DFCO Hyster was multipled by 2 to allow a range of 0-500. Existing values must be halved configPage4.dfcoHyster = configPage4.dfcoHyster / 2; writeAllConfig(); storeEEPROMVersion(22); } + + if(readEEPROMVersion() == 22) + { + //202311-dev + + + writeAllConfig(); + storeEEPROMVersion(23); + } //Final check is always for 255 and 0 (Brand new arduino) if( (readEEPROMVersion() == 0) || (readEEPROMVersion() == 255) )