v/maiana
1
0
Fork 0
mirror of https://github.com/peterantypas/maiana.git synced 2025-05-19 00:40:08 -07:00
Code Issues Projects Releases Wiki Activity

Checkpoint before changing NF detection

Browse Source
This commit is contained in:
Peter Antypas 2020-11-02 07:16:12 -08:00
parent ce8f5012d0
commit db56ae58a9
7 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
latest/Firmware/.cproject
View File

@ -67,7 +67,7 @@
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize.836975549" name="Print size" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize" useByScannerDiscovery="false" value="true" valueType="boolean"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize.836975549" name="Print size" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.1340518776" name="ARM family (-mcpu)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m4" valueType="enumerated"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.1340518776" name="Arm family (-mcpu)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m4" valueType="enumerated"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture.203499312" name="Architecture (-march)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture" useByScannerDiscovery="false"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture.203499312" name="Architecture (-march)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture" useByScannerDiscovery="false"/>
@ -328,6 +328,7 @@
</folderInfo> </folderInfo>
<sourceEntries> <sourceEntries>
<entry excluding="Src/bsp/bsp_6_0_bad.cpp|startup/startup_stm32l412xx.S|Drivers/CMSIS_Old|Drivers/STM32L4xx_HAL_Driver_Old|Src/main.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/> <entry excluding="Src/bsp/bsp_6_0_bad.cpp|startup/startup_stm32l412xx.S|Drivers/CMSIS_Old|Drivers/STM32L4xx_HAL_Driver_Old|Src/main.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries> </sourceEntries>
@ -408,7 +409,7 @@
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize.996621402" name="Print size" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize" useByScannerDiscovery="false" value="true" valueType="boolean"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize.996621402" name="Print size" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.515946980" name="ARM family (-mcpu)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m4" valueType="enumerated"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.515946980" name="Arm family (-mcpu)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m4" valueType="enumerated"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture.1668993859" name="Architecture (-march)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture" useByScannerDiscovery="false"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture.1668993859" name="Architecture (-march)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture" useByScannerDiscovery="false"/>
@ -744,7 +745,7 @@
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize.860073260" name="Print size" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize" useByScannerDiscovery="false" value="true" valueType="boolean"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize.860073260" name="Print size" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.487584038" name="ARM family (-mcpu)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m4" valueType="enumerated"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.487584038" name="Arm family (-mcpu)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m4" valueType="enumerated"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture.779036775" name="Architecture (-march)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture" useByScannerDiscovery="false"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture.779036775" name="Architecture (-march)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture" useByScannerDiscovery="false"/>
@ -1092,7 +1093,7 @@
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize.1038770924" name="Print size" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize" useByScannerDiscovery="false" value="true" valueType="boolean"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize.1038770924" name="Print size" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize" useByScannerDiscovery="false" value="true" valueType="boolean"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.816032579" name="ARM family (-mcpu)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m4" valueType="enumerated"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.816032579" name="Arm family (-mcpu)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" useByScannerDiscovery="false" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m4" valueType="enumerated"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture.466957973" name="Architecture (-march)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture" useByScannerDiscovery="false"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture.466957973" name="Architecture (-march)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.architecture" useByScannerDiscovery="false"/>

10
latest/Firmware/Inc/CircularQueue.hpp
View File

@ -38,7 +38,7 @@ public:
ASSERT(mBuffer); ASSERT(mBuffer);
} }
bool empty() inline bool empty()
{ {
return mReadPosition == mWritePosition; return mReadPosition == mWritePosition;
} }
@ -61,16 +61,14 @@ public:
if ( empty() ) if ( empty() )
return false; return false;
int nextElement = (mReadPosition + 1) % mSize;
Element = mBuffer[mReadPosition]; Element = mBuffer[mReadPosition];
mReadPosition = nextElement; mReadPosition = (mReadPosition + 1) % mSize;
return true; return true;
} }
private: private:
bool isSafeToWrite(int nextElement) inline bool isSafeToWrite(int nextElement)
{ {
return nextElement != mReadPosition; return nextElement != mReadPosition;
} }
@ -79,7 +77,7 @@ private:
volatile int mReadPosition; volatile int mReadPosition;
volatile int mWritePosition; volatile int mWritePosition;
size_t mSize; size_t mSize;
T* mBuffer; volatile T* mBuffer;
}; };
#endif /* CIRCULARQUEUE_HPP_ */ #endif /* CIRCULARQUEUE_HPP_ */

4
latest/Firmware/Inc/FreeRTOSConfig.h
View File

@ -67,12 +67,12 @@
#define configTOTAL_HEAP_SIZE ((size_t)16384) #define configTOTAL_HEAP_SIZE ((size_t)16384)
#define configMAX_TASK_NAME_LEN ( 16 ) #define configMAX_TASK_NAME_LEN ( 16 )
#define configUSE_16_BIT_TICKS 0 #define configUSE_16_BIT_TICKS 0
#define configUSE_MUTEXES 1 #define configUSE_MUTEXES 0
#define configQUEUE_REGISTRY_SIZE 8 #define configQUEUE_REGISTRY_SIZE 8
#define configUSE_PORT_OPTIMISED_TASK_SELECTION 1 #define configUSE_PORT_OPTIMISED_TASK_SELECTION 1
#define configCHECK_FOR_STACK_OVERFLOW 0 #define configCHECK_FOR_STACK_OVERFLOW 0
#define configUSE_TIMERS 1 #define configUSE_TIMERS 0
#define configTIMER_TASK_PRIORITY ( 2 ) #define configTIMER_TASK_PRIORITY ( 2 )
#define configTIMER_QUEUE_LENGTH 10 #define configTIMER_QUEUE_LENGTH 10
#define configTIMER_TASK_STACK_DEPTH 256 #define configTIMER_TASK_STACK_DEPTH 256

2
latest/Firmware/Inc/bsp/bsp.hpp
View File

@ -47,6 +47,8 @@ void bsp_gnss_on();
void bsp_gnss_off(); void bsp_gnss_off();
bool bsp_is_tx_disabled(); bool bsp_is_tx_disabled();
uint8_t bsp_noise_floor(); uint8_t bsp_noise_floor();
void bsp_signal_high();
void bsp_signal_low();
// Callback for processing UART input (interrupt) // Callback for processing UART input (interrupt)
typedef void(*char_input_cb)(char c); typedef void(*char_input_cb)(char c);

3
latest/Firmware/Inc/bsp/bsp_6_1.hpp
View File

@ -68,6 +68,9 @@
#define UART_RX_PORT GPIOA #define UART_RX_PORT GPIOA
#define UART_RX_PIN GPIO_PIN_10 #define UART_RX_PIN GPIO_PIN_10
#define SPARE_PORT GPIOA
#define SPARE_PIN GPIO_PIN_11
#define TX_DISABLE_PORT GPIOA #define TX_DISABLE_PORT GPIOA
#define TX_DISABLE_PIN GPIO_PIN_12 #define TX_DISABLE_PIN GPIO_PIN_12

11
latest/Firmware/Src/EventQueue.cpp
View File

@ -19,7 +19,7 @@
#include "EventQueue.hpp" #include "EventQueue.hpp"
#include <stm32l4xx.h> //#include <stm32l4xx.h>
#include "printf_serial.h" #include "printf_serial.h"
#include "printf_serial.h" #include "printf_serial.h"
@ -27,8 +27,9 @@
#include "FreeRTOS.h" #include "FreeRTOS.h"
#include "queue.h" #include "queue.h"
#include "task.h" #include "task.h"
#include "bsp.hpp"
#define EVENT_QUEUE_SIZE 40 #define EVENT_QUEUE_SIZE 50
static Event __queue[EVENT_QUEUE_SIZE]; static Event __queue[EVENT_QUEUE_SIZE];
@ -53,12 +54,16 @@ void EventQueue::push(const Event &e)
if ( xTaskGetSchedulerState() != taskSCHEDULER_RUNNING ) if ( xTaskGetSchedulerState() != taskSCHEDULER_RUNNING )
return; return;
BaseType_t xHighPriorityTaskWoken = pdFALSE; BaseType_t xHighPriorityTaskWoken = pdTRUE;
if ( Utils::inISR() ) if ( Utils::inISR() )
{ {
//bsp_signal_high();
xQueueSendFromISR(mQueueHandle, &e, &xHighPriorityTaskWoken); xQueueSendFromISR(mQueueHandle, &e, &xHighPriorityTaskWoken);
//bsp_signal_low();
#if 0
if ( xHighPriorityTaskWoken ) if ( xHighPriorityTaskWoken )
portYIELD_FROM_ISR(xHighPriorityTaskWoken); portYIELD_FROM_ISR(xHighPriorityTaskWoken);
#endif
} }
else else
{ {

13
latest/Firmware/Src/bsp/bsp_6_1.cpp
View File

@ -53,7 +53,8 @@ typedef struct
} GPIO; } GPIO;
static const GPIO __gpios[] = { static const GPIO __gpios[] = {
{GNSS_EN_PORT, {GNSS_EN_PIN, GPIO_MODE_OUTPUT_PP, GPIO_NOPULL, GPIO_SPEED_LOW, 0}, GPIO_PIN_SET}, {GNSS_EN_PORT, {GNSS_EN_PIN, GPIO_MODE_OUTPUT_PP, GPIO_NOPULL, GPIO_SPEED_LOW, 0}, GPIO_PIN_RESET},
{SPARE_PORT, {SPARE_PIN, GPIO_MODE_OUTPUT_PP, GPIO_NOPULL, GPIO_SPEED_HIGH, 0}, GPIO_PIN_RESET},
{TX_DISABLE_PORT, {TX_DISABLE_PIN, GPIO_MODE_INPUT, GPIO_PULLUP, GPIO_SPEED_LOW, 0}, GPIO_PIN_SET}, {TX_DISABLE_PORT, {TX_DISABLE_PIN, GPIO_MODE_INPUT, GPIO_PULLUP, GPIO_SPEED_LOW, 0}, GPIO_PIN_SET},
{EEPROM_WREN_PORT, {EEPROM_WREN_PIN, GPIO_MODE_OUTPUT_OD, GPIO_NOPULL, GPIO_SPEED_LOW, 0}, GPIO_PIN_SET}, {EEPROM_WREN_PORT, {EEPROM_WREN_PIN, GPIO_MODE_OUTPUT_OD, GPIO_NOPULL, GPIO_SPEED_LOW, 0}, GPIO_PIN_SET},
{CS2_PORT, {CS2_PIN, GPIO_MODE_OUTPUT_PP, GPIO_NOPULL, GPIO_SPEED_HIGH, 0}, GPIO_PIN_SET}, {CS2_PORT, {CS2_PIN, GPIO_MODE_OUTPUT_PP, GPIO_NOPULL, GPIO_SPEED_HIGH, 0}, GPIO_PIN_SET},
@ -564,6 +565,16 @@ uint8_t bsp_noise_floor()
return 0x22; return 0x22;
} }
void bsp_signal_high()
{
HAL_GPIO_WritePin(SPARE_PORT, SPARE_PIN, GPIO_PIN_SET);
}
void bsp_signal_low()
{
HAL_GPIO_WritePin(SPARE_PORT, SPARE_PIN, GPIO_PIN_RESET);
}
extern "C" extern "C"
{ {