diff --git a/hwconf/Ubox/100v/hw_ubox_100_core.h b/hwconf/Ubox/100v/hw_ubox_100_core.h index ad4fdf27..72d5a8e9 100644 --- a/hwconf/Ubox/100v/hw_ubox_100_core.h +++ b/hwconf/Ubox/100v/hw_ubox_100_core.h @@ -266,14 +266,10 @@ #define HW_LIM_CURRENT_IN -135.0, 135.0 #define HW_LIM_CURRENT_ABS 0.0, 180.0 -#ifdef HW_UBOX_V2_100 - #define HW_LIM_VIN 11.0, 95.0 -#elif defined HW_UBOX_SINGLE_100 - #define HW_LIM_VIN 11.0, 95.0 -#elif defined HW_UBOX_SINGLE_80 +#ifdef HW_UBOX_SINGLE_80 #define HW_LIM_VIN 11.0, 76.0 #else - #error "Must define HW_LIM_VIN" + #define HW_LIM_VIN 11.0, 95.0 #endif #define HW_LIM_ERPM -200e3, 200e3 diff --git a/hwconf/Ubox/75v/hw_ubox_single_75_no_limits.h b/hwconf/Ubox/75v/hw_ubox_single_75_no_limits.h new file mode 100644 index 00000000..4f16e345 --- /dev/null +++ b/hwconf/Ubox/75v/hw_ubox_single_75_no_limits.h @@ -0,0 +1,27 @@ +/* + Copyright 2018 Benjamin Vedder benjamin@vedder.se + + This file is part of the VESC firmware. + + The VESC firmware 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. + + The VESC firmware 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 . + */ + +#ifndef HW_UBOX_SINGLE_75_NO_LIMITS_H_ +#define HW_UBOX_SINGLE_75_NO_LIMITS_H_ + +#define DISABLE_HW_LIMITS + +#include "hw_ubox_single_75.h" + +#endif /* HW_UBOX_SINGLE_75_NO_LIMITS_H_ */ diff --git a/hwconf/Ubox/75v/hw_ubox_v1_75_micro_no_limits.h b/hwconf/Ubox/75v/hw_ubox_v1_75_micro_no_limits.h new file mode 100644 index 00000000..c56f0ed7 --- /dev/null +++ b/hwconf/Ubox/75v/hw_ubox_v1_75_micro_no_limits.h @@ -0,0 +1,27 @@ +/* + Copyright 2018 Benjamin Vedder benjamin@vedder.se + + This file is part of the VESC firmware. + + The VESC firmware 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. + + The VESC firmware 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 . + */ + +#ifndef HW_UBOX_V1_75_MICRO_NO_LIMITS_H_ +#define HW_UBOX_V1_75_MICRO_NO_LIMITS_H_ + +#define DISABLE_HW_LIMITS + +#include "hw_ubox_v1_75_micro.h" + +#endif /* HW_UBOX_V1_75_MICRO_NO_LIMITS_H_ */ diff --git a/hwconf/Ubox/75v/hw_ubox_v1_75_typec_no_limits.h b/hwconf/Ubox/75v/hw_ubox_v1_75_typec_no_limits.h new file mode 100644 index 00000000..b4a3b94e --- /dev/null +++ b/hwconf/Ubox/75v/hw_ubox_v1_75_typec_no_limits.h @@ -0,0 +1,27 @@ +/* + Copyright 2018 Benjamin Vedder benjamin@vedder.se + + This file is part of the VESC firmware. + + The VESC firmware 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. + + The VESC firmware 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 . + */ + +#ifndef HW_UBOX_V1_75_TYPEC_NO_LIMITS_H_ +#define HW_UBOX_V1_75_TYPEC_NO_LIMITS_H_ + +#define DISABLE_HW_LIMITS + +#include "hw_ubox_v1_75_typec.h" + +#endif /* HW_UBOX_V1_75_TYPEC_NO_LIMITS_H_ */ diff --git a/hwconf/Ubox/75v/hw_ubox_v2_75_no_limits.h b/hwconf/Ubox/75v/hw_ubox_v2_75_no_limits.h new file mode 100644 index 00000000..9631fb9e --- /dev/null +++ b/hwconf/Ubox/75v/hw_ubox_v2_75_no_limits.h @@ -0,0 +1,27 @@ +/* + Copyright 2018 Benjamin Vedder benjamin@vedder.se + + This file is part of the VESC firmware. + + The VESC firmware 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. + + The VESC firmware 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 . + */ + +#ifndef HW_UBOX_V2_75_NO_LIMITS_H_ +#define HW_UBOX_V2_75_NO_LIMITS_H_ + +#define DISABLE_HW_LIMITS + +#include "hw_ubox_v2_75.h" + +#endif /* HW_UBOX_V2_75_NO_LIMITS_H_ */ diff --git a/package_firmware.py b/package_firmware.py index 0bf13601..ecb8c1a0 100755 --- a/package_firmware.py +++ b/package_firmware.py @@ -19,6 +19,7 @@ default_name = "VESC_default.bin" # Add directories and targets to the dictionary package_dict = {} +''' package_dict["46_o_47"] = [['46', default_name], ['46_33k', 'VESC_33k.bin'], ['46_0005ohm', 'VESC_0005ohm.bin']] @@ -92,15 +93,25 @@ package_dict["60_75"] = [['60_75', default_name], ['60_75_no_limits', no_limits_name]] package_dict["60_75_mk2"] = [['60_75_mk2', default_name], ['60_75_mk2_no_limits', no_limits_name]] -package_dict["UBOX_SINGLE_75"] = [['ubox_single_75', default_name]] -package_dict["UBOX_V1_75_MICRO"] = [['ubox_v1_75_micro', default_name]] -package_dict["UBOX_V1_75_TYPEC"] = [['ubox_v1_75_typec', default_name]] -package_dict["UBOX_V2_75"] = [['ubox_v2_75', default_name]] -package_dict["UBOX_SINGLE_100"] = [['ubox_single_100', default_name]] -package_dict["UBOX_SINGLE_80"] = [['ubox_single_80', default_name]] -package_dict["UBOX_V2_100"] = [['ubox_v2_100', default_name]] -package_dict["EDU"] = [['edu', default_name], +''' +package_dict["UBOX_SINGLE_75"] = [['ubox_single_75', default_name], + ['ubox_single_75_no_limits', no_limits_name]] +package_dict["UBOX_V1_75_MICRO"] = [['ubox_v1_75_micro', default_name], + ['ubox_v1_75_micro_no_limits', no_limits_name]] +package_dict["UBOX_V1_75_TYPEC"] = [['ubox_v1_75_typec', default_name], + ['ubox_v1_75_typec_no_limits', no_limits_name]] +package_dict["UBOX_V2_75"] = [['ubox_v2_75', default_name], + ['ubox_v2_75_no_limits', no_limits_name]] +package_dict["UBOX_SINGLE_100"] = [['ubox_single_100', default_name], + ['ubox_single_100_no_limits', no_limits_name]] +package_dict["UBOX_SINGLE_80"] = [['ubox_single_80', default_name], + ['ubox_single_80_no_limits', no_limits_name]] +package_dict["UBOX_V2_100"] = [['ubox_v2_100', default_name], + ['ubox_v2_100_no_limits', no_limits_name]] + +'''package_dict["EDU"] = [['edu', default_name], ['edu_no_limits', no_limits_name]] +''' # This is the firmware stub string res_firmwares_string = ' TARGET_DESTINATION_DIRECTORY/TARGET_DESTINATION_FILENAME\n'