Skip to content

Commit

Permalink
Some fixes after running the code
Browse files Browse the repository at this point in the history
  • Loading branch information
@avtoku
avtoku committed Nov 14, 2024
1 parent 70f37f7 commit 6a7754a
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 41 deletions.
4 changes: 1 addition & 3 deletions common/Varmint.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,6 @@ bool Varmint::imu_read(rosflight_firmware::ImuStruct * imu)
}
return false;
}
void Varmint::imu_not_responding_error(){};
// Do nothing for now

///////////////////////////////////////////////////////////////////////////////////////////////
// MAG
Expand Down Expand Up @@ -261,12 +259,12 @@ bool Varmint::gnss_read(rosflight_firmware::GnssStruct * gnss)
gnss->time = mktime(&tm);
gnss->t_acc = p.pvt.tAcc;
gnss->time_of_week = p.pvt.iTOW;
gnss->year = p.pvt.year;
gnss->month = p.pvt.month;
gnss->day = p.pvt.day;
gnss->hour = p.pvt.hour;
gnss->min = p.pvt.min;
gnss->sec = p.pvt.sec;
gnss->sec = p.pvt.sec;
gnss->nano = p.pvt.nano;
gnss->lon = p.pvt.lon;
gnss->lat = p.pvt.lat;
Expand Down
3 changes: 0 additions & 3 deletions common/Varmint.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,6 @@ class Varmint : public rosflight_firmware::Board

bool imu_read(rosflight_firmware::ImuStruct * imu) override;

void imu_not_responding_error() override;

bool mag_read(rosflight_firmware::MagStruct * mag) override;

bool baro_read(rosflight_firmware::PressureStruct * baro) override;
Expand All @@ -128,7 +126,6 @@ class Varmint : public rosflight_firmware::Board

// Battery
bool battery_read(rosflight_firmware::BatteryStruct * bat) override;
//bool battery_present() override;
void battery_voltage_set_multiplier(double multiplier) override;
void battery_current_set_multiplier(double multiplier) override;

Expand Down
6 changes: 1 addition & 5 deletions common/drivers/Ubx.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ void Ubx::endDma(void)
ubx_.timestamp = time64.Us(); // usTime();

ubx_.drdy = drdy_;
if (!hasPps_) ubx_.pps = ubx_.drdy - 25000; // fake number if we don't have PPS hooked up
if (!hasPps_) ubx_.pps = 0; //ubx_.drdy - 25000; // fake number if we don't have PPS hooked up

if (ubx_.pps > ubx_.drdy) ubx_.pps -= 1000000 / sampleRateHz_;
ubx_.groupDelay = ubx_.drdy - ubx_.pps;
Expand Down Expand Up @@ -338,10 +338,6 @@ bool Ubx::parseByte(uint8_t c, UbxFrame * p)

void Ubx::pps(uint64_t pps_timestamp)
{
// gotPvt_ = false;
// gotTime_ = false;
// gotEcefP_ = false;
// gotEcefV_ = false;
ubx_.pps = pps_timestamp;
}

Expand Down
30 changes: 0 additions & 30 deletions varmint_10X/.cproject
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,36 +124,6 @@
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1921695953" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec"/>
</toolChain>
</folderInfo>
<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.895396389.1932006922" name="/" resourcePath="links/comms/packie">
<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.2060015264" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug" unusedChildren="">
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.889194610.773452259" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.889194610"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.403083994.1948823283" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.403083994"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.505078897.306242930" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.505078897"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu.2027088833.662109451" name="Floating-point unit" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu.2027088833"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.196682567.736746820" name="Floating-point ABI" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.196682567"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1174525859.634524738" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1174525859"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.550668707.2145970056" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.550668707"/>
<option id="com.st.stm32cube.ide.mcu.debug.option.cpuclock.1182549393.1630615233" name="Cpu clock frequence" superClass="com.st.stm32cube.ide.mcu.debug.option.cpuclock.1182549393"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoprintffloat.1975208151.2024451254" name="Use float with printf from newlib-nano (-u _printf_float)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoprintffloat.1975208151"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoscanffloat.1446551301.144368842" name="Use float with scanf from newlib-nano (-u _scanf_float)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.nanoscanffloat.1446551301"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.runtimelibrary_cpp.377279684.248780583" name="Runtime library" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.runtimelibrary_cpp.377279684"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.convertbinary.905623466.1368511944" name="Convert to binary file (-O binary)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.convertbinary.905623466"/>
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.1876135463.17408004" name="Convert to Intel Hex file (-O ihex)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.converthex.1876135463"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1957605823" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.182254707"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1194642059" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.105592659"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.255560758" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.918052851"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1128290330" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1081482762"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1775426997" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1386905836"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1775127457" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.1678397585"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1114150454" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.1969892518"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.175843899" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.1910897882"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.87958141" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.1693850229"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1213244028" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.181015774"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.137829759" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.990118495"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.464944621" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1275559465"/>
<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1598297057" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1921695953"/>
</toolChain>
</folderInfo>
<fileInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.895396389.1257505087" name="main.h" rcbsApplicability="disable" resourcePath="Core/Inc/main.h" toolsToInvoke=""/>
<sourceEntries>
<entry excluding="Inc/main.h" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
Expand Down

0 comments on commit 6a7754a

Please sign in to comment.