This commit is contained in:
Edward Emelianov
2023-04-29 21:49:45 +03:00
parent 72ef5c9cc6
commit 9b0504944b
14 changed files with 993 additions and 15 deletions

View File

@@ -16,6 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "can.h"
#include "canproto.h"
#include "cmdproto.h"
#include "debug.h"
#include "hardware.h"
@@ -46,17 +48,40 @@ int main(void){
hw_setup();
usarts_setup();
USB_setup();
CAN_setup(100);
USBPU_ON();
CAN_message *can_mesg;
uint32_t ctr = Tms;
while(1){
IWDG->KR = IWDG_REFRESH;
if(Tms - ctr > 499){
ctr = Tms;
pin_toggle(GPIOB, 1 << 1 | 1 << 0); // toggle LED @ PB0
USB_sendstr(CMD_IDX, "1");
//USB_sendstr(CMD_IDX, "1");
//DBGmesg(u2str(Tms));
//DBGnl();
}
can_proc();
if(CAN_get_status() == CAN_FIFO_OVERRUN){
USB_sendstr(CAN_IDX, "CAN bus fifo overrun occured!\n");
}
while((can_mesg = CAN_messagebuf_pop())){
if(isgood(can_mesg->ID)){
if(ShowMsgs){ // display message content
IWDG->KR = IWDG_REFRESH;
uint8_t len = can_mesg->length;
USB_sendstr(CAN_IDX, u2str(Tms));
USB_sendstr(CAN_IDX, " #");
USB_sendstr(CAN_IDX, uhex2str(can_mesg->ID));
for(uint8_t i = 0; i < len; ++i){
USB_putbyte(CAN_IDX, ' ');
USB_sendstr(CAN_IDX, uhex2str(can_mesg->data[i]));
}
USB_putbyte(CAN_IDX, '\n');
}
}
}
for(int i = 0; i < MAX_IDX; ++i){
int l = USB_receivestr(i, inbuff, MAXSTRLEN);
if(l < 0){
@@ -73,6 +98,9 @@ int main(void){
case CMD_IDX:
parse_cmd(inbuff);
break;
case CAN_IDX:
cmd_parser(inbuff);
break;
default:
break;
}