Skip to content

Commit 186e1ce

Browse files
committed
Disable vesc remote control by default and enable it after pairing
1 parent f810939 commit 186e1ce

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

appconf/appconf_default.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205

206206
// Nunchuk app
207207
#ifndef APPCONF_CHUK_CTRL_TYPE
208-
#define APPCONF_CHUK_CTRL_TYPE CHUK_CTRL_TYPE_CURRENT
208+
#define APPCONF_CHUK_CTRL_TYPE CHUK_CTRL_TYPE_NONE
209209
#endif
210210
#ifndef APPCONF_CHUK_HYST
211211
#define APPCONF_CHUK_HYST 0.15

applications/er/app_erockit_conf_v2.h

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#define APP_CUSTOM_TO_USE "er/app_erockit_v2.c"
2424
#define APPCONF_APP_TO_USE APP_CUSTOM
2525
#define APPCONF_SHUTDOWN_MODE SHUTDOWN_MODE_ALWAYS_ON
26+
#define APPCONF_CHUK_CTRL_TYPE CHUK_CTRL_TYPE_NONE
2627

2728
#define MCCONF_DEFAULT_MOTOR_TYPE MOTOR_TYPE_FOC
2829
#define MCCONF_FOC_SENSOR_MODE FOC_SENSOR_MODE_SENSORLESS

applications/finn/app_finn_az_conf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#define MCCONF_P_PID_KP (0.2 * APP_FINN_WRAP_FACTOR)
4444
#define MCCONF_P_PID_KI (0.2 * APP_FINN_WRAP_FACTOR)
4545
#define MCCONF_P_PID_KD (0.01 * APP_FINN_WRAP_FACTOR)
46-
#define MCCONF_P_PID_ANG_DIV (75.0 * 7.0 * APP_FINN_WRAP_FACTOR) // 1:75 gearing and 7 pole pairs
46+
#define MCCONF_P_PID_ANG_DIV (150.0 * 7.0 * APP_FINN_WRAP_FACTOR) // 1:75 gearing and 7 pole pairs
4747
#define MCCONF_P_PID_KD_FILTER 0.2
4848
#define MCCONF_P_PID_GAIN_DEC_ANGLE 300.0
4949

nrf/nrf_driver.c

+2
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,8 @@ void nrf_driver_process_packet(unsigned char *buf, unsigned char len) {
493493
commands_send_packet_nrf(data, 5);
494494
}
495495

496+
appconf.app_chuk_conf.ctrl_type = CHUK_CTRL_TYPE_CURRENT;
497+
496498
from_nrf = true;
497499
conf_general_store_app_configuration(&appconf);
498500
app_set_configuration(&appconf);

0 commit comments

Comments
 (0)