Skip to content

Commit af55c79

Browse files
committed
Renamed foc_f_sw to foc_f_zv
1 parent aeda17e commit af55c79

13 files changed

+106
-106
lines changed

applications/er/ErConfig.qml

+1-1
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ Item {
537537
mMcConf.updateParamDouble("l_temp_motor_end", 135, null)
538538
mMcConf.updateParamDouble("l_temp_accel_dec", 0, null)
539539

540-
mMcConf.updateParamDouble("foc_f_sw", 30000, null)
540+
mMcConf.updateParamDouble("foc_f_zv", 30000, null)
541541
mMcConf.updateParamEnum("foc_sensor_mode", 2, null)
542542
mMcConf.updateParamDouble("foc_openloop_rpm", 350, null)
543543
mMcConf.updateParamDouble("foc_sl_erpm", 6000, null)

applications/er/er_qml.c

+53-53
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "er_qml.h"
44

5-
uint8_t data_qml_app[4375] = {
5+
uint8_t data_qml_app[4376] = {
66
0x00, 0x00, 0x6b, 0xac, 0x78, 0xda, 0xed, 0x5c, 0x6d, 0x53, 0xdb, 0x48, 0x12, 0xfe, 0xce, 0xaf,
77
0x98, 0xf5, 0xd5, 0x55, 0xd9, 0x1b, 0x47, 0xd8, 0x06, 0x93, 0x1c, 0x7b, 0xa9, 0x2b, 0xde, 0x92,
88
0xa5, 0x2e, 0x04, 0x16, 0xb3, 0x9b, 0x0f, 0x09, 0xa5, 0x12, 0xd2, 0xd8, 0x56, 0x21, 0xcd, 0xe8,
@@ -225,56 +225,56 @@ uint8_t data_qml_app[4375] = {
225225
0x7c, 0xb9, 0x25, 0xb1, 0x2c, 0x20, 0xe2, 0x70, 0x5e, 0x19, 0x7b, 0x1b, 0x01, 0x51, 0x86, 0xe5,
226226
0xca, 0xdd, 0xc1, 0x66, 0x4a, 0x81, 0x4c, 0x21, 0x48, 0x37, 0x78, 0x26, 0x59, 0x7f, 0x30, 0x6c,
227227
0x2c, 0x98, 0x02, 0x23, 0xe5, 0xea, 0xef, 0xac, 0x09, 0x62, 0x81, 0x7b, 0x03, 0x5b, 0x41, 0xed,
228-
0xaa, 0x6d, 0xbd, 0x2a, 0x1e, 0x04, 0x70, 0xe6, 0x58, 0x74, 0xe4, 0x70, 0x19, 0xaf, 0xbc, 0x04,
229-
0xa5, 0x89, 0x41, 0xe6, 0x88, 0xb2, 0x08, 0xc6, 0x23, 0x3a, 0x15, 0xb0, 0x66, 0x1a, 0x0e, 0x07,
230-
0x11, 0x30, 0x07, 0xf2, 0x38, 0x0f, 0x4c, 0x2c, 0xc1, 0x82, 0x18, 0xc3, 0xde, 0x1a, 0x20, 0x91,
231-
0x27, 0x4b, 0xb8, 0x5d, 0xb2, 0xb7, 0xfa, 0x28, 0x0e, 0x39, 0xf7, 0x52, 0x76, 0x0b, 0xbf, 0x4c,
232-
0xca, 0x9c, 0x42, 0x58, 0x37, 0x2f, 0xae, 0x8b, 0x9a, 0x69, 0x63, 0x41, 0x82, 0xa9, 0x15, 0x51,
233-
0x13, 0x22, 0xb6, 0x18, 0xdf, 0x8e, 0x82, 0xfd, 0x90, 0x8a, 0xd5, 0xdf, 0xeb, 0x2d, 0x9f, 0xa8,
234-
0xed, 0x6d, 0xf2, 0xd6, 0xa5, 0xe0, 0x71, 0x3f, 0x52, 0x08, 0x92, 0xf0, 0x0b, 0x70, 0x1a, 0xcd,
235-
0xe3, 0xac, 0x68, 0x0c, 0x7a, 0xeb, 0xbb, 0x0f, 0x3f, 0x5d, 0xa8, 0x62, 0xb9, 0xe1, 0x24, 0x67,
236-
0x5e, 0x64, 0xb7, 0x89, 0x17, 0xf1, 0xcd, 0xa9, 0xe5, 0xc1, 0xd4, 0xdc, 0xc7, 0xa1, 0x95, 0x2a,
237-
0x39, 0xaa, 0xc2, 0xa8, 0xff, 0xa9, 0x08, 0xa2, 0xa2, 0x79, 0x10, 0xa5, 0x89, 0x34, 0x2a, 0x23,
238-
0xa9, 0x8c, 0x1d, 0x63, 0x29, 0xcb, 0xbe, 0xcd, 0xbe, 0xc8, 0xa7, 0xfd, 0xcb, 0x28, 0x0e, 0x41,
239-
0xe9, 0x6b, 0x86, 0x55, 0x1f, 0xb1, 0x82, 0xd5, 0x34, 0xae, 0x12, 0x65, 0xaf, 0x6f, 0x38, 0xb0,
240-
0x82, 0x25, 0x7b, 0x49, 0x23, 0x17, 0xf3, 0x49, 0x9b, 0x42, 0xa6, 0x83, 0xc7, 0xce, 0x9d, 0xc4,
241-
0x16, 0x1f, 0xab, 0xb9, 0x44, 0x67, 0xcc, 0x53, 0x5e, 0x81, 0xf0, 0xa9, 0x85, 0x71, 0xff, 0xe5,
242-
0xfb, 0x43, 0x0f, 0xcf, 0xdb, 0xb2, 0x89, 0xf6, 0x25, 0x08, 0x9c, 0xd0, 0xd0, 0x53, 0x5f, 0xbc,
243-
0x20, 0x7f, 0xfe, 0x09, 0x40, 0x9f, 0x7a, 0xd7, 0xe4, 0x9f, 0xa4, 0x4f, 0xc1, 0x89, 0x36, 0x9b,
244-
0xb2, 0x33, 0xf9, 0x58, 0x72, 0xf9, 0x7e, 0xf9, 0x4c, 0xa5, 0x22, 0xe2, 0x81, 0x24, 0xfd, 0x70,
245-
0xbf, 0x8d, 0x09, 0x03, 0x6d, 0xf5, 0xb1, 0x32, 0x2b, 0xff, 0xff, 0x11, 0xb5, 0xb6, 0xb7, 0xb6,
246-
0xeb, 0x90, 0x36, 0x02, 0x83, 0x55, 0x31, 0x09, 0x6b, 0xd8, 0x4b, 0x89, 0xe0, 0x49, 0x04, 0x21,
247-
0x50, 0xcf, 0xf8, 0xc7, 0x32, 0xf3, 0x50, 0x32, 0x9a, 0x5e, 0x72, 0x4f, 0x3c, 0x97, 0xdd, 0xc2,
248-
0xd4, 0xd6, 0x2f, 0xba, 0x94, 0xa8, 0xbc, 0xf2, 0xde, 0xcb, 0x1b, 0xe7, 0xa9, 0x33, 0x2a, 0x2c,
249-
0xc3, 0xb4, 0x79, 0x26, 0x5b, 0x88, 0x3d, 0x63, 0x67, 0x3e, 0x5e, 0x21, 0x74, 0x79, 0x91, 0x66,
250-
0x8f, 0xf9, 0xe7, 0x9b, 0x4d, 0x56, 0xa5, 0x18, 0x56, 0x2a, 0xd8, 0xea, 0xeb, 0x73, 0xac, 0x28,
251-
0xe3, 0xdb, 0x58, 0x92, 0xaa, 0x89, 0x16, 0x0f, 0x1c, 0xc5, 0x3c, 0x98, 0x6b, 0x1e, 0xe3, 0x01,
252-
0x74, 0xea, 0x9d, 0x0d, 0x57, 0x29, 0xea, 0xc5, 0x9c, 0xeb, 0x25, 0xd3, 0xd0, 0x2a, 0x3e, 0xf9,
253-
0xc8, 0xf2, 0xec, 0xc4, 0x03, 0x64, 0x92, 0x7d, 0x9d, 0x98, 0x2d, 0xbf, 0xab, 0xd4, 0xa3, 0xa1,
254-
0xb0, 0x01, 0xfc, 0x26, 0xa2, 0xe1, 0x1d, 0x7c, 0xc0, 0x96, 0x77, 0xd4, 0x28, 0xf8, 0x49, 0x39,
255-
0x65, 0x1f, 0xbe, 0x4b, 0xda, 0x7d, 0xa3, 0x47, 0x5f, 0xee, 0x40, 0x02, 0x3a, 0x5f, 0x43, 0x3f,
256-
0x66, 0xa2, 0x82, 0x3b, 0xc2, 0xed, 0xaa, 0x0d, 0x88, 0xc5, 0x1b, 0x84, 0xb6, 0xfc, 0x72, 0xc4,
257-
0xe2, 0x86, 0x16, 0xef, 0x86, 0xcf, 0xe4, 0x17, 0x17, 0x02, 0x70, 0x6c, 0x37, 0x11, 0x30, 0x8b,
258-
0x28, 0x6e, 0x03, 0x65, 0x8b, 0xde, 0xcc, 0xd6, 0xd8, 0xe9, 0x73, 0x24, 0x37, 0x33, 0x17, 0x95,
259-
0x48, 0xc5, 0x09, 0xb8, 0x82, 0x20, 0x84, 0x82, 0x5b, 0x84, 0xe5, 0x5d, 0xbf, 0xbd, 0x63, 0x39,
260-
0xd7, 0xca, 0xf6, 0x16, 0x55, 0x16, 0xd1, 0xee, 0x8b, 0x8a, 0xae, 0xc5, 0x58, 0xc4, 0xe3, 0xab,
261-
0x47, 0x8a, 0x82, 0xc7, 0xe6, 0x7e, 0xb0, 0x66, 0x7c, 0x38, 0xe7, 0x87, 0x34, 0x05, 0x02, 0x45,
262-
0xfc, 0x88, 0x5f, 0xc8, 0x23, 0xc5, 0x58, 0x45, 0x17, 0x3f, 0x43, 0x40, 0x45, 0x62, 0x4b, 0x2d,
263-
0x05, 0x6b, 0x55, 0x81, 0x81, 0x57, 0xd9, 0xcc, 0x21, 0xf7, 0x5b, 0x6e, 0x97, 0xcd, 0xdb, 0xb0,
264-
0x57, 0xb6, 0x62, 0x08, 0x81, 0xd3, 0xb4, 0xe4, 0xe5, 0xbb, 0x1a, 0x0b, 0x26, 0x84, 0x1d, 0x89,
265-
0x14, 0x21, 0x5a, 0xdd, 0x82, 0x09, 0xd1, 0xa3, 0x5a, 0xae, 0xaf, 0xbf, 0xbc, 0x24, 0xe2, 0x5f,
266-
0x9c, 0x71, 0x11, 0x01, 0x8b, 0x09, 0x33, 0xcd, 0x1e, 0xcc, 0xb5, 0xd0, 0x6a, 0xff, 0xba, 0x49,
267-
0x18, 0x5d, 0x84, 0xe9, 0x67, 0x30, 0x83, 0x8d, 0x60, 0x06, 0x19, 0xcc, 0xce, 0x46, 0x30, 0x3b,
268-
0x19, 0xcc, 0xee, 0x46, 0x30, 0xbb, 0x19, 0xcc, 0x70, 0x23, 0x98, 0x61, 0x06, 0xb3, 0xb7, 0x11,
269-
0xcc, 0x5e, 0x06, 0xf3, 0x6a, 0x23, 0x98, 0x57, 0x19, 0xcc, 0xeb, 0xeb, 0xe5, 0xb9, 0xd8, 0xf7,
270-
0xac, 0xe6, 0x6b, 0xd9, 0xcf, 0xcb, 0x1e, 0x58, 0x78, 0xd8, 0xca, 0x2f, 0xfe, 0xe6, 0x3b, 0x57,
271-
0xba, 0xf7, 0x7e, 0xf1, 0x6b, 0xc3, 0x7e, 0xd0, 0xdc, 0x90, 0xaf, 0x34, 0x2f, 0x7b, 0x9f, 0xb4,
272-
0xba, 0x07, 0xa8, 0xbc, 0x49, 0xf3, 0xd7, 0x69, 0x02, 0x8a, 0x41, 0x7d, 0xef, 0x02, 0x7e, 0x2b,
273-
0x5d, 0x40, 0xf9, 0xad, 0x27, 0x5f, 0x43, 0x1b, 0xf0, 0x7b, 0xbb, 0xae, 0x91, 0xfd, 0x7d, 0xee,
274-
0x58, 0x49, 0x86, 0xd7, 0xbe, 0xe9, 0x32, 0x5c, 0xa3, 0xa6, 0xe3, 0x86, 0xf2, 0xfb, 0xb9, 0xab,
275-
0x62, 0xec, 0xef, 0x15, 0xa8, 0x27, 0xac, 0x40, 0xfd, 0x1f, 0x55, 0x97, 0xbe, 0xc2, 0xba, 0xd2,
276-
0x40, 0x29, 0x2b, 0x0d, 0xfe, 0xd2, 0x65, 0xa5, 0x2f, 0xd5, 0xcf, 0xdf, 0xb8, 0xe2, 0xb3, 0xbc,
277-
0x1c, 0x35, 0xac, 0x2f, 0x47, 0x7d, 0x63, 0x25, 0xa3, 0xbd, 0xef, 0x25, 0xa3, 0xbf, 0x70, 0xc9,
278-
0xe8, 0x7b, 0x56, 0xf9, 0x45, 0x0c, 0xd2, 0x26, 0x19, 0xa1, 0x92, 0xc6, 0x3c, 0x59, 0x4a, 0xf8,
279-
0xb8, 0xf5, 0x5f, 0x40, 0x5d, 0x4a, 0x4b,
228+
0xaa, 0x6d, 0xbd, 0x2a, 0x1e, 0x04, 0x70, 0xe6, 0xd8, 0xfc, 0xfd, 0x4e, 0x2e, 0xe3, 0x95, 0x97,
229+
0xa0, 0x34, 0x31, 0xc8, 0x1c, 0x51, 0x16, 0xc1, 0x78, 0x44, 0xa7, 0x02, 0xd6, 0x4c, 0xc3, 0xe1,
230+
0x20, 0x02, 0xe6, 0x40, 0x1e, 0xe7, 0x81, 0x89, 0x25, 0x58, 0x10, 0x63, 0xd8, 0x5b, 0x03, 0x24,
231+
0xf2, 0x64, 0x09, 0xb7, 0x4b, 0xf6, 0x56, 0x1f, 0xc5, 0x21, 0xe7, 0x5e, 0xca, 0x6e, 0xe1, 0x97,
232+
0x49, 0x99, 0x53, 0x08, 0xeb, 0xe6, 0xc5, 0x75, 0x51, 0x33, 0x6d, 0x2c, 0x48, 0x30, 0xb5, 0x22,
233+
0x6a, 0x42, 0xc4, 0x16, 0xe3, 0xdb, 0x51, 0xb0, 0x1f, 0x52, 0xb1, 0xfa, 0x7b, 0xbd, 0xe5, 0x13,
234+
0xb5, 0xbd, 0x4d, 0xde, 0xba, 0x14, 0x3c, 0xee, 0x47, 0x0a, 0x41, 0x12, 0x7e, 0x01, 0x4e, 0xa3,
235+
0x79, 0x9c, 0x15, 0x8d, 0x41, 0x6f, 0x7d, 0xf7, 0xe1, 0xa7, 0x0b, 0x55, 0x2c, 0x37, 0x9c, 0xe4,
236+
0xcc, 0x8b, 0xec, 0x36, 0xf1, 0x22, 0xbe, 0x39, 0xb5, 0x3c, 0x98, 0x9a, 0xfb, 0x38, 0xb4, 0x52,
237+
0x25, 0x47, 0x55, 0x18, 0xf5, 0x3f, 0x15, 0x41, 0x54, 0x34, 0x0f, 0xa2, 0x34, 0x91, 0x46, 0x65,
238+
0x24, 0x95, 0xb1, 0x63, 0x2c, 0x65, 0xd9, 0xb7, 0xd9, 0x17, 0xf9, 0xb4, 0x7f, 0x19, 0xc5, 0x21,
239+
0x28, 0x7d, 0xcd, 0xb0, 0xea, 0x23, 0x56, 0xb0, 0x9a, 0xc6, 0x55, 0xa2, 0xec, 0xf5, 0x0d, 0x07,
240+
0x56, 0xb0, 0x64, 0x2f, 0x69, 0xe4, 0x62, 0x3e, 0x69, 0x53, 0xc8, 0x74, 0xf0, 0xd8, 0xb9, 0x93,
241+
0xd8, 0xe2, 0x63, 0x35, 0x97, 0xe8, 0x8c, 0x79, 0xca, 0x2b, 0x10, 0x3e, 0xb5, 0x30, 0xee, 0xbf,
242+
0x7c, 0x7f, 0xe8, 0xe1, 0x79, 0x5b, 0x36, 0xd1, 0xbe, 0x04, 0x81, 0x13, 0x1a, 0x7a, 0xea, 0x8b,
243+
0x17, 0xe4, 0xcf, 0x3f, 0x01, 0xe8, 0x53, 0xef, 0x9a, 0xfc, 0x93, 0xf4, 0x29, 0x38, 0xd1, 0x66,
244+
0x53, 0x76, 0x26, 0x1f, 0x4b, 0x2e, 0xdf, 0x2f, 0x9f, 0xa9, 0x54, 0x44, 0x3c, 0x90, 0xa4, 0x1f,
245+
0xee, 0xb7, 0x31, 0x61, 0xa0, 0xad, 0x3e, 0x56, 0x66, 0xe5, 0xff, 0x3f, 0xa2, 0xd6, 0xf6, 0xd6,
246+
0x76, 0x1d, 0xd2, 0x46, 0x60, 0xb0, 0x2a, 0x26, 0x61, 0x0d, 0x7b, 0x29, 0x11, 0x3c, 0x89, 0x20,
247+
0x04, 0xea, 0x19, 0xff, 0x58, 0x66, 0x1e, 0x4a, 0x46, 0xd3, 0x4b, 0xee, 0x89, 0xe7, 0xb2, 0x5b,
248+
0x98, 0xda, 0xfa, 0x45, 0x97, 0x12, 0x95, 0x57, 0xde, 0x7b, 0x79, 0xe3, 0x3c, 0x75, 0x46, 0x85,
249+
0x65, 0x98, 0x36, 0xcf, 0x64, 0x0b, 0xb1, 0x67, 0xec, 0xcc, 0xc7, 0x2b, 0x84, 0x2e, 0x2f, 0xd2,
250+
0xec, 0x31, 0xff, 0x7c, 0xb3, 0xc9, 0xaa, 0x14, 0xc3, 0x4a, 0x05, 0x5b, 0x7d, 0x7d, 0x8e, 0x15,
251+
0x65, 0x7c, 0x1b, 0x4b, 0x52, 0x35, 0xd1, 0xe2, 0x81, 0xa3, 0x98, 0x07, 0x73, 0xcd, 0x63, 0x3c,
252+
0x80, 0x4e, 0xbd, 0xb3, 0xe1, 0x2a, 0x45, 0xbd, 0x98, 0x73, 0xbd, 0x64, 0x1a, 0x5a, 0xc5, 0x27,
253+
0x1f, 0x59, 0x9e, 0x9d, 0x78, 0x80, 0x4c, 0xb2, 0xaf, 0x13, 0xb3, 0xe5, 0x77, 0x95, 0x7a, 0x34,
254+
0x14, 0x36, 0x80, 0xdf, 0x44, 0x34, 0xbc, 0x83, 0x0f, 0xd8, 0xf2, 0x8e, 0x1a, 0x05, 0x3f, 0x29,
255+
0xa7, 0xec, 0xc3, 0x77, 0x49, 0xbb, 0x6f, 0xf4, 0xe8, 0xcb, 0x1d, 0x48, 0x40, 0xe7, 0x6b, 0xe8,
256+
0xc7, 0x4c, 0x54, 0x70, 0x47, 0xb8, 0x5d, 0xb5, 0x01, 0xb1, 0x78, 0x83, 0xd0, 0x96, 0x5f, 0x8e,
257+
0x58, 0xdc, 0xd0, 0xe2, 0xdd, 0xf0, 0x99, 0xfc, 0xe2, 0x42, 0x00, 0x8e, 0xed, 0x26, 0x02, 0x66,
258+
0x11, 0xc5, 0x6d, 0xa0, 0x6c, 0xd1, 0x9b, 0xd9, 0x1a, 0x3b, 0x7d, 0x8e, 0xe4, 0x66, 0xe6, 0xa2,
259+
0x12, 0xa9, 0x38, 0x01, 0x57, 0x10, 0x84, 0x50, 0x70, 0x8b, 0xb0, 0xbc, 0xeb, 0xb7, 0x77, 0x2c,
260+
0xe7, 0x5a, 0xd9, 0xde, 0xa2, 0xca, 0x22, 0xda, 0x7d, 0x51, 0xd1, 0xb5, 0x18, 0x8b, 0x78, 0x7c,
261+
0xf5, 0x48, 0x51, 0xf0, 0xd8, 0xdc, 0x0f, 0xd6, 0x8c, 0x0f, 0xe7, 0xfc, 0x90, 0xa6, 0x40, 0xa0,
262+
0x88, 0x1f, 0xf1, 0x0b, 0x79, 0xa4, 0x18, 0xab, 0xe8, 0xe2, 0x67, 0x08, 0xa8, 0x48, 0x6c, 0xa9,
263+
0xa5, 0x60, 0xad, 0x2a, 0x30, 0xf0, 0x2a, 0x9b, 0x39, 0xe4, 0x7e, 0xcb, 0xed, 0xb2, 0x79, 0x1b,
264+
0xf6, 0xca, 0x56, 0x0c, 0x21, 0x70, 0x9a, 0x96, 0xbc, 0x7c, 0x57, 0x63, 0xc1, 0x84, 0xb0, 0x23,
265+
0x91, 0x22, 0x44, 0xab, 0x5b, 0x30, 0x21, 0x7a, 0x54, 0xcb, 0xf5, 0xf5, 0x97, 0x97, 0x44, 0xfc,
266+
0x8b, 0x33, 0x2e, 0x22, 0x60, 0x31, 0x61, 0xa6, 0xd9, 0x83, 0xb9, 0x16, 0x5a, 0xed, 0x5f, 0x37,
267+
0x09, 0xa3, 0x8b, 0x30, 0xfd, 0x0c, 0x66, 0xb0, 0x11, 0xcc, 0x20, 0x83, 0xd9, 0xd9, 0x08, 0x66,
268+
0x27, 0x83, 0xd9, 0xdd, 0x08, 0x66, 0x37, 0x83, 0x19, 0x6e, 0x04, 0x33, 0xcc, 0x60, 0xf6, 0x36,
269+
0x82, 0xd9, 0xcb, 0x60, 0x5e, 0x6d, 0x04, 0xf3, 0x2a, 0x83, 0x79, 0x7d, 0xbd, 0x3c, 0x17, 0xfb,
270+
0x9e, 0xd5, 0x7c, 0x2d, 0xfb, 0x79, 0xd9, 0x03, 0x0b, 0x0f, 0x5b, 0xf9, 0xc5, 0xdf, 0x7c, 0xe7,
271+
0x4a, 0xf7, 0xde, 0x2f, 0x7e, 0x6d, 0xd8, 0x0f, 0x9a, 0x1b, 0xf2, 0x95, 0xe6, 0x65, 0xef, 0x93,
272+
0x56, 0xf7, 0x00, 0x95, 0x37, 0x69, 0xfe, 0x3a, 0x4d, 0x40, 0x31, 0xa8, 0xef, 0x5d, 0xc0, 0x6f,
273+
0xa5, 0x0b, 0x28, 0xbf, 0xf5, 0xe4, 0x6b, 0x68, 0x03, 0x7e, 0x6f, 0xd7, 0x35, 0xb2, 0xbf, 0xcf,
274+
0x1d, 0x2b, 0xc9, 0xf0, 0xda, 0x37, 0x5d, 0x86, 0x6b, 0xd4, 0x74, 0xdc, 0x50, 0x7e, 0x3f, 0x77,
275+
0x55, 0x8c, 0xfd, 0xbd, 0x02, 0xf5, 0x84, 0x15, 0xa8, 0xff, 0xa3, 0xea, 0xd2, 0x57, 0x58, 0x57,
276+
0x1a, 0x28, 0x65, 0xa5, 0xc1, 0x5f, 0xba, 0xac, 0xf4, 0xa5, 0xfa, 0xf9, 0x1b, 0x57, 0x7c, 0x96,
277+
0x97, 0xa3, 0x86, 0xf5, 0xe5, 0xa8, 0x6f, 0xac, 0x64, 0xb4, 0xf7, 0xbd, 0x64, 0xf4, 0x17, 0x2e,
278+
0x19, 0x7d, 0xcf, 0x2a, 0xbf, 0x88, 0x41, 0xda, 0x24, 0x23, 0x54, 0xd2, 0x98, 0x27, 0x4b, 0x09,
279+
0x1f, 0xb7, 0xfe, 0x0b, 0xff, 0x5c, 0x4a, 0x51,
280280
};

applications/er/er_qml.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <stdbool.h>
99

1010
// Constants
11-
#define DATA_QML_APP_SIZE 4375
11+
#define DATA_QML_APP_SIZE 4376
1212

1313
// Variables
1414
extern uint8_t data_qml_app[];

commands.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -1698,15 +1698,15 @@ void commands_apply_mcconf_hw_limits(mc_configuration *mcconf) {
16981698
#ifdef HW_LIM_FOC_CTRL_LOOP_FREQ
16991699
if (mcconf->foc_sample_v0_v7 == true) {
17001700
//control loop executes twice per pwm cycle when sampling in v0 and v7
1701-
utils_truncate_number(&mcconf->foc_f_sw, HW_LIM_FOC_CTRL_LOOP_FREQ);
1702-
ctrl_loop_freq = mcconf->foc_f_sw;
1701+
utils_truncate_number(&mcconf->foc_f_zv, HW_LIM_FOC_CTRL_LOOP_FREQ);
1702+
ctrl_loop_freq = mcconf->foc_f_zv;
17031703
} else {
17041704
#ifdef HW_HAS_DUAL_MOTORS
1705-
utils_truncate_number(&mcconf->foc_f_sw, HW_LIM_FOC_CTRL_LOOP_FREQ);
1706-
ctrl_loop_freq = mcconf->foc_f_sw;
1705+
utils_truncate_number(&mcconf->foc_f_zv, HW_LIM_FOC_CTRL_LOOP_FREQ);
1706+
ctrl_loop_freq = mcconf->foc_f_zv;
17071707
#else
1708-
utils_truncate_number(&mcconf->foc_f_sw, HW_LIM_FOC_CTRL_LOOP_FREQ * 2.0);
1709-
ctrl_loop_freq = mcconf->foc_f_sw / 2.0;
1708+
utils_truncate_number(&mcconf->foc_f_zv, HW_LIM_FOC_CTRL_LOOP_FREQ * 2.0);
1709+
ctrl_loop_freq = mcconf->foc_f_zv / 2.0;
17101710
#endif
17111711
}
17121712
#endif
@@ -1976,7 +1976,7 @@ static THD_FUNCTION(blocking_thread, arg) {
19761976
float current = buffer_get_float32(data, 1e3, &ind);
19771977

19781978
mcconf->motor_type = MOTOR_TYPE_FOC;
1979-
mcconf->foc_f_sw = 10000.0;
1979+
mcconf->foc_f_zv = 10000.0;
19801980
mcconf->foc_current_kp = 0.01;
19811981
mcconf->foc_current_ki = 10.0;
19821982
mc_interface_set_configuration(mcconf);
@@ -2024,7 +2024,7 @@ static THD_FUNCTION(blocking_thread, arg) {
20242024
float current = buffer_get_float32(data, 1e3, &ind);
20252025

20262026
mcconf->motor_type = MOTOR_TYPE_FOC;
2027-
mcconf->foc_f_sw = 10000.0;
2027+
mcconf->foc_f_zv = 10000.0;
20282028
mcconf->foc_current_kp = 0.01;
20292029
mcconf->foc_current_ki = 10.0;
20302030
mc_interface_set_configuration(mcconf);

conf_general.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1516,7 +1516,7 @@ int conf_general_detect_apply_all_foc(float max_power_loss,
15161516

15171517
mcconf->motor_type = MOTOR_TYPE_FOC;
15181518
mcconf->foc_sensor_mode = FOC_SENSOR_MODE_SENSORLESS;
1519-
mcconf->foc_f_sw = 10000.0; // Lower f_sw => less dead-time distortion
1519+
mcconf->foc_f_zv = 10000.0; // Lower f_zv => less dead-time distortion
15201520
mcconf->foc_current_kp = 0.0005;
15211521
mcconf->foc_current_ki = 1.0;
15221522
mcconf->l_current_max = MCCONF_L_CURRENT_MAX;
@@ -1532,7 +1532,7 @@ int conf_general_detect_apply_all_foc(float max_power_loss,
15321532
#ifdef HW_HAS_DUAL_MOTORS
15331533
mcconf_second->motor_type = MOTOR_TYPE_FOC;
15341534
mcconf_second->foc_sensor_mode = FOC_SENSOR_MODE_SENSORLESS;
1535-
mcconf_second->foc_f_sw = 10000.0; // Lower f_sw => less dead-time distortion
1535+
mcconf_second->foc_f_zv = 10000.0; // Lower f_zv => less dead-time distortion
15361536
mcconf_second->foc_current_kp = 0.0005;
15371537
mcconf_second->foc_current_ki = 1.0;
15381538
mcconf_second->l_current_max = MCCONF_L_CURRENT_MAX;
@@ -1629,12 +1629,12 @@ int conf_general_detect_apply_all_foc(float max_power_loss,
16291629
// Increase switching frequency for flux linkage measurement
16301630
// as dead-time distortion has less effect at higher modulation.
16311631
// Having a smooth rotation is more important.
1632-
mcconf->foc_f_sw = 20000.0;
1632+
mcconf->foc_f_zv = 20000.0;
16331633
mc_interface_set_configuration(mcconf);
16341634

16351635
#ifdef HW_HAS_DUAL_MOTORS
16361636
mc_interface_select_motor_thread(2);
1637-
mcconf_second->foc_f_sw = 20000.0;
1637+
mcconf_second->foc_f_zv = 20000.0;
16381638
mc_interface_set_configuration(mcconf_second);
16391639
mc_interface_select_motor_thread(1);
16401640
#endif

conf_general.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#define FW_VERSION_MAJOR 5
2525
#define FW_VERSION_MINOR 03
2626
// Set to 0 for building a release and iterate during beta test builds
27-
#define FW_TEST_VERSION_NUMBER 76
27+
#define FW_TEST_VERSION_NUMBER 77
2828

2929
#include "datatypes.h"
3030

confgenerator.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ int32_t confgenerator_serialize_mcconf(uint8_t *buffer, const mc_configuration *
5858
buffer_append_float32_auto(buffer, conf->hall_sl_erpm, &ind);
5959
buffer_append_float32_auto(buffer, conf->foc_current_kp, &ind);
6060
buffer_append_float32_auto(buffer, conf->foc_current_ki, &ind);
61-
buffer_append_float32_auto(buffer, conf->foc_f_sw, &ind);
61+
buffer_append_float32_auto(buffer, conf->foc_f_zv, &ind);
6262
buffer_append_float32_auto(buffer, conf->foc_dt_us, &ind);
6363
buffer[ind++] = conf->foc_encoder_inverted;
6464
buffer_append_float32_auto(buffer, conf->foc_encoder_offset, &ind);
@@ -426,7 +426,7 @@ bool confgenerator_deserialize_mcconf(const uint8_t *buffer, mc_configuration *c
426426
conf->hall_sl_erpm = buffer_get_float32_auto(buffer, &ind);
427427
conf->foc_current_kp = buffer_get_float32_auto(buffer, &ind);
428428
conf->foc_current_ki = buffer_get_float32_auto(buffer, &ind);
429-
conf->foc_f_sw = buffer_get_float32_auto(buffer, &ind);
429+
conf->foc_f_zv = buffer_get_float32_auto(buffer, &ind);
430430
conf->foc_dt_us = buffer_get_float32_auto(buffer, &ind);
431431
conf->foc_encoder_inverted = buffer[ind++];
432432
conf->foc_encoder_offset = buffer_get_float32_auto(buffer, &ind);
@@ -790,7 +790,7 @@ void confgenerator_set_defaults_mcconf(mc_configuration *conf) {
790790
conf->hall_sl_erpm = MCCONF_HALL_ERPM;
791791
conf->foc_current_kp = MCCONF_FOC_CURRENT_KP;
792792
conf->foc_current_ki = MCCONF_FOC_CURRENT_KI;
793-
conf->foc_f_sw = MCCONF_FOC_F_SW;
793+
conf->foc_f_zv = MCCONF_FOC_F_ZV;
794794
conf->foc_dt_us = MCCONF_FOC_DT_US;
795795
conf->foc_encoder_inverted = MCCONF_FOC_ENCODER_INVERTED;
796796
conf->foc_encoder_offset = MCCONF_FOC_ENCODER_OFFSET;

confgenerator.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <stdbool.h>
99

1010
// Constants
11-
#define MCCONF_SIGNATURE 2090246193
11+
#define MCCONF_SIGNATURE 919732468
1212
#define APPCONF_SIGNATURE 3733512279
1313

1414
// Functions

datatypes.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ typedef struct {
368368
// FOC
369369
float foc_current_kp;
370370
float foc_current_ki;
371-
float foc_f_sw;
371+
float foc_f_zv;
372372
float foc_dt_us;
373373
float foc_encoder_offset;
374374
bool foc_encoder_inverted;

mc_interface.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -455,9 +455,9 @@ void mc_interface_set_configuration(mc_configuration *configuration) {
455455
case MOTOR_TYPE_FOC:
456456
#ifdef HW_HAS_DUAL_MOTORS
457457
if (motor == &m_motor_1) {
458-
m_motor_2.m_conf.foc_f_sw = motor->m_conf.foc_f_sw;
458+
m_motor_2.m_conf.foc_f_zv = motor->m_conf.foc_f_zv;
459459
} else {
460-
m_motor_1.m_conf.foc_f_sw = motor->m_conf.foc_f_sw;
460+
m_motor_1.m_conf.foc_f_zv = motor->m_conf.foc_f_zv;
461461
}
462462
#endif
463463
mcpwm_foc_set_configuration(&motor->m_conf);

mcconf/mcconf_default.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,8 @@
244244
#ifndef MCCONF_FOC_CURRENT_KI
245245
#define MCCONF_FOC_CURRENT_KI 50.0
246246
#endif
247-
#ifndef MCCONF_FOC_F_SW
248-
#define MCCONF_FOC_F_SW 25000.0
247+
#ifndef MCCONF_FOC_F_ZV
248+
#define MCCONF_FOC_F_ZV 25000.0
249249
#endif
250250
#ifndef MCCONF_FOC_DT_US
251251
#define MCCONF_FOC_DT_US 0.12 // Microseconds for dead time compensation

0 commit comments

Comments
 (0)