Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion FprimeZephyrReference/Components/ComDelay/ComDelay.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ module Components {
@Port to set the value of a parameter
param set port prmSetOut
}
}
}
2 changes: 1 addition & 1 deletion FprimeZephyrReference/Components/ComDelay/docs/sdd.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

| Name | Description |
|---------|-----------------------------------------------------------|
| DIVIDER | Number of rate group ticks received before sending status |
| DIVIDER | Number of rate group ticks received before sending status |
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ void setupTopology(const TopologyState& state) {

// Uplink is configured for receive so a socket task is started
// We dont need UART, as we are sending coms directly to lora
//comDriver.configure(state.uartDevice, state.baudRate);
// comDriver.configure(state.uartDevice, state.baudRate);
lora.start(state.loraDevice);
}

Expand Down
4 changes: 2 additions & 2 deletions FprimeZephyrReference/ReferenceDeployment/Top/topology.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ module ReferenceDeployment {
connections Communications {
lora.allocate -> ComCcsds.commsBufferManager.bufferGetCallee
lora.deallocate -> ComCcsds.commsBufferManager.bufferSendIn

# ComDriver <-> ComStub (Uplink)
lora.dataOut -> ComCcsds.frameAccumulator.dataIn
ComCcsds.frameAccumulator.dataReturnOut -> lora.dataReturnIn
Expand Down Expand Up @@ -113,7 +113,7 @@ module ReferenceDeployment {
imuManager.temperatureGet -> lsm6dsoManager.temperatureGet
}



}

Expand Down
1 change: 0 additions & 1 deletion FprimeZephyrReference/project/config/FpConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@ extern "C" {
#define FW_ASSERT_COUNT_MAX 4
#endif


// *** NOTE configuration checks are in Fw/Cfg/ConfigCheck.cpp in order to have
// the type definitions in Fw/Types/BasicTypes available.
#ifdef __cplusplus
Expand Down
4 changes: 2 additions & 2 deletions FprimeZephyrReference/project/config/LoRaCfg.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
#include <zephyr/drivers/lora.h>
#include <Fw/FPrimeBasicTypes.hpp>
namespace LoRaConfig {
const U32 FREQUENCY = 437400000; //!< LoRa frequency in Hz
const U32 FREQUENCY = 437400000; //!< LoRa frequency in Hz
lora_signal_bandwidth BANDWIDTH = BW_125_KHZ; //!< LoRa bandwidth
const I8 TX_POWER = 14; //!< LoRa transmission power in dBm
const U16 PREAMBLE_LENGTH = 8; //!< LoRa preamble length
U8 HEADER[] = {0, 0, 0, 0}; //!< LoRa header (not used)
} // namespace LoRaConfig
#endif // LORA_CFG_HPP
#endif // LORA_CFG_HPP
3 changes: 2 additions & 1 deletion circuit-python-lora-passthrough/boot.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
import usb_cdc
usb_cdc.enable(console=True, data=True)

usb_cdc.enable(console=True, data=True)
4 changes: 3 additions & 1 deletion circuit-python-lora-passthrough/code.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
This code will forward any received LoRa packets to the serial console (sys.stdout). It cycles through neo pixel colors
to indicate packet reception.
"""

import time

import adafruit_rfm9x
import board
import digitalio
import adafruit_rfm9x
import usb_cdc

# Radio constants
Expand Down
Loading