Skip to content

Add uBox 75/100 support #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
b264 wants to merge 28 commits into
base: dev
Choose a base branch
from
Draft

Add uBox 75/100 support #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
38fd154
started adding 60D plus changes
Jfriesen222 Dec 27, 2020
f549090
Merge remote-tracking branch 'upstream/dev_fw_5_02' into dev_fw_5_02
Jfriesen222 Dec 27, 2020
52f52cc
some more revisions
Jfriesen222 Dec 29, 2020
d9f4af9
Merge remote-tracking branch 'upstream/dev_fw_5_02' into dev_fw_5_02
Jfriesen222 Jan 4, 2021
e862f29
Re-wrote uart driver a bit
Jfriesen222 Jan 5, 2021
6a3dfb8
Patched bug with gpio AF in uart
Jfriesen222 Jan 5, 2021
1b67f3e
Added build script for 60D+
Jfriesen222 Jan 5, 2021
728f5c1
Fixed spaces
Jfriesen222 Jan 6, 2021
d750696
Merge remote-tracking branch 'upstream/master' into dev_fw_5_03
Jfriesen222 Jan 11, 2021
25f4967
Started on dev branch for FW 5.03
vedderb Jan 11, 2021
b412ac3
Moved packet handler state to caller and updated unit test for packet…
vedderb Jan 12, 2021
8f703da
merge
Jfriesen222 Jan 13, 2021
57a13ec
cleanup merge
Jfriesen222 Jan 13, 2021
cf8c16f
Merge remote-tracking branch 'upstream/dev_fw_5_03' into dev_fw_5_03
Jfriesen222 Jan 13, 2021
4af2665
Merge pull request #252 from Jfriesen222/dev_fw_5_03
vedderb Jan 13, 2021
ecb43e7
Cleanup
vedderb Jan 13, 2021
9a0973c
Style fix
vedderb Jan 15, 2021
8f509bf
default disable FOC_CC_DECOUPLING
b264 Jan 22, 2021
63c5d75
Merge upstream branch
b264 Jan 24, 2021
831ac30
uBox 100A 5.01 release
b264 Jan 24, 2021
92932a7
add hw_ubox_75_100
b264 Jan 24, 2021
04e9f88
clean up other changes
b264 Jan 24, 2021
c9febf9
Merge pull request #9 from b264/00decoupling
b264 Jan 24, 2021
b84b842
ubox is not HW75/300
b264 Jan 24, 2021
e24be28
build firmwares
b264 Jan 24, 2021
b3a16e1
Merge dev branch into feature branch
b264 Jan 24, 2021
942ffd6
allow executing of build script
b264 Jan 24, 2021
cb1f82a
build firmware
b264 Jan 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions applications/app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void app_set_configuration(app_configuration *conf) {

app_ppm_stop();
app_adc_stop();
app_uartcomm_stop();
app_uartcomm_stop(UART_PORT_COMM_HEADER);
app_nunchuk_stop();
app_balance_stop();
app_pas_stop();
Expand Down Expand Up @@ -84,19 +84,19 @@ void app_set_configuration(app_configuration *conf) {

case APP_UART:
hw_stop_i2c();
app_uartcomm_start();
app_uartcomm_start(UART_PORT_COMM_HEADER);
break;

case APP_PPM_UART:
hw_stop_i2c();
app_ppm_start();
app_uartcomm_start();
app_uartcomm_start(UART_PORT_COMM_HEADER);
break;

case APP_ADC_UART:
hw_stop_i2c();
app_adc_start(false);
app_uartcomm_start();
app_uartcomm_start(UART_PORT_COMM_HEADER);
break;

case APP_NUNCHUK:
Expand All @@ -107,7 +107,7 @@ void app_set_configuration(app_configuration *conf) {
app_balance_start();
if(appconf.imu_conf.type == IMU_TYPE_INTERNAL){
hw_stop_i2c();
app_uartcomm_start();
app_uartcomm_start(UART_PORT_COMM_HEADER);
}
break;

Expand Down Expand Up @@ -141,7 +141,8 @@ void app_set_configuration(app_configuration *conf) {
app_ppm_configure(&appconf.app_ppm_conf);
app_adc_configure(&appconf.app_adc_conf);
app_pas_configure(&appconf.app_pas_conf);
app_uartcomm_configure(appconf.app_uart_baudrate, appconf.permanent_uart_enabled);
app_uartcomm_configure(appconf.app_uart_baudrate, true, UART_PORT_COMM_HEADER);
app_uartcomm_configure(0, appconf.permanent_uart_enabled, UART_PORT_BUILTIN);
app_nunchuk_configure(&appconf.app_chuk_conf);

#ifdef APP_CUSTOM_TO_USE
Expand Down
17 changes: 11 additions & 6 deletions applications/app.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,17 @@ float app_adc_get_voltage(void);
float app_adc_get_decoded_level2(void);
float app_adc_get_voltage2(void);

void app_uartcomm_start(void);
void app_uartcomm_start_permanent(void);
void app_uartcomm_stop(void);
void app_uartcomm_configure(uint32_t baudrate, bool permanent_enabled);
void app_uartcomm_send_packet(unsigned char *data, unsigned int len);
void app_uartcomm_send_packet_p(unsigned char *data, unsigned int len);
typedef enum {
UART_PORT_COMM_HEADER = 0,
UART_PORT_BUILTIN,
UART_PORT_EXTRA_HEADER
} UART_PORT;

void app_uartcomm_initialize(void);
void app_uartcomm_start(UART_PORT port_number);
void app_uartcomm_stop(UART_PORT port_number);
void app_uartcomm_configure(uint32_t baudrate, bool permanent_enabled, UART_PORT port_number);
void app_uartcomm_send_packet(unsigned char *data, unsigned int len, UART_PORT port_number);

void app_nunchuk_start(void);
void app_nunchuk_stop(void);
Expand Down
Loading