Merge remote-tracking branch 'refs/remotes/origin/feature/fan-control…

…-system' into feature/fan-control-system

.github/ISSUE_TEMPLATE/bug-form.yml

@@ -2,33 +2,20 @@ name: Bug
 description: For any issue related to a bug
 title: '[Area] - Short Description'
 labels: [bug]
+projects: ["Northeastern-Electric-Racing/20"]
 body:
   - type: textarea
     id: observed-behavior
     attributes:
       label: Observed Behavior
-      description: What happened?
-    validations:
-      required: true
-  - type: textarea
-    id: expected-behavior
-    attributes:
-      label: Expected Behavior
-      description: What should have happened?
+      description: What happened? What should of happened?
     validations:
       required: true
   - type: textarea
     id: steps-to-reproduce
     attributes:
       label: Steps to Reproduce
-      description: How could someone reproduce this bug?
+      description: How could someone reproduce this bug? Include versions of code or PCBs as applicable.
       value: "1. \n2. \n3. "
     validations:
       required: true
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: Screenshots (as needed)
-      description: Add screenshots of the bug if applicable
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +1 @@
-blank_issues_enabled: true
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/task.yml

@@ -1,19 +1,20 @@
-name: Task
-description: Create a task that a developer can complete.
+name: Feature
+description: Describe a feature that a developer can add.
 title: '[Area] - Short Description'
+projects: ["Northeastern-Electric-Racing/20"]
 body:
   - type: textarea
     id: description
     attributes:
       label: Description
-      description: Provide a brief summary of this issue
+      description: Provide a brief summary of the current shortcoming or new improvement
     validations:
       required: true
   - type: textarea
     id: acceptance-criteria
     attributes:
       label: Acceptance Criteria
-      description: What are the conditions that need to be satisified to complete this task?
+      description: What are the test conditions that need to be satisified to complete this task?
     validations:
       required: true
   - type: textarea

.github/pull_request_template.md

@@ -25,7 +25,6 @@ It can be helpful to check the `Checks` and `Files changed` tabs.
 Please reach out to your Project Lead if anything is unclear.
 Please request reviewers and ping on slack only after you've gone through this whole checklist.
 
-- [ ] All commits are tagged with the ticket number
 - [ ] No merge conflicts
 - [ ] All checks passing
 - [ ] Remove any non-applicable sections of this template

.github/workflows/build-check.yml

@@ -3,18 +3,16 @@ on: [push]
 jobs:
   run-build:
     runs-on: ubuntu-latest
-    container:
-        image: ghcr.io/northeastern-electric-racing/embedded-base:main
     timeout-minutes: 10
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
             submodules: recursive
-
+            fetch-depth: 0
       - name: Execute Make
         run: |
-            if ! make; then
+            if ! docker compose run --rm ner-gcc-arm make -j `nproc`; then
             echo "The application has failed to build."
             exit 1  # This will cause the workflow to fail
-            fi
+            fi

Core/Inc/bms.h

@@ -1,4 +1,3 @@
-
 #ifndef BMS_H
 #define BMS_H
 

Core/Inc/can_handler.h

@@ -1,22 +1,8 @@
-/**
- * @file can_handler.h
- * @author Hamza Iqbal
- * @brief This CAN handler is meant to receive and properly route CAN messages
- * and keep this task seperate the CAN driver.  The purpose of this is
- * specifically to have a better way of routing the different messages.
- * @version 0.1
- * @date 2023-09-22
- *
- * @copyright Copyright (c) 2023
- *
- */
-
 #ifndef CAN_HANDLER_H
 #define CAN_HANDLER_H
 
 #include "can.h"
 #include "cmsis_os.h"
-#include "dti.h"
 
 /**
  * @brief Callback to be called when a message is received on CAN line 1.

Core/Inc/cerb_utils.h

@@ -11,8 +11,9 @@
 #ifndef CERB_UTILS_H
 #define CERB_UTILS_H
 
+#include <stdbool.h>
+
 #include "cmsis_os.h"
-#include "stdbool.h"
 #include "timer.h"
 
 /**

Core/Inc/dti.h

@@ -13,8 +13,6 @@
 #define DTI_H
 
 #include "can_handler.h"
-#include <stdbool.h>
-#include <stdint.h>
 
 /* Message IDs from DTI CAN Datasheet */
 #define DTI_CANID_ERPM	      0x416 /* ERPM, Duty, Input Voltage */
@@ -27,7 +25,7 @@
 	0x496 /* Throttle signal, Brake signal, IO, Drive enable */
 
 #define TIRE_DIAMETER 16 /* inches */
-#define GEAR_RATIO    47 / 13.0 /* unitless */
+#define GEAR_RATIO    43 / 13.0 /* unitless */
 #define POLE_PAIRS    10 /* unitless */
 
 typedef struct {
@@ -133,4 +131,9 @@ void dti_set_relative_current(int16_t relative_current);
  */
 void dti_set_drive_enable(bool drive_enable);
 
+/**
+ * @brief gets the current mph from the DTI
+ */
+uint8_t get_mph();
+
 #endif

Core/Inc/emrax.h

@@ -18,7 +18,7 @@
 #define EMRAX_NOMINAL_VOLTAGE  520 /* V */
 #define EMRAX_PEAK_EFFICIENCY  90 /* % */
 #define EMRAX_PEAK_POWER       124 /* kW, at 5500 RPM */
-#define EMRAX_PEAK_TORQUE      230 /* Nm */
+#define EMRAX_PEAK_TORQUE      220 /* Nm */
 #define EMRAX_CONT_TORQUE      112 /* Nm */
 #define EMRAX_LIMITING_SPEED   6500 /* RPM */
 #define EMRAX_KV	       15.53

Core/Inc/fault.h

@@ -1,7 +1,6 @@
 #ifndef CERBERUS_FAULT_H
 #define CERBERUS_FAULT_H
 
-#include "cerberus_conf.h"
 #include "cmsis_os.h"
 
 typedef enum {

Core/Inc/monitor.h

@@ -1,12 +1,11 @@
 #ifndef CERBERUS_MONITOR_H
 #define CERBERUS_MONITOR_H
 
+#include <stdbool.h>
+
 #include "cmsis_os.h"
 #include "mpu.h"
 #include "pdu.h"
-#include "stdbool.h"
-#include "steeringio.h"
-#include "stm32f4xx_hal.h"
 
 /**
  * @brief Get the debounced TSMS reading.

Core/Inc/mpu.h

@@ -1,10 +1,10 @@
 #ifndef MPU_H
 #define MPU_H
 
-#include "cmsis_os2.h"
-#include "stm32f4xx_hal.h"
 #include <stdbool.h>
-#include <stdint.h>
+
+#include "cmsis_os.h"
+#include "stm32f4xx_hal.h"
 
 typedef struct {
 	I2C_HandleTypeDef *hi2c;