Merge branch 'master' into balanceapp_cascading_pid

2022-05-15 11:01:30 -07:00 · 2022-05-15 11:01:30 -07:00 · 26c17ae065
parent 12c5c868b9 7e172cd91d
commit 26c17ae065
158 changed files with 89 additions and 65 deletions
--- a/applications/appconf_default.h
+++ b/applications/appconf_default.h
--- a/comm/comm.mk
+++ b/comm/comm.mk
@ -0,0 +1,9 @@
 CSRC += \
 	comm/commands.c \
 	comm/comm_usb_serial.c \
 	comm/comm_usb.c \
 	comm/comm_can.c \
 	comm/packet.c
 INCDIR += comm
--- a/comm/comm_can.c
+++ b/comm/comm_can.c
--- a/comm/comm_can.h
+++ b/comm/comm_can.h
--- a/comm/comm_usb.c
+++ b/comm/comm_usb.c
--- a/comm/comm_usb.h
+++ b/comm/comm_usb.h
--- a/comm/comm_usb_serial.c
+++ b/comm/comm_usb_serial.c
--- a/comm/comm_usb_serial.h
+++ b/comm/comm_usb_serial.h
--- a/comm/commands.c
+++ b/comm/commands.c
--- a/comm/commands.h
+++ b/comm/commands.h
--- a/comm/packet.c
+++ b/comm/packet.c
--- a/comm/packet.h
+++ b/comm/packet.h
--- a/driver/driver.mk
+++ b/driver/driver.mk
@ -0,0 +1,25 @@
 CSRC += \
 	driver/eeprom.c \
 	driver/i2c_bb.c \
 	driver/ledpwm.c \
 	driver/servo_dec.c \
 	driver/servo_simple.c \
 	driver/spi_bb.c \
 	driver/timer.c
 CSRC += \
 	driver/lora/SX1278.c \
 	driver/lora/lora.c \
 	driver/lora/SX1278_hw.c 
 CSRC += \
 	driver/nrf/spi_sw.c \
 	driver/nrf/rf.c \
 	driver/nrf/rfhelp.c \
 	driver/nrf/nrf_driver.c
 INCDIR += \
 	driver \
 	driver/lora \
 	driver/nrf
--- a/driver/eeprom.c
+++ b/driver/eeprom.c
--- a/driver/eeprom.h
+++ b/driver/eeprom.h
--- a/driver/i2c_bb.c
+++ b/driver/i2c_bb.c
--- a/driver/i2c_bb.h
+++ b/driver/i2c_bb.h
--- a/driver/ledpwm.c
+++ b/driver/ledpwm.c
--- a/driver/ledpwm.h
+++ b/driver/ledpwm.h
--- a/driver/lora/SX1278.c
+++ b/driver/lora/SX1278.c
--- a/driver/lora/SX1278.h
+++ b/driver/lora/SX1278.h
--- a/driver/lora/SX1278_hw.c
+++ b/driver/lora/SX1278_hw.c
--- a/driver/lora/SX1278_hw.h
+++ b/driver/lora/SX1278_hw.h
--- a/driver/lora/lora.c
+++ b/driver/lora/lora.c
--- a/driver/lora/lora.h
+++ b/driver/lora/lora.h
--- a/driver/nrf/nrf_driver.c
+++ b/driver/nrf/nrf_driver.c
--- a/driver/nrf/nrf_driver.h
+++ b/driver/nrf/nrf_driver.h
--- a/driver/nrf/rf.c
+++ b/driver/nrf/rf.c
--- a/driver/nrf/rf.h
+++ b/driver/nrf/rf.h
--- a/driver/nrf/rfhelp.c
+++ b/driver/nrf/rfhelp.c
--- a/driver/nrf/rfhelp.h
+++ b/driver/nrf/rfhelp.h
--- a/driver/nrf/spi_sw.c
+++ b/driver/nrf/spi_sw.c
--- a/driver/nrf/spi_sw.h
+++ b/driver/nrf/spi_sw.h
--- a/driver/servo_dec.c
+++ b/driver/servo_dec.c
--- a/driver/servo_dec.h
+++ b/driver/servo_dec.h
--- a/driver/servo_simple.c
+++ b/driver/servo_simple.c
--- a/driver/servo_simple.h
+++ b/driver/servo_simple.h
--- a/driver/spi_bb.c
+++ b/driver/spi_bb.c
--- a/driver/spi_bb.h
+++ b/driver/spi_bb.h
--- a/driver/timer.c
+++ b/driver/timer.c
--- a/driver/timer.h
+++ b/driver/timer.h
--- a/hwconf/board.c
+++ b/hwconf/board.c
--- a/hwconf/board.h
+++ b/hwconf/board.h
--- a/hwconf/hwconf.mk
+++ b/hwconf/hwconf.mk
@ -1,10 +1,13 @@
-HWSRC =	hwconf/hw.c \
+HWSRC =	\
 	hwconf/board.c \
 	hwconf/hw.c \
 	hwconf/drv8301.c \
 	hwconf/drv8305.c \
 	hwconf/drv8320s.c \
 	hwconf/drv8323s.c \
 	hwconf/luna/luna_display_serial.c \
-	hwconf/si8900.c
+	hwconf/si8900.c \
 	hwconf/shutdown.c \
 HWINC = hwconf \
 		hwconf/luna
--- a/hwconf/mcuconf.h
+++ b/hwconf/mcuconf.h
--- a/hwconf/other/hw_Cheap_FOCer_2.c
+++ b/hwconf/other/hw_Cheap_FOCer_2.c
--- a/hwconf/other/hw_Cheap_FOCer_2.h
+++ b/hwconf/other/hw_Cheap_FOCer_2.h
--- a/hwconf/other/hw_Little_FOCer.c
+++ b/hwconf/other/hw_Little_FOCer.c
--- a/hwconf/other/hw_Little_FOCer.h
+++ b/hwconf/other/hw_Little_FOCer.h
--- a/hwconf/other/hw_Little_FOCer_no_limits.h
+++ b/hwconf/other/hw_Little_FOCer_no_limits.h
--- a/hwconf/other/hw_axiom.c
+++ b/hwconf/other/hw_axiom.c
--- a/hwconf/other/hw_axiom.h
+++ b/hwconf/other/hw_axiom.h
--- a/hwconf/other/hw_axiom_fpga_bitstream.c
+++ b/hwconf/other/hw_axiom_fpga_bitstream.c
--- a/hwconf/other/hw_das_mini.c
+++ b/hwconf/other/hw_das_mini.c
--- a/hwconf/other/hw_das_mini.h
+++ b/hwconf/other/hw_das_mini.h
--- a/hwconf/other/hw_das_rs.c
+++ b/hwconf/other/hw_das_rs.c
--- a/hwconf/other/hw_das_rs.h
+++ b/hwconf/other/hw_das_rs.h
--- a/hwconf/other/hw_es19.c
+++ b/hwconf/other/hw_es19.c
--- a/hwconf/other/hw_es19.h
+++ b/hwconf/other/hw_es19.h
--- a/hwconf/other/hw_gesc.c
+++ b/hwconf/other/hw_gesc.c
--- a/hwconf/other/hw_gesc.h
+++ b/hwconf/other/hw_gesc.h
--- a/hwconf/other/hw_mini4.c
+++ b/hwconf/other/hw_mini4.c
--- a/hwconf/other/hw_mini4.h
+++ b/hwconf/other/hw_mini4.h
--- a/hwconf/other/hw_r2.c
+++ b/hwconf/other/hw_r2.c
--- a/hwconf/other/hw_r2.h
+++ b/hwconf/other/hw_r2.h
--- a/hwconf/other/hw_raiden7.c
+++ b/hwconf/other/hw_raiden7.c
--- a/hwconf/other/hw_raiden7.h
+++ b/hwconf/other/hw_raiden7.h
--- a/hwconf/other/hw_rd2.c
+++ b/hwconf/other/hw_rd2.c
--- a/hwconf/other/hw_rd2.h
+++ b/hwconf/other/hw_rd2.h
--- a/hwconf/other/hw_resc.c
+++ b/hwconf/other/hw_resc.c
--- a/hwconf/other/hw_resc.h
+++ b/hwconf/other/hw_resc.h
--- a/hwconf/other/hw_rh.c
+++ b/hwconf/other/hw_rh.c
--- a/hwconf/other/hw_rh.h
+++ b/hwconf/other/hw_rh.h
--- a/hwconf/other/hw_uavc_omega.c
+++ b/hwconf/other/hw_uavc_omega.c
--- a/hwconf/other/hw_uavc_omega.h
+++ b/hwconf/other/hw_uavc_omega.h
--- a/hwconf/other/hw_uavc_qcube.c
+++ b/hwconf/other/hw_uavc_qcube.c
--- a/hwconf/other/hw_uavc_qcube.h
+++ b/hwconf/other/hw_uavc_qcube.h
--- a/hwconf/other/hw_ubox_single.c
+++ b/hwconf/other/hw_ubox_single.c
--- a/hwconf/other/hw_ubox_single.h
+++ b/hwconf/other/hw_ubox_single.h
--- a/hwconf/other/hw_unity.c
+++ b/hwconf/other/hw_unity.c
--- a/hwconf/other/hw_unity.h
+++ b/hwconf/other/hw_unity.h
--- a/hwconf/other/hw_unity_no_limits.h
+++ b/hwconf/other/hw_unity_no_limits.h
--- a/hwconf/other/hw_uxv_sr.c
+++ b/hwconf/other/hw_uxv_sr.c
--- a/hwconf/other/hw_uxv_sr.h
+++ b/hwconf/other/hw_uxv_sr.h
--- a/hwconf/other/hw_warrior6.c
+++ b/hwconf/other/hw_warrior6.c
--- a/hwconf/other/hw_warrior6.h
+++ b/hwconf/other/hw_warrior6.h
--- a/hwconf/trampa/vesc4/hw_40.c
+++ b/hwconf/trampa/vesc4/hw_40.c
--- a/hwconf/trampa/vesc4/hw_40.h
+++ b/hwconf/trampa/vesc4/hw_40.h
--- a/hwconf/trampa/vesc4/hw_410.c
+++ b/hwconf/trampa/vesc4/hw_410.c
--- a/hwconf/trampa/vesc4/hw_410.h
+++ b/hwconf/trampa/vesc4/hw_410.h
--- a/hwconf/trampa/vesc4/hw_410_0005ohm.h
+++ b/hwconf/trampa/vesc4/hw_410_0005ohm.h
@ -18,7 +18,7 @@
 #ifndef HW_410_0005OHM_H_
 #define HW_410_0005OHM_H_
-#define HW_SOURCE_ALT 		"trampa/vesc4/hw_410.c"
+#define HW_SOURCE_ALT 		"other/vesc4/hw_410.c"
 #define CURRENT_SHUNT_RES	0.0005
 #include "hw_410.h"
--- a/hwconf/trampa/vesc4/hw_410_005ohm.h
+++ b/hwconf/trampa/vesc4/hw_410_005ohm.h
@ -18,7 +18,7 @@
 #ifndef HW_410_005OHM_H_
 #define HW_410_005OHM_H_
-#define HW_SOURCE_ALT 		"trampa/vesc4/hw_410.c"
+#define HW_SOURCE_ALT 		"other/vesc4/hw_410.c"
 #define CURRENT_SHUNT_RES	0.005
 #include "hw_410.h"
--- a/hwconf/trampa/vesc4/hw_410_no_limits.h
+++ b/hwconf/trampa/vesc4/hw_410_no_limits.h
--- a/hwconf/trampa/vesc4/hw_45.c
+++ b/hwconf/trampa/vesc4/hw_45.c
--- a/hwconf/trampa/vesc4/hw_45.h
+++ b/hwconf/trampa/vesc4/hw_45.h
--- a/hwconf/trampa/vesc4/hw_46.c
+++ b/hwconf/trampa/vesc4/hw_46.c
--- a/hwconf/trampa/vesc4/hw_46.h
+++ b/hwconf/trampa/vesc4/hw_46.h
--- a/hwconf/trampa/vesc4/hw_46_0005ohm.h
+++ b/hwconf/trampa/vesc4/hw_46_0005ohm.h
@ -18,7 +18,7 @@
 #ifndef HW_46_0005OHM_H_
 #define HW_46_0005OHM_H_
-#define HW_SOURCE_ALT 		"trampa/vesc4/hw_46.c"
+#define HW_SOURCE_ALT 		"other/vesc4/hw_46.c"
 #define CURRENT_SHUNT_RES	0.0005
 #include "hw_46.h"
--- a/hwconf/trampa/vesc4/hw_46_33k.h
+++ b/hwconf/trampa/vesc4/hw_46_33k.h
@ -18,7 +18,7 @@
 #ifndef HW_46_33K_H_
 #define HW_46_33K_H_
-#define HW_SOURCE_ALT "trampa/vesc4/hw_46.c"
+#define HW_SOURCE_ALT "other/vesc4/hw_46.c"
 #define VIN_R1	33000.0
 #include "hw_46.h"
--- a/hwconf/trampa/vesc4/hw_48.c
+++ b/hwconf/trampa/vesc4/hw_48.c
--- a/Show More
+++ b/Show More