-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
added handle_mode() #10
Open
rvbnsk
wants to merge
5
commits into
master
Choose a base branch
from
modes
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,28 @@ | ||
#ifndef OBC_UTILS_HPP | ||
#define OBC_UTILS_HPP | ||
|
||
#include <Arduino.h> | ||
|
||
#include <type_traits> | ||
|
||
namespace utl { | ||
|
||
enum class Logger { Debug, Flight }; | ||
|
||
enum class Modes { Idle, Measurements, Experiment, Uplink }; | ||
|
||
template <typename Enum> | ||
constexpr auto to_underlying(Enum e) | ||
{ | ||
return static_cast<std::underlying_type_t<Enum>>(e); | ||
} | ||
|
||
void handle_mode(Modes mode); | ||
void handle_idle(); | ||
void handle_measurements(); | ||
void handle_experiment(); | ||
void handle_uplink(); | ||
|
||
} // namespace utl | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,23 @@ | ||
#include <Arduino.h> | ||
#include <IWatchdog.h> | ||
|
||
#include "accelerometer.hpp" | ||
#include "barometer.hpp" | ||
#include "gps.hpp" | ||
#include "logger.hpp" | ||
#include "devices.hpp" | ||
#include "utils.hpp" | ||
|
||
HardwareSerial Serial2{PA3, PA2}; | ||
constexpr auto baud_rate = 9600l; | ||
constexpr auto watchdog_interval = 10000000; | ||
|
||
Adafruit_GPS gps{&Serial2}; | ||
auto current_mode = utl::Modes::Measurements; | ||
|
||
void setup() | ||
{ | ||
// put your setup code here, to run once: | ||
Serial.begin(baud_rate); | ||
IWatchdog.begin(watchdog_interval); | ||
obc::init(); | ||
} | ||
|
||
void loop() | ||
{ | ||
// put your main code here, to run repeatedly: | ||
utl::handle_mode(current_mode); | ||
IWatchdog.reload(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
#include "utils.hpp" | ||
|
||
#include "accelerometer.hpp" | ||
#include "barometer.hpp" | ||
#include "buzzer.hpp" | ||
#include "devices.hpp" | ||
#include "gps.hpp" | ||
#include "logger.hpp" | ||
#include "lora.hpp" | ||
|
||
extern Adafruit_GPS gps; | ||
extern MMA8452Q accelerometer; | ||
extern BMP280 bmp; | ||
|
||
namespace utl { | ||
|
||
namespace { | ||
constexpr auto logs_interval = 2000; | ||
constexpr auto lora_interval = 60000; | ||
constexpr std::size_t buzzer_ind_fix_not_fetched = 1; | ||
|
||
uint32_t timer = millis(); | ||
uint32_t lora_timer = millis(); | ||
|
||
bool is_date_appended = false; | ||
|
||
} // namespace | ||
|
||
void handle_mode(Modes mode) | ||
{ | ||
switch (mode) { | ||
case Modes::Idle: | ||
return handle_idle(); | ||
case Modes::Measurements: | ||
return handle_measurements(); | ||
case Modes::Experiment: | ||
return handle_experiment(); | ||
case Modes::Uplink: | ||
return handle_uplink(); | ||
default: | ||
break; | ||
} | ||
} | ||
|
||
void handle_idle() {} | ||
|
||
void handle_measurements() | ||
{ | ||
if (obc::measure(gps).is_ok() and millis() - timer > logs_interval) { | ||
obc::Packet logs = {{}, {}, {}, {}, {}}; | ||
const auto acclr = obc::measure(accelerometer); | ||
const auto bmp_measurements = obc::measure(bmp); | ||
logs.time = obc::read_time(gps); | ||
logs.position = obc::read_position(gps); | ||
|
||
if (acclr.is_ok()) { logs.acclr_measurements = acclr.unwrap(); } | ||
if (bmp_measurements.is_ok()) { | ||
logs.bmp_measurements = bmp_measurements.unwrap(); | ||
} | ||
|
||
if (not is_date_appended) { | ||
obc::log_boot(obc::serialize(obc::read_date(gps))); | ||
is_date_appended = true; | ||
} | ||
|
||
obc::log_data(obc::serialize(logs)); | ||
|
||
if (millis() - lora_timer > lora_interval) { | ||
obc::send_packet(obc::lora_packet(logs)); | ||
lora_timer = millis(); | ||
} | ||
|
||
if (not logs.position.fix) { obc::buzzer(buzzer_ind_fix_not_fetched); } | ||
|
||
timer = millis(); | ||
} | ||
} | ||
|
||
void handle_experiment() {} | ||
|
||
void handle_uplink() {} | ||
|
||
} // namespace utl |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Czym różni się Measurements od Experiment? Chyba czuje, różnice, ale czy to oznacza, że gdy odpalimy eksperyment to nie wykonujemy pomiarów z samego obc? (w sensie, czy mode Measurements pokrywa się jakoś z Experiment zadaniami).
Ogólnie to szczegół, przy takiej implementacji chyba łatwo będzie zedytować te stany/zdefiniować nowe. O to chodziło.