Skip to content

Commit

Permalink
boards mtb4, psc, rfe, sg3, strain2: increased version for bootloader…
Browse files Browse the repository at this point in the history
… and updaterofbootloader

because they need a new release after the bug fix of constructor of  embot::prot::can::Frame
  • Loading branch information
marcoaccame committed Aug 18, 2020
1 parent 307734d commit 05fbf8d
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ constexpr std::uint8_t defADDRESS = 11;
constexpr embot::app::theCANboardInfo::bootloaderInfo btlInfo
{
embot::prot::can::Board::mtb4,
embot::prot::can::versionOfBOOTLOADER {1, 6},
embot::prot::can::versionOfBOOTLOADER {1, 7},
defADDRESS,
"I am a mtb4"
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static const embot::core::relTime BlinkSlowPeriod = 500*embot::core::time1millis
static ActivityParam activity_param = { .blinkingperiod = BlinkSlowPeriod };

// use build 222 for all the updaterofbootloader
static const embot::prot::can::versionOfAPPLICATION vAP = {1, 5 , 222};
static const embot::prot::can::versionOfAPPLICATION vAP = {1, 6 , 222};
static const embot::prot::can::versionOfCANPROTOCOL vCP = {2, 0};

static const std::uint32_t address = embot::hw::flash::getpartition(embot::hw::FLASH::application).address;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ constexpr std::uint8_t defADDRESS = 1;
constexpr embot::app::theCANboardInfo::bootloaderInfo btlInfo
{
embot::prot::can::Board::psc,
embot::prot::can::versionOfBOOTLOADER {1, 5},
embot::prot::can::versionOfBOOTLOADER {1, 6},
defADDRESS,
"I am a psc"
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ constexpr std::uint8_t defADDRESS = 1;
constexpr embot::app::theCANboardInfo::bootloaderInfo btlInfo
{
embot::prot::can::Board::rfe,
embot::prot::can::versionOfBOOTLOADER {1, 7},
embot::prot::can::versionOfBOOTLOADER {1, 8},
defADDRESS,
"I am a beautiful rfe"
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static ActivityParam activity_param = { .blinkingperiod = BlinkSlowPeriod };


// use build 222 for all the updaterofbootloader
static const embot::prot::can::versionOfAPPLICATION vAP = {1, 4 , 222};
static const embot::prot::can::versionOfAPPLICATION vAP = {1, 5 , 222};
static const embot::prot::can::versionOfCANPROTOCOL vCP = {2, 0};

static const std::uint32_t address = embot::hw::flash::getpartition(embot::hw::FLASH::application).address;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ constexpr std::uint8_t defADDRESS = 12;
constexpr embot::app::theCANboardInfo::bootloaderInfo btlInfo
{
embot::prot::can::Board::sg3,
embot::prot::can::versionOfBOOTLOADER {1, 5},
embot::prot::can::versionOfBOOTLOADER {1, 6},
defADDRESS,
"I am a sg3"
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ constexpr std::uint8_t defADDRESS = 13;
constexpr embot::app::theCANboardInfo::bootloaderInfo btlInfo
{
embot::prot::can::Board::strain2,
embot::prot::can::versionOfBOOTLOADER {2, 5},
embot::prot::can::versionOfBOOTLOADER {2, 6},
defADDRESS,
"I am a strain2"
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

constexpr embot::app::theCANboardInfo::applicationInfo appInfo
{
embot::prot::can::versionOfAPPLICATION {2, 6 , 222}, // keep build = 222 so that we recognise it
embot::prot::can::versionOfAPPLICATION {2, 7, 222}, // keep build = 222 so that we recognise it
embot::prot::can::versionOfCANPROTOCOL {2, 0}
};

Expand Down

0 comments on commit 05fbf8d

Please sign in to comment.