rusefi
/
bldc
mirror of https://github.com/rusefi/bldc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated package script

This commit is contained in:
Benjamin Vedder 2022-03-06 00:09:11 +01:00
parent b5b4922294
commit e42dfecc51
4 changed files with 47 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -205,7 +205,8 @@ all_fw: $(addsuffix _vescfw, $(FW_TARGETS))
all_fw_clean: $(addsuffix _clean, $(FW_TARGETS))
# Expand the firmware rules
$(foreach board, $(ALL_BOARD_NAMES), $(eval $(call FW_TEMPLATE,$(board),$(BUILD_DIR)/$(board),$(board)-$(GIT_HASH)$(GIT_DIRTY_LABEL))))
#$(foreach board, $(ALL_BOARD_NAMES), $(eval $(call FW_TEMPLATE,$(board),$(BUILD_DIR)/$(board),$(board)-$(GIT_HASH)$(GIT_DIRTY_LABEL))))
$(foreach board, $(ALL_BOARD_NAMES), $(eval $(call FW_TEMPLATE,$(board),$(BUILD_DIR)/$(board),$(board))))
##############################

2
conf_general.h
View File

@ -192,7 +192,7 @@
//#define HW_HEADER "hw_60_75.h"
#endif
#ifndef HW_SOURCE
#if !defined(HW_SOURCE) && !defined(HW_SOURCE_ALT)
#error "No hardware source file set"
#endif

5
hwconf/hw.c
View File

@ -20,7 +20,12 @@
#include "conf_general.h"
#include "utils.h"
#include <math.h>
#ifdef HW_SOURCE_ALT
#include HW_SOURCE_ALT
#else
#include HW_SOURCE
#endif
uint8_t hw_id_from_uuid(void) {
uint8_t id = utils_crc32c(STM32_UUID_8, 12) & 0x7F;

77
package_firmware.py
View File

@ -7,8 +7,8 @@ def get_git_revision_short_hash() -> str:
return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).decode('ascii').strip()
# Get the origin and destionation directories
build_dir = os.path.dirname(__file__) + '/../build'
package_dir = os.path.dirname(__file__) + '/../package'
build_dir = os.path.dirname(os.path.abspath(__file__)) + '/build'
package_dir = os.path.dirname(os.path.abspath(__file__)) + '/package'
# Get the short git hash
git_hash = get_git_revision_short_hash()
@ -21,64 +21,63 @@ default_name = "VESC_default.bin"
package_dict = {}
package_dict["46_o_47"] = [['46', default_name],
['46_33k', 'VESC_33k.bin'],
['46_0005ohm', 'VESC_0005ohm.bon']]
['46_0005ohm', 'VESC_0005ohm.bin']]
package_dict["48"] = [['48', default_name]]
package_dict["410_o_411_o_412"] = [['410', default_name],
['410_no_limits', no_limits_name],
['410_0005ohm', 'VESC_0005ohm.bon']]
['410_0005ohm', 'VESC_0005ohm.bin']]
package_dict["60"] = [['60', default_name],
['60_no_limits', no_limits_name]]
package_dict["60_mk3"] = [['60_mk3', default_name],
package_dict["60_MK3"] = [['60_mk3', default_name],
['60_mk3_no_limits', no_limits_name]]
package_dict["60_mk4"] = [['60_mk4', default_name],
package_dict["60_MK4"] = [['60_mk4', default_name],
['60_mk4_no_limits', no_limits_name]]
package_dict["60_mk5"] = [['60_mk5', default_name],
package_dict["60_MK5"] = [['60_mk5', default_name],
['60_mk5_no_limits', no_limits_name]]
package_dict["dar_rs"] = [['das_rs', default_name]]
package_dict["DAS_RS"] = [['das_rs', default_name]]
package_dict["75_300"] = [['75_300', default_name],
['75_300_no_limits', no_limits_name]]
package_dict["75_300_r2"] = [['75_300_r2', default_name],
package_dict["75_300_R2"] = [['75_300_r2', default_name],
['75_300_r2_no_limits', no_limits_name]]
package_dict["75_300_r3"] = [['75_300_r3', default_name],
package_dict["75_300_R3"] = [['75_300_r3', default_name],
['75_300_r3_no_limits', no_limits_name]]
package_dict["axiom"] = [['axiom', default_name]]
package_dict["uavc_omega"] = [['uavc_omega', default_name]]
package_dict["hd60"] = [['hd60', default_name],
package_dict["AXIOM"] = [['axiom', default_name]]
package_dict["UAVC_OMEGA"] = [['uavc_omega', default_name]]
package_dict["HD60"] = [['hd60', default_name],
['hd60_no_limits', no_limits_name]]
package_dict["hd75"] = [['hd75', default_name],
['hd75_no_limits', no_limits_name]]
package_dict["a50s_6s"] = [['a50s_6s', default_name]]
package_dict["a50s_12s"] = [['a50s_12s', default_name]]
package_dict["a200s_v2.1"] = [['a200s_v2.1', default_name]]
package_dict["a200s_v2.2"] = [['a200s_v2.2', default_name]]
package_dict["HD75"] = [['hd75', default_name],
['hd75_no_limits', no_limits_name]]
package_dict["A50S_6S"] = [['a50s_6s', default_name]]
package_dict["A50S_12S"] = [['a50s_12s', default_name]]
package_dict["A200S_v2.1"] = [['a200s_v2.1', default_name]]
package_dict["A200S_v2.2"] = [['a200s_v2.2', default_name]]
package_dict["100_250"] = [['100_250', default_name],
['100_250_no_limits', no_limits_name]]
package_dict["luna_bbshd"] = [['luna_bbshd', default_name]]
package_dict["unity"] = [['unity', default_name],
package_dict["LUNA_BBSHD"] = [['luna_bbshd', default_name]]
package_dict["UNITY"] = [['unity', default_name],
['unity_no_limits', no_limits_name]]
package_dict["cheap_focer_2"] = [['cheap_focer_2', default_name]]
package_dict["stormcore_60d"] = [['stormcore_60d', default_name],
package_dict["Cheap_FOCer_2"] = [['Cheap_FOCer_2', default_name]]
package_dict["STORMCORE_60D"] = [['stormcore_60d', default_name],
['stormcore_60d_no_limits', no_limits_name]]
package_dict["stormcore_60dxs"] = [['stormcore_60dxs', default_name],
package_dict["STORMCORE_60Dxs"] = [['stormcore_60dxs', default_name],
['stormcore_60dxs_no_limits', no_limits_name]]
package_dict["stormcore_60d+"] = [['stormcore_60d+', default_name],
package_dict["STORMCORE_60D+"] = [['stormcore_60d+', default_name],
['stormcore_60d+_no_limits', no_limits_name]]
package_dict["stormcore_100d"] = [['stormcore_100d', default_name],
package_dict["STORMCORE_100D"] = [['stormcore_100d', default_name],
['stormcore_100d_no_limits', no_limits_name]]
package_dict["stormcore_100d_v2"] = [['stormcore_100d_v2', default_name],
package_dict["STORMCORE_100D_V2"] = [['stormcore_100d_v2', default_name],
['stormcore_100d_v2_no_limits', no_limits_name]]
package_dict["stormcore_100dx"] = [['stormcore_100dx', default_name],
package_dict["STORMCORE_100DX"] = [['stormcore_100dx', default_name],
['stormcore_100dx_no_limits', no_limits_name]]
package_dict["stormcore_100s"] = [['stormcore_100s', default_name],
package_dict["STORMCORE_100S"] = [['stormcore_100s', default_name],
['stormcore_100s_no_limits', no_limits_name]]
package_dict["cheap_focer_2"] = [['cheap_focer_2', default_name]]
package_dict["little_focer"] = [['little_focer', default_name],
['little_focer_no_limits', no_limits_name]]
package_dict["uxv_sr"] = [['uxv_sr', default_name]]
package_dict["gesc"] = [['gesc', default_name]]
package_dict["warrior6"] = [['warrior6', default_name]]
package_dict["raiden7"] = [['raiden7', default_name]]
package_dict["ubox_single"] = [['ubox_single', default_name]]
package_dict["Little_FOCer"] = [['Little_FOCer', default_name],
['Little_FOCer_no_limits', no_limits_name]]
package_dict["UXV_SR"] = [['uxv_sr', default_name]]
package_dict["GESC"] = [['gesc', default_name]]
package_dict["Warrior6"] = [['warrior6', default_name]]
package_dict["Raiden7"] = [['raiden7', default_name]]
package_dict["UBOX_SINGLE"] = [['ubox_single', default_name]]
package_dict["100_500"] = [['100_500', default_name],
['100_500_no_limits', no_limits_name]]
package_dict["75_600"] = [['75_600', default_name],
@ -127,4 +126,6 @@ for directory in package_dict:
res_string = res_string + target_res_string
# Print the QRC file
print(resource_xml_stub_string.replace("REPLACEABLE_STRING", res_string[:-1]))
with open(os.path.join(package_dir, 'res_fw.qrc'), 'w') as f:
print(resource_xml_stub_string.replace("REPLACEABLE_STRING", res_string[:-1]), file=f)