Merge branch 'master' into revk_troubleshooting

Merge revL master.
lab11 · Sep 10, 2023 · add5056 · add5056
2 parents 2166483 + f753024
commit add5056
Show file tree

Hide file tree

Showing 12 changed files with 17,037 additions and 3 deletions.
diff --git a/hardware/.gitignore b/hardware/.gitignore
@@ -38,3 +38,4 @@ $*.sch
 *.SMT
 *.TSK
 *.TSP
+unzipped/
diff --git a/hardware/tottag/rev_k/SeaLab_Projects_tottag-rev_k#49614.zip b/hardware/tottag/rev_k/SeaLab_Projects_tottag-rev_k#49614.zip
diff --git a/hardware/tottag/rev_l/SeaLab_Projects_tottag-rev-L#50585.zip b/hardware/tottag/rev_l/SeaLab_Projects_tottag-rev-L#50585.zip
diff --git a/hardware/tottag/rev_l/rev_L_v17_BRD.pdf b/hardware/tottag/rev_l/rev_L_v17_BRD.pdf
diff --git a/hardware/tottag/rev_l/rev_L_v8_SCH.pdf b/hardware/tottag/rev_l/rev_L_v8_SCH.pdf
diff --git a/hardware/tottag/rev_l/rev_l_v17.brd b/hardware/tottag/rev_l/rev_l_v17.brd
diff --git a/hardware/tottag/rev_l/rev_l_v8.sch b/hardware/tottag/rev_l/rev_l_v8.sch
diff --git a/software/firmware/.settings/language.settings.xml b/software/firmware/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1673075170754689000" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1349187344451287604" id="org.eclipse.embedcdt.managedbuild.cross.arm.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Arm Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

diff --git a/software/firmware/Makefile b/software/firmware/Makefile
@@ -6,7 +6,7 @@ SHELL := /bin/bash
 ifdef BOARD_REV
 REVISION := $(BOARD_REV)
 else
-REVISION := K
+REVISION := L
 endif
 
 ifeq ($(REVISION), I)

diff --git a/software/firmware/src/boards/revL/pinout.h b/software/firmware/src/boards/revL/pinout.h
@@ -0,0 +1,87 @@
+#ifndef __PINOUT_HEADER_H__
+#define __PINOUT_HEADER_H__
+
+// Hardware Revision ID
+#include "revisions.h"
+#define REVISION_ID                                 REVISION_L
+
+// Battery
+#define PIN_BATTERY_VOLTAGE                         18
+#define PIN_BATTERY_VOLTAGE_FUNCTION                AM_HAL_PIN_18_ADCSE1
+#define PIN_BATTERY_VOLTAGE_ADC_CHANNEL             AM_HAL_ADC_SLOT_CHSEL_SE1
+#define PIN_BATTERY_CHARGING_STATUS                 58
+#define PIN_BATTERY_INPUT_POWER_GOOD                60
+#define PIN_BATTERY_CHARGE_COMPLETE_SIGNAL          66
+#define VOLTAGE_DIVIDER_LOWER                       187
+#define VOLTAGE_DIVIDER_UPPER                       510
+
+// Buzzer
+#define PIN_BUZZER_DRIVER                           54
+
+// DecaWave Radio
+#define RADIO_SPI_NUMBER                            3
+#define PIN_RADIO_SPI_SCK                           31
+#define PIN_RADIO_SPI_MISO                          33
+#define PIN_RADIO_SPI_MOSI                          32
+#define PIN_RADIO_SPI_CS                            29
+#define PIN_RADIO_INTERRUPT                         27
+#define PIN_RADIO_RESET                             50
+#define PIN_RADIO_WAKEUP                            26
+#define PIN_RADIO_ANTENNA_SELECT1                   24
+#define PIN_RADIO_ANTENNA_SELECT2                   25
+#define PIN_RADIO_SPI_SCK_FUNCTION                  AM_HAL_PIN_31_M3SCK
+#define PIN_RADIO_SPI_MISO_FUNCTION                 AM_HAL_PIN_33_M3MISO
+#define PIN_RADIO_SPI_MOSI_FUNCTION                 AM_HAL_PIN_32_M3MOSI
+#define PIN_RADIO_SPI_CS_FUNCTION                   AM_HAL_PIN_29_NCE29
+
+// IMU
+#define IMU_I2C_NUMBER                              1
+#define IMU_I2C_ADDRESS                             0x29
+#define PIN_IMU_I2C_SCL                             8
+#define PIN_IMU_I2C_SDA                             9
+#define PIN_IMU_I2C_SCL_FUNCTION                    AM_HAL_PIN_8_M1SCL
+#define PIN_IMU_I2C_SDA_FUNCTION                    AM_HAL_PIN_9_M1SDAWIR3
+#define PIN_IMU_INTERRUPT                           17
+#define PIN_IMU_RESET                               65
+
+// LEDs
+#define PIN_LED1_RED                                52
+#define PIN_LED1_GREEN                              51
+#define PIN_LED2_RED                                76
+#define PIN_LED2_YELLOW                             88
+
+// Logging
+#define PIN_SWO                                     3
+#define PIN_SWO_FUNCTION                            AM_HAL_PIN_3_SWO
+#define PIN_SWTRACE_CLK                             38
+#define PIN_SWTRACE_CLK_FUNCTION                    AM_HAL_PIN_38_SWTRACECLK
+#define PIN_SWTRACE_0                               80
+#define PIN_SWTRACE_0_FUNCTION                      AM_HAL_PIN_80_SWTRACE0
+#define PIN_SWTRACE_1                               81
+#define PIN_SWTRACE_1_FUNCTION                      AM_HAL_PIN_81_SWTRACE1
+#define PIN_SWTRACE_2                               82
+#define PIN_SWTRACE_2_FUNCTION                      AM_HAL_PIN_82_SWTRACE2
+#define PIN_SWTRACE_3                               83
+#define PIN_SWTRACE_3_FUNCTION                      AM_HAL_PIN_83_SWTRACE3
+
+// Memory Storage (SPI)
+#define STORAGE_SPI_NUMBER                          5
+#define PIN_STORAGE_SPI_SCK                         47
+#define PIN_STORAGE_SPI_MISO                        49
+#define PIN_STORAGE_SPI_MOSI                        48
+#define PIN_STORAGE_SPI_CS                          69
+#define PIN_STORAGE_SPI_SCK_FUNCTION                AM_HAL_PIN_47_M5SCK
+#define PIN_STORAGE_SPI_MISO_FUNCTION               AM_HAL_PIN_49_M5MISO
+#define PIN_STORAGE_SPI_MOSI_FUNCTION               AM_HAL_PIN_48_M5MOSI
+#define PIN_STORAGE_SPI_CS_FUNCTION                 AM_HAL_PIN_69_NCE69
+#define PIN_STORAGE_WRITE_PROTECT                   30
+#define PIN_STORAGE_HOLD                            6
+
+// Timers
+#define BUZZER_TIMER_NUMBER                         0
+#define RADIO_WAKEUP_TIMER_NUMBER                   2
+#define RADIO_WAKEUP_TIMER_TICK_RATE_HZ             (AM_HAL_CLKGEN_FREQ_MAX_HZ / 16)
+#define BLE_SCANNING_TIMER_NUMBER                   4
+#define BLE_SCANNING_TIMER_TICK_RATE_HZ             (AM_HAL_CLKGEN_FREQ_MAX_HZ / 16)
+
+#endif  // #ifndef __PINOUT_HEADER_H__
diff --git a/software/firmware/src/boards/revisions.h b/software/firmware/src/boards/revisions.h
@@ -4,6 +4,7 @@
 #define REVISION_APOLLO4_EVB                0x00
 #define REVISION_I                          0x10
 #define REVISION_K                          0x11
+#define REVISION_L                          0x12
 
 #endif  // #ifndef __REVISIONS_HEADER_H__
 
diff --git a/software/firmware/tests/Makefile b/software/firmware/tests/Makefile
@@ -5,7 +5,7 @@ SHELL := /bin/bash
 ifdef BOARD_REV
 REVISION := $(BOARD_REV)
 else
-REVISION := K
+REVISION := L
 endif
 
 ifeq ($(REVISION), I)