1 Commits
Author SHA1 Message Date
pgsocks 507ec8ba59 Add issue template 2023-04-20 23:59:40 -05:00
12 changed files with 69 additions and 229 deletions
+59
View File
@@ -0,0 +1,59 @@
name: Bug Report
about: File a bug report
title: "[Bug]: "
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to fill out this bug report!
- type: input
id: contact
attributes:
label: Contact Details
description: How can we get in touch with you if we need more info?
placeholder: ex. email@example.com
validations:
required: false
- type: textarea
id: what-happened
attributes:
label: What happened?
description: Also tell us, what did you expect to happen?
placeholder: Tell us what you see!
value: "A bug happened!"
validations:
required: true
- type: dropdown
id: version
attributes:
label: Version
description: What version of our software are you running?
options:
- 1.0.2 (Default)
- 1.0.3 (Edge)
validations:
required: true
- type: dropdown
id: browsers
attributes:
label: What browsers are you seeing the problem on?
multiple: true
options:
- Firefox
- Chrome
- Safari
- Microsoft Edge
- type: textarea
id: logs
attributes:
label: Relevant log output
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: shell
- type: checkboxes
id: terms
attributes:
label: Code of Conduct
description: By submitting this issue, you agree to follow our [Code of Conduct](https://example.com)
options:
- label: I agree to follow this project's Code of Conduct
required: true
+8 -15
View File
@@ -16,8 +16,6 @@ add_library(robomaster
src/modules/sdk.c src/modules/sdk.c
src/modules/chassis.c src/modules/chassis.c
src/modules/gimbal.c src/modules/gimbal.c
src/modules/blaster.c
src/modules/camera.c
src/connection.c src/connection.c
src/robomaster.c src/robomaster.c
src/robo.c src/robo.c
@@ -30,19 +28,14 @@ target_include_directories(robomaster
include include
) )
include(FetchContent) find_package(SDL2)
FetchContent_Declare (
SDL2
GIT_REPOSITORY https://github.com/libsdl-org/SDL
GIT_TAG release-2.0.20
GIT_SHALLOW TRUE
)
FetchContent_MakeAvailable(SDL2)
add_executable(robomasterapp if(SDL2_FOUND)
add_executable(robomasterapp
src/sdl.c src/sdl.c
) )
target_link_libraries(robomasterapp target_link_libraries(robomasterapp
robomaster robomaster
SDL2-static SDL2::SDL2-static
) )
endif()
-33
View File
@@ -1,33 +0,0 @@
#pragma once
#include "message.h"
#include <stdbool.h>
#include <stdint.h>
static const uint8_t BLASTER_HOST = 23;
static const uint8_t BLASTER_INDEX = 0;
#define BLASTER_FIRE_CMD 0x513F
enum FIRETYPE {
FIRETYPE_WATER = 0,
FIRETYPE_INFRARED = 1
};
enum FIRETIMES {
ONE = 1,
TWO = 2,
THREE = 3,
FOUR = 4,
FIVE = 5
};
void
blaster_fire (
union Request* req,
uint16_t seq,
bool ack,
enum FIRETYPE type,
enum FIRETIMES times );
-40
View File
@@ -1,40 +0,0 @@
#pragma once
#include "message.h"
#include <stdbool.h>
#include <stdint.h>
static const uint8_t STREAM_HOST = 1;
static const uint8_t STREAM_INDEX = 0;
#define STREAM_CTRL_CMD 0xD23F
#define VIDEO_STREAM_PORT 40921
enum STREAMSTATE {
STREAMSTATE_OFF = 0,
STREAMSTATE_ON = 1
};
enum STREAMRESOLUTION {
RES_720P = 0,
RES_360P = 1,
RES_540P = 2
};
enum STREAMCTRL {
STREAMCTRL_SDK = 1,
STREAMCTRL_VIDEO = 2,
STREAMCTRL_AUDIO = 3
};
void
stream_ctrl (
union Request* req,
uint16_t seq,
bool ack,
enum STREAMSTATE state,
enum STREAMRESOLUTION res,
enum STREAMCTRL ctrl );
-36
View File
@@ -248,38 +248,6 @@ struct PACKED SetSdkConnectionResp {
struct Footer footer; struct Footer footer;
}; };
struct PACKED BlasterFireReq {
struct Header header;
struct {
uint8_t type : 4;
uint8_t times : 4;
};
struct Footer footer;
};
struct PACKED BlasterFireResp {
struct Header header;
uint8_t retcode;
struct Footer footer;
};
struct PACKED StreamCtrlReq {
struct Header header;
uint8_t ctrl;
struct {
uint8_t state : 4;
uint8_t conn_type : 4;
};
uint8_t resolution;
struct Footer footer;
};
struct PACKED StreamCtrlResp {
struct Header header;
uint8_t retcode;
struct Footer footer;
};
union Request { union Request {
struct Header header; struct Header header;
struct SetSdkConnectionReq sdkconn; struct SetSdkConnectionReq sdkconn;
@@ -293,8 +261,6 @@ union Request {
struct SubNodeResetReq subnodereset; struct SubNodeResetReq subnodereset;
struct SubscribeAddNodeReq subnodeadd; struct SubscribeAddNodeReq subnodeadd;
struct GimbalCtrlSpeedReq gimbspeed; struct GimbalCtrlSpeedReq gimbspeed;
struct BlasterFireReq blaster;
struct StreamCtrlReq stream;
}; };
union Response { union Response {
struct Header header; struct Header header;
@@ -309,8 +275,6 @@ union Response {
struct SubNodeResetResp subnodereset; struct SubNodeResetResp subnodereset;
struct SubscribeAddNodeResp subnodeadd; struct SubscribeAddNodeResp subnodeadd;
struct GimbalCtrlSpeedResp gimbspeed; struct GimbalCtrlSpeedResp gimbspeed;
struct BlasterFireResp blaster;
struct StreamCtrlResp stream;
}; };
union Message { union Message {
struct Header header; struct Header header;
-6
View File
@@ -1,7 +1,5 @@
#pragma once #pragma once
#include <stdbool.h>
// Handle for the high level robot interface // Handle for the high level robot interface
struct RobotImp; struct RobotImp;
typedef struct RobotImp* Robot; typedef struct RobotImp* Robot;
@@ -67,10 +65,6 @@ int robot_drive(Robot, float x, float y, float r);
*/ */
int robot_led(Robot, unsigned char r, unsigned char g, unsigned char b); int robot_led(Robot, unsigned char r, unsigned char g, unsigned char b);
int robot_blast(Robot);
int robot_stream(Robot, bool);
/* /*
* If the robot is in ready mode, this makes the robot send a heartbeat in * If the robot is in ready mode, this makes the robot send a heartbeat in
* the next tick of the work function. The work function will not do anything * the next tick of the work function. The work function will not do anything
-2
View File
@@ -8,8 +8,6 @@ typedef struct Client* Client;
#include "chassis.h" #include "chassis.h"
#include "sdk.h" #include "sdk.h"
#include "gimbal.h" #include "gimbal.h"
#include "blaster.h"
#include "camera.h"
Client client_new(); Client client_new();
void client_connect(Client client); void client_connect(Client client);
-8
View File
@@ -37,10 +37,6 @@ message_length(int cmd) {
return sizeof(struct ChassisSpeedModeReq); return sizeof(struct ChassisSpeedModeReq);
case GIMBAL_CTRL_SPEED_CMD: case GIMBAL_CTRL_SPEED_CMD:
return sizeof(struct GimbalCtrlSpeedReq); return sizeof(struct GimbalCtrlSpeedReq);
case BLASTER_FIRE_CMD:
return sizeof(struct BlasterFireReq);
case STREAM_CTRL_CMD:
return sizeof(struct StreamCtrlReq);
default: default:
return 0; return 0;
} }
@@ -64,10 +60,6 @@ message_module(int cmd) {
return host2byte(CHASSIS_HOST, CHASSIS_INDEX); return host2byte(CHASSIS_HOST, CHASSIS_INDEX);
case GIMBAL_CTRL_SPEED_CMD: case GIMBAL_CTRL_SPEED_CMD:
return host2byte(GIMBAL_HOST, GIMBAL_INDEX); return host2byte(GIMBAL_HOST, GIMBAL_INDEX);
case BLASTER_FIRE_CMD:
return host2byte(BLASTER_HOST, BLASTER_INDEX);
case STREAM_CTRL_CMD:
return host2byte(STREAM_HOST, STREAM_INDEX);
default: default:
return 0; return 0;
} }
-16
View File
@@ -1,16 +0,0 @@
#include "message.h"
#include "connection.h"
#include "robomaster.h"
void
blaster_fire (
union Request* req,
uint16_t seq,
bool ack,
enum FIRETYPE type,
enum FIRETIMES times ) {
req->blaster.type = type;
req->blaster.times = times;
req_finalize(seq, BLASTER_FIRE_CMD, ack, req);
}
-20
View File
@@ -1,20 +0,0 @@
#include "message.h"
#include "connection.h"
#include "robomaster.h"
void
stream_ctrl (
union Request* req,
uint16_t seq,
bool ack,
enum STREAMSTATE state,
enum STREAMRESOLUTION res,
enum STREAMCTRL ctrl ) {
req->stream.state = state;
req->stream.resolution = res;
req->stream.ctrl = ctrl;
req->stream.conn_type = 0; // Hardcode to WiFi
req_finalize(seq, STREAM_CTRL_CMD, ack, req);
}
-46
View File
@@ -5,8 +5,6 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h>
struct RobotImp { struct RobotImp {
struct Client* client; struct Client* client;
@@ -21,11 +19,6 @@ struct RobotImp {
int16_t gimbal[2]; int16_t gimbal[2];
bool dirty_gimbal; bool dirty_gimbal;
bool dirty_blaster;
bool stream_state;
bool dirty_stream;
bool sdk_mode; bool sdk_mode;
enum { enum {
@@ -44,19 +37,6 @@ struct RobotImp {
}; };
int
robot_stream(Robot robot, bool state) {
robot->stream_state = state;
robot->dirty_stream = true;
return 1;
}
int
robot_blast(Robot robot) {
robot->dirty_blaster = true;
return 1;
}
int int
robot_drive(Robot robot, float x, float y, float r) { robot_drive(Robot robot, float x, float y, float r) {
// TODO: move individual wheel speed calculation to work function // TODO: move individual wheel speed calculation to work function
@@ -205,32 +185,6 @@ robot_work(Robot robot) {
req_send(robot->client->dev_conn, &req); req_send(robot->client->dev_conn, &req);
robot->dirty_colors = false; robot->dirty_colors = false;
} }
if(robot->dirty_blaster) {
blaster_fire (
&req, robot->seq++, false,
FIRETYPE_INFRARED,
ONE
);
req_send(robot->client->dev_conn, &req);
robot->dirty_blaster = false;
}
if(robot->dirty_stream) {
stream_ctrl (
&req, robot->seq++, true,
robot->stream_state ? STREAMSTATE_ON : STREAMSTATE_OFF,
RES_720P,
STREAMCTRL_SDK
);
req_send(robot->client->dev_conn, &req);
stream_ctrl (
&req, robot->seq++, true,
robot->stream_state ? STREAMSTATE_ON : STREAMSTATE_OFF,
RES_720P,
STREAMCTRL_VIDEO
);
req_send(robot->client->dev_conn, &req);
robot->dirty_stream = false;
}
break; break;
} }
-5
View File
@@ -51,8 +51,6 @@ int main(int argc, char* argv[]) {
Robot robot = robot_new(); Robot robot = robot_new();
robot_init(robot); robot_init(robot);
robot_stream(robot, true);
SDL_AddTimer(75, drive_timer_handler, robot); SDL_AddTimer(75, drive_timer_handler, robot);
SDL_AddTimer(1000, heartbeat_timer_handler, robot); SDL_AddTimer(1000, heartbeat_timer_handler, robot);
@@ -92,9 +90,6 @@ int main(int argc, char* argv[]) {
robot_led(robot, colors[color].r, colors[color].g, colors[color].b); robot_led(robot, colors[color].r, colors[color].g, colors[color].b);
color = (color + 1) % 3; color = (color + 1) % 3;
break; break;
case SDL_SCANCODE_RETURN:
robot_blast(robot);
break;
default: break; default: break;
} }
break; break;