Skip to content

Commit

Permalink
amcbldc (v2.0.11) + amc2c (v3.0.1.0)
Browse files Browse the repository at this point in the history 
- update codegen w/ changes did in robotology/icub-firmware-models#83
  • Loading branch information
@sgiraz
sgiraz committed Mar 6, 2024
1 parent f808c28 commit 65bc53b
Show file tree
Hide file tree
Showing 42 changed files with 77 additions and 68 deletions.
4 changes: 2 additions & 2 deletions ...Bcode/arch-arm/board/amc2c/application/src/app-board-amc2c/embot_app_board_amc2c_info.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ namespace embot::app::board::amc2c::info {
{
embot::app::boards::Board::amc2c,
{embot::app::msg::BUS::icc1, address},
{3, 0, 0, 0}, // application version
{3, 0, 1, 0}, // application version
{2, 0}, // protocol version
{2024, embot::app::eth::Month::Mar, embot::app::eth::Day::one, 17, 17}
{2024, embot::app::eth::Month::Mar, embot::app::eth::Day::six, 16, 45}
};

constexpr embot::app::msg::Location icclocation {signature.location};
Expand Down
2 changes: 1 addition & 1 deletion ...arch-arm/board/amcbldc/application/src/app-board-amcbldc/embot_app_board_amcbldc_info.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace embot::app::board::amcbldc::info {

constexpr embot::prot::can::applicationInfo applInfo
{
embot::prot::can::versionOfAPPLICATION {2, 0, 10},
embot::prot::can::versionOfAPPLICATION {2, 0, 11},
embot::prot::can::versionOfCANPROTOCOL {2, 0}
};

Expand Down
4 changes: 2 additions & 2 deletions emBODY/eBcode/arch-arm/mbd/amcbldc/amc-bldc/AMC_BLDC.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
//
// Code generated for Simulink model 'AMC_BLDC'.
//
// Model version : 7.13
// Model version : 7.12
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:55:25 2024
// C/C++ source code generated on : Wed Mar 6 15:01:21 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
4 changes: 2 additions & 2 deletions emBODY/eBcode/arch-arm/mbd/amcbldc/amc-bldc/AMC_BLDC.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
//
// Code generated for Simulink model 'AMC_BLDC'.
//
// Model version : 7.13
// Model version : 7.12
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:55:25 2024
// C/C++ source code generated on : Wed Mar 6 15:01:21 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
4 changes: 2 additions & 2 deletions emBODY/eBcode/arch-arm/mbd/amcbldc/amc-bldc/AMC_BLDC_private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
//
// Code generated for Simulink model 'AMC_BLDC'.
//
// Model version : 7.13
// Model version : 7.12
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:55:25 2024
// C/C++ source code generated on : Wed Mar 6 15:01:21 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
5 changes: 3 additions & 2 deletions emBODY/eBcode/arch-arm/mbd/amcbldc/amc-bldc/AMC_BLDC_types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
//
// Code generated for Simulink model 'AMC_BLDC'.
//
// Model version : 7.13
// Model version : 7.12
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:55:25 2024
// C/C++ source code generated on : Wed Mar 6 15:01:21 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down Expand Up @@ -115,6 +115,7 @@ struct Flags
ControlModes control_mode;
boolean_T enable_sending_msg_status;
boolean_T fault_button;
boolean_T overcurrent;
boolean_T enable_thermal_protection;
};

Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/can-decoder/can_decoder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.3
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:24 2024
// C/C++ source code generated on : Wed Mar 6 15:00:25 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/can-decoder/can_decoder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.3
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:24 2024
// C/C++ source code generated on : Wed Mar 6 15:00:25 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/can-decoder/can_decoder_private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.3
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:24 2024
// C/C++ source code generated on : Wed Mar 6 15:00:25 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/can-decoder/can_decoder_types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.3
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:24 2024
// C/C++ source code generated on : Wed Mar 6 15:00:25 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
15 changes: 11 additions & 4 deletions emBODY/eBcode/arch-arm/mbd/amcbldc/can-encoder/can_encoder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
//
// Code generated for Simulink model 'can_encoder'.
//
// Model version : 6.3
// Model version : 6.9
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:30 2024
// C/C++ source code generated on : Wed Mar 6 15:00:31 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down Expand Up @@ -93,8 +93,15 @@ void can_encoder(const BUS_MESSAGES_TX *rtu_messages_tx, const BUS_STATUS_TX
sizeof(uint8_T));
rtb_BusCreator_m.packet.PAYLOAD[2] = tmp2[0];
rtb_BusCreator_m.packet.PAYLOAD[3] = tmp2[1];
rtb_BusCreator_m.packet.PAYLOAD[4] =
rtu_messages_tx->status.flags.ExternalFaultAsserted;
if (rtu_messages_tx->status.flags.OverCurrentFailure) {
rtb_BusCreator_m.packet.PAYLOAD[4] = static_cast<uint8_T>
(static_cast<int32_T>(rtu_messages_tx->status.flags.ExternalFaultAsserted)
| 8);
} else {
rtb_BusCreator_m.packet.PAYLOAD[4] =
rtu_messages_tx->status.flags.ExternalFaultAsserted;
}

rtb_BusCreator_m.packet.PAYLOAD[5] = 0U;
rtb_BusCreator_m.packet.PAYLOAD[6] = 0U;
rtb_BusCreator_m.packet.PAYLOAD[7] = 0U;
Expand Down
4 changes: 2 additions & 2 deletions emBODY/eBcode/arch-arm/mbd/amcbldc/can-encoder/can_encoder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
//
// Code generated for Simulink model 'can_encoder'.
//
// Model version : 6.3
// Model version : 6.9
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:30 2024
// C/C++ source code generated on : Wed Mar 6 15:00:31 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
4 changes: 2 additions & 2 deletions emBODY/eBcode/arch-arm/mbd/amcbldc/can-encoder/can_encoder_private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
//
// Code generated for Simulink model 'can_encoder'.
//
// Model version : 6.3
// Model version : 6.9
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:30 2024
// C/C++ source code generated on : Wed Mar 6 15:00:31 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
4 changes: 2 additions & 2 deletions emBODY/eBcode/arch-arm/mbd/amcbldc/can-encoder/can_encoder_types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
//
// Code generated for Simulink model 'can_encoder'.
//
// Model version : 6.3
// Model version : 6.9
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:30 2024
// C/C++ source code generated on : Wed Mar 6 15:00:31 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/control-foc/FOCInnerLoop.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.18
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:36 2024
// C/C++ source code generated on : Wed Mar 6 15:00:37 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/control-foc/FOCInnerLoop.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.18
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:36 2024
// C/C++ source code generated on : Wed Mar 6 15:00:37 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/control-foc/control_foc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.18
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:36 2024
// C/C++ source code generated on : Wed Mar 6 15:00:37 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/control-foc/control_foc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.18
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:36 2024
// C/C++ source code generated on : Wed Mar 6 15:00:37 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/control-foc/control_foc_data.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.18
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:36 2024
// C/C++ source code generated on : Wed Mar 6 15:00:37 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/control-foc/control_foc_private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.18
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:36 2024
// C/C++ source code generated on : Wed Mar 6 15:00:37 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
3 changes: 2 additions & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/control-foc/control_foc_types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.18
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:36 2024
// C/C++ source code generated on : Wed Mar 6 15:00:37 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down Expand Up @@ -100,6 +100,7 @@ struct Flags
ControlModes control_mode;
boolean_T enable_sending_msg_status;
boolean_T fault_button;
boolean_T overcurrent;
boolean_T enable_thermal_protection;
};

Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/control-outer/control_outer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.3
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:43 2024
// C/C++ source code generated on : Wed Mar 6 15:00:43 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/control-outer/control_outer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.3
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:43 2024
// C/C++ source code generated on : Wed Mar 6 15:00:43 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/control-outer/control_outer_private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.3
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:43 2024
// C/C++ source code generated on : Wed Mar 6 15:00:43 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
3 changes: 2 additions & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/control-outer/control_outer_types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.3
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:43 2024
// C/C++ source code generated on : Wed Mar 6 15:00:43 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down Expand Up @@ -45,6 +45,7 @@ struct Flags
ControlModes control_mode;
boolean_T enable_sending_msg_status;
boolean_T fault_button;
boolean_T overcurrent;
boolean_T enable_thermal_protection;
};

Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/estimator/estimation_velocity.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.4
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:57 2024
// C/C++ source code generated on : Wed Mar 6 15:00:56 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/estimator/estimation_velocity.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.4
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:57 2024
// C/C++ source code generated on : Wed Mar 6 15:00:56 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/estimator/estimation_velocity_private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.4
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:57 2024
// C/C++ source code generated on : Wed Mar 6 15:00:56 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/estimator/estimation_velocity_types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.4
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:54:57 2024
// C/C++ source code generated on : Wed Mar 6 15:00:56 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/filter-current/filter_current.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.3
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:55:05 2024
// C/C++ source code generated on : Wed Mar 6 15:01:04 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/filter-current/filter_current.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.3
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:55:05 2024
// C/C++ source code generated on : Wed Mar 6 15:01:04 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/filter-current/filter_current_private.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.3
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:55:05 2024
// C/C++ source code generated on : Wed Mar 6 15:01:04 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
2 changes: 1 addition & 1 deletion emBODY/eBcode/arch-arm/mbd/amcbldc/filter-current/filter_current_types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// Model version : 6.3
// Simulink Coder version : 23.2 (R2023b) 01-Aug-2023
// C/C++ source code generated on : Tue Feb 13 11:55:05 2024
// C/C++ source code generated on : Wed Mar 6 15:01:04 2024
//
// Target selection: ert.tlc
// Embedded hardware selection: ARM Compatible->ARM Cortex-M
Expand Down
Loading

0 comments on commit 65bc53b

Please sign in to comment.