v/maiana
1
0
Fork 0
mirror of https://github.com/peterantypas/maiana.git synced 2025-05-15 23:10:11 -07:00
Code Issues Projects Releases Wiki Activity

Minor cleanup

Browse Source
This commit is contained in:
Peter Antypas 2021-10-05 09:22:26 -07:00
parent a4f3add396
commit e5ae159160
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
latest/Firmware/Transponder/.cproject
View File

@ -395,7 +395,7 @@
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.cmodel.1509126439" name="Code model" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.cmodel" useByScannerDiscovery="false"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.cmodel.1509126439" name="Code model" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.cmodel" useByScannerDiscovery="false"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.strictalign.1780461562" name="Strict align (-mstrict-align)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.strictalign" useByScannerDiscovery="false"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.strictalign.1780461562" name="Strict align (-mstrict-align)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.aarch64.target.strictalign" useByScannerDiscovery="false"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.target.other.62669525" name="Other target flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.target.other" useByScannerDiscovery="true"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.target.other.62669525" name="Other target flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.target.other" useByScannerDiscovery="true"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.291797784" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level" useByScannerDiscovery="true" value="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.size" valueType="enumerated"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.291797784" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level" useByScannerDiscovery="true" value="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.more" valueType="enumerated"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength.38831632" name="Message length (-fmessage-length=0)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength" useByScannerDiscovery="true" value="true" valueType="boolean"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength.38831632" name="Message length (-fmessage-length=0)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength" useByScannerDiscovery="true" value="true" valueType="boolean"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar.380105278" name="'char' is signed (-fsigned-char)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar" useByScannerDiscovery="true" value="true" valueType="boolean"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar.380105278" name="'char' is signed (-fsigned-char)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar" useByScannerDiscovery="true" value="true" valueType="boolean"/>
<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections.1152788861" name="Function sections (-ffunction-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections" useByScannerDiscovery="true" value="true" valueType="boolean"/> <option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections.1152788861" name="Function sections (-ffunction-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections" useByScannerDiscovery="true" value="true" valueType="boolean"/>

4
latest/Firmware/Transponder/Inc/TXScheduler.hpp
View File

@ -36,8 +36,8 @@ private:
time_t mUTC; time_t mUTC;
time_t mLast18Time; time_t mLast18Time;
time_t mLast24Time; time_t mLast24Time;
float mAvgSpeed; float mAvgSpeed = 0.0f;
StationData mStationData; StationData mStationData = {0};
GPSFix mLastGPSFix; GPSFix mLastGPSFix;
}; };

4
latest/Firmware/Transponder/Src/RadioManager.cpp
View File

@ -59,14 +59,12 @@ void RadioManager::init()
TRX_IC_CLK_PORT, TRX_IC_CLK_PIN, 0); TRX_IC_CLK_PORT, TRX_IC_CLK_PIN, 0);
mTransceiverIC->init(); mTransceiverIC->init();
#ifndef TX_TEST_MODE
//DBG("Initializing RF IC 2\r\n"); //DBG("Initializing RF IC 2\r\n");
mReceiverIC = new Receiver(SDN2_PORT, SDN2_PIN, mReceiverIC = new Receiver(SDN2_PORT, SDN2_PIN,
CS2_PORT, CS2_PIN, CS2_PORT, CS2_PIN,
RX_IC_DATA_PORT, RX_IC_DATA_PIN, RX_IC_DATA_PORT, RX_IC_DATA_PIN,
RX_IC_CLK_PORT, RX_IC_CLK_PIN, 1); RX_IC_CLK_PORT, RX_IC_CLK_PIN, 1);
mReceiverIC->init(); mReceiverIC->init();
#endif
mInitializing = false; mInitializing = false;
//DBG("Radio ICs initialized\r\n"); //DBG("Radio ICs initialized\r\n");
@ -170,10 +168,8 @@ void RadioManager::timeSlotStarted(uint32_t slotNumber)
if ( mInitializing ) if ( mInitializing )
return; return;
#ifndef TX_TEST_MODE
mTransceiverIC->timeSlotStarted(slotNumber); mTransceiverIC->timeSlotStarted(slotNumber);
mReceiverIC->timeSlotStarted(slotNumber); mReceiverIC->timeSlotStarted(slotNumber);
#endif
} }
void RadioManager::scheduleTransmission(TXPacket *packet) void RadioManager::scheduleTransmission(TXPacket *packet)

12
latest/Firmware/Transponder/Src/TXScheduler.cpp
View File

@ -49,6 +49,10 @@ TXScheduler::TXScheduler ()
mAvgSpeed = 0.0; mAvgSpeed = 0.0;
mLast18Time = 0; mLast18Time = 0;
mLast24Time = 0; mLast24Time = 0;
}
void TXScheduler::init()
{
if ( Configuration::instance().readStationData(mStationData) ) if ( Configuration::instance().readStationData(mStationData) )
{ {
DBG("Successfully loaded Station Data \r\n"); DBG("Successfully loaded Station Data \r\n");
@ -59,10 +63,6 @@ TXScheduler::TXScheduler ()
} }
} }
void TXScheduler::init()
{
}
TXScheduler::~TXScheduler () TXScheduler::~TXScheduler ()
{ {
} }
@ -84,10 +84,6 @@ void TXScheduler::processEvent(const Event &e)
if ( !RadioManager::instance().initialized() || mUTC == 0 ) if ( !RadioManager::instance().initialized() || mUTC == 0 )
return; return;
#if TX_TEST_MODE
return;
#endif
if ( bsp_is_tx_disabled() ) if ( bsp_is_tx_disabled() )
return; return;