From 422f9f49a4049543f7a842d8c814caf30ad227ad Mon Sep 17 00:00:00 2001 From: stancecoke <31093785+stancecoke@users.noreply.github.com> Date: Wed, 16 Feb 2022 18:42:43 +0100 Subject: [PATCH 1/6] Update generate_bin.yml --- .github/workflows/generate_bin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate_bin.yml b/.github/workflows/generate_bin.yml index 284a166f..5aaddd8a 100644 --- a/.github/workflows/generate_bin.yml +++ b/.github/workflows/generate_bin.yml @@ -2,9 +2,9 @@ name: C/C++ CI on: push: - branches: [ master ] + branches: [ v0.5 ] pull_request: - branches: [ master ] + branches: [ v0.5 ] jobs: build: From de0a62d84723830603a33a8017f55c0c5928ed47 Mon Sep 17 00:00:00 2001 From: stancecoke <31093785+stancecoke@users.noreply.github.com> Date: Sat, 5 Mar 2022 14:07:15 +0100 Subject: [PATCH 2/6] set to default values from https://max.cfw.sh/# --- Core/Inc/config.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Core/Inc/config.h b/Core/Inc/config.h index e53e77bf..298fd411 100644 --- a/Core/Inc/config.h +++ b/Core/Inc/config.h @@ -51,10 +51,10 @@ #define SPEEDLIMIT_NORMAL 20 #define SPEEDLIMIT_SPORT 50 -// motor current limits for invividual modes in mA -#define PH_CURRENT_MAX_ECO 5000 -#define PH_CURRENT_MAX_NORMAL 9000 -#define PH_CURRENT_MAX_SPORT 14000 +// motor current limits for invividual modes in mA, see default settings at https://max.cfw.sh/# +#define PH_CURRENT_MAX_ECO 16000 +#define PH_CURRENT_MAX_NORMAL 28000 +#define PH_CURRENT_MAX_SPORT 55000 // motor current limit for regen in mA #define REGEN_CURRENT 20000 @@ -63,7 +63,7 @@ #define FW_CURRENT_MAX 18000 //max id // maximum battery currents in mA -#define BATTERYCURRENT_MAX 8000 +#define BATTERYCURRENT_MAX 14500 #define REGEN_CURRENT_MAX 10000 // battery voltage limits in mV From 14416bec62e6ac3d3880cda7728a680667579218 Mon Sep 17 00:00:00 2001 From: stancecoke <31093785+stancecoke@users.noreply.github.com> Date: Mon, 7 Mar 2022 19:17:43 +0100 Subject: [PATCH 3/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f13fc59..d96ed25c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Fork of EBiCS firmware for Lishui devices. Ported to Xaiomi M365 controller. Use JST PA series 2mm pitch for the connectors. (need to be confirmed) -This branch works with the original M365 dashboard +This branch works with the original M365 dashboard with BLE Ver 122 How to use: Method 1 (github account needed): From 9fd39ae8955ebe9d6ee1927e6fceafeb81445952 Mon Sep 17 00:00:00 2001 From: stancecoke <31093785+stancecoke@users.noreply.github.com> Date: Wed, 16 Mar 2022 07:32:35 +0100 Subject: [PATCH 4/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d96ed25c..6e482ef9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Fork of EBiCS firmware for Lishui devices. Ported to Xaiomi M365 controller. Use JST PA series 2mm pitch for the connectors. (need to be confirmed) -This branch works with the original M365 dashboard with BLE Ver 122 +This branch works with the original M365 dashboard with BLE Ver 90 and 122, thanks to M0g13r How to use: Method 1 (github account needed): From 4bd351263779947dabdfd69c4bce9a643eabba9e Mon Sep 17 00:00:00 2001 From: stancecoke <31093785+stancecoke@users.noreply.github.com> Date: Mon, 28 Mar 2022 15:24:50 +0200 Subject: [PATCH 5/6] bugfix in analog throttle --- Core/Src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Src/main.c b/Core/Src/main.c index a2858918..5a0497b0 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -616,7 +616,7 @@ int main(void) { #ifdef ADCTHROTTLE - MS.i_q_setpoint=map(ui16_reg_adc_value,THROTTLEOFFSET,THROTTLEMAX,0,MS.phase_current_limit); + MS.i_q_setpoint=map(ui16_reg_adc_value,THROTTLEOFFSET,THROTTLEMAX,0,MP.phase_current_limit); #endif // set power to zero at low voltage if(MS.Voltage Date: Thu, 20 Jul 2023 01:11:37 +0100 Subject: [PATCH 6/6] config.h bumbspeed --- Core/Inc/config.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Core/Inc/config.h b/Core/Inc/config.h index 298fd411..6ab27561 100644 --- a/Core/Inc/config.h +++ b/Core/Inc/config.h @@ -47,7 +47,7 @@ #define GEAR_RATIO 11 //15 for original M365 motor // speed limits for invividual modes in kph -#define SPEEDLIMIT_ECO 6 +#define SPEEDLIMIT_ECO 15 #define SPEEDLIMIT_NORMAL 20 #define SPEEDLIMIT_SPORT 50 @@ -57,17 +57,17 @@ #define PH_CURRENT_MAX_SPORT 55000 // motor current limit for regen in mA -#define REGEN_CURRENT 20000 +#define REGEN_CURRENT 2000 // maximum current for flux weakening in mA -#define FW_CURRENT_MAX 18000 //max id +#define FW_CURRENT_MAX 12000 //max id // maximum battery currents in mA -#define BATTERYCURRENT_MAX 14500 +#define BATTERYCURRENT_MAX 25000 #define REGEN_CURRENT_MAX 10000 // battery voltage limits in mV -#define BATTERYVOLTAGE_MIN 33000 +#define BATTERYVOLTAGE_MIN 31000 #define BATTERYVOLTAGE_MAX 42000