diff --git a/index.html b/index.html index f83b338..c466a2c 100644 --- a/index.html +++ b/index.html @@ -90,7 +90,7 @@ } function send(x,y,angle){ - factor = (2**16-1)/400 + factor = (2**8-1)/400; x = Math.round((x + 200) * factor); y = Math.round((y + 200) * factor); var data = clientId + ";d;" + x.toString() + "," + y.toString(); diff --git a/rx_esp32/src/commands.c b/rx_esp32/src/commands.c index 2461c8d..2c56381 100644 --- a/rx_esp32/src/commands.c +++ b/rx_esp32/src/commands.c @@ -59,8 +59,8 @@ int cmd_contrl(char* line, void* cli) { readInt(arg, &ch_d[1]); - servo_set(0, (uint16_t)ch_d[0]); - servo_set(1, (uint16_t)ch_d[1]); + servo_set(0, (uint8_t)ch_d[0]); + servo_set(1, (uint8_t)ch_d[1]); snprintf(&msg[0], 40, "channel data: 0:%lu, 1:%lu\n", ch_d[0], ch_d[1]); CLI_stringOut((CLI_t*)cli, &msg[0]); } diff --git a/rx_esp32/src/servos.c b/rx_esp32/src/servos.c index 13f77b4..dce3aab 100644 --- a/rx_esp32/src/servos.c +++ b/rx_esp32/src/servos.c @@ -70,10 +70,10 @@ void servo_deinit(void) } } -void servo_set(uint8_t ch, uint16_t pos) +void servo_set(uint8_t ch, uint8_t pos) { - uint32_t duty = (uint32_t) ((double)pos * (double)SERVO_DUTY_DIFF/(double)INT16_MAX); - duty += (SERVO_DUTY_MIN + SERVO_DUTY_DIFF/2); + uint32_t duty = (uint32_t) ((double)pos * (double)SERVO_DUTY_DIFF/(double)UINT8_MAX); + duty += (SERVO_DUTY_MIN + (SERVO_DUTY_DIFF/2)); if (duty < SERVO_DUTY_MIN) { duty = SERVO_DUTY_MIN; diff --git a/rx_esp32/src/servos.h b/rx_esp32/src/servos.h index 1069386..2e05cff 100644 --- a/rx_esp32/src/servos.h +++ b/rx_esp32/src/servos.h @@ -5,6 +5,6 @@ void servo_init(void); void servo_deinit(void); -void servo_set(uint8_t ch, uint16_t pos); +void servo_set(uint8_t ch, uint8_t pos); #endif // SERVOS_H \ No newline at end of file