Fix indentation
This commit is contained in:
parent
563a019d33
commit
5bd8e841fb
GPG key ID:
511C112F1331BBB4
1 changed files with 137 additions and 137 deletions
|
|
@ -35,8 +35,8 @@
|
|||
#define CAN_RECESSIVE 1
|
||||
|
||||
struct module {
|
||||
uint8_t id;
|
||||
uint8_t type;
|
||||
uint8_t id;
|
||||
uint8_t type;
|
||||
};
|
||||
|
||||
MCP2515 mcp2515(10);
|
||||
|
|
@ -62,7 +62,7 @@ void setup() {
|
|||
mcp2515.setBitrate(CAN_50KBPS);
|
||||
mcp2515.setNormalMode();
|
||||
|
||||
game_running = 0;
|
||||
game_running = 0;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -81,202 +81,202 @@ uint16_t make_id(uint8_t id, bool priority, uint8_t type) {
|
|||
|
||||
|
||||
struct module get_module_info(uint16_t can_id) {
|
||||
uint8_t module_type = can_id & 0x0300;
|
||||
uint8_t module_id = can_id & 0x00FF;
|
||||
uint8_t module_type = can_id & 0x0300;
|
||||
uint8_t module_id = can_id & 0x00FF;
|
||||
|
||||
struct module module_info;
|
||||
module_info.type = module_type;
|
||||
module_info.id = module_id;
|
||||
return module_info;
|
||||
struct module module_info;
|
||||
module_info.type = module_type;
|
||||
module_info.id = module_id;
|
||||
return module_info;
|
||||
}
|
||||
|
||||
|
||||
uint8_t check_solved() {
|
||||
uint8_t solved = 1;
|
||||
for (int i; i<32; i++) {
|
||||
if (unsolved_puzzles != 0) {
|
||||
solved = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return solved;
|
||||
uint8_t solved = 1;
|
||||
for (int i; i<32; i++) {
|
||||
if (unsolved_puzzles != 0) {
|
||||
solved = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return solved;
|
||||
}
|
||||
|
||||
|
||||
void add_module_to_bit_vector(uint8_t module_id) {
|
||||
uint8_t byte_index = module_id >> 3;
|
||||
uint8_t bit_index = module_id & 0x07;
|
||||
unsolved_puzzles[byte_index] |= 0x1 << bit_index;
|
||||
uint8_t byte_index = module_id >> 3;
|
||||
uint8_t bit_index = module_id & 0x07;
|
||||
unsolved_puzzles[byte_index] |= 0x1 << bit_index;
|
||||
}
|
||||
|
||||
|
||||
void solve_module_in_bit_vector(uint8_t module_id) {
|
||||
uint8_t byte_index = module_id >> 3;
|
||||
uint8_t bit_index = module_id & 0x07;
|
||||
unsolved_puzzles[byte_index] &= ~(0x1 << bit_index);
|
||||
uint8_t byte_index = module_id >> 3;
|
||||
uint8_t bit_index = module_id & 0x07;
|
||||
unsolved_puzzles[byte_index] &= ~(0x1 << bit_index);
|
||||
}
|
||||
|
||||
|
||||
void send_message(uint8_t* message, uint8_t length) {
|
||||
struct can_frame send_frame;
|
||||
|
||||
send_frame.can_id = make_id(OBUS_CONTROLLER_ID, false, OBUS_TYPE_CONTROLLER);
|
||||
send_frame.can_dlc = length;
|
||||
struct can_frame send_frame;
|
||||
|
||||
memcpy(send_frame.data, message, OBUS_MSG_LENGTH);
|
||||
|
||||
mcp2515.sendMessage(&send_frame);
|
||||
send_frame.can_id = make_id(OBUS_CONTROLLER_ID, false, OBUS_TYPE_CONTROLLER);
|
||||
send_frame.can_dlc = length;
|
||||
|
||||
memcpy(send_frame.data, message, OBUS_MSG_LENGTH);
|
||||
|
||||
mcp2515.sendMessage(&send_frame);
|
||||
}
|
||||
|
||||
|
||||
void start_hello() {
|
||||
state = STATE_HELLO;
|
||||
hello_round_start = millis();
|
||||
nr_connected_modules = 0;
|
||||
hello_round_start = millis();
|
||||
nr_connected_modules = 0;
|
||||
|
||||
// Zero bit vectors
|
||||
for (int i; i<32; i++) {
|
||||
unsolved_puzzles[i] = 0;
|
||||
}
|
||||
// Zero bit vectors
|
||||
for (int i; i<32; i++) {
|
||||
unsolved_puzzles[i] = 0;
|
||||
}
|
||||
|
||||
uint8_t message[OBUS_MSG_LENGTH];
|
||||
message[0] = OBUS_MSGTYPE_C_HELLO;
|
||||
uint8_t message[OBUS_MSG_LENGTH];
|
||||
message[0] = OBUS_MSGTYPE_C_HELLO;
|
||||
|
||||
send_message(message, 1);
|
||||
|
||||
send_message(message, 1);
|
||||
|
||||
Serial.println("Start of discovery round");
|
||||
}
|
||||
|
||||
|
||||
void send_ack() {
|
||||
uint8_t message[OBUS_MSG_LENGTH];
|
||||
message[0] = OBUS_MSGTYPE_C_ACK;
|
||||
uint8_t message[OBUS_MSG_LENGTH];
|
||||
message[0] = OBUS_MSGTYPE_C_ACK;
|
||||
|
||||
send_message(message, 1);
|
||||
send_message(message, 1);
|
||||
}
|
||||
|
||||
|
||||
void receive_hello() {
|
||||
struct can_frame receive_frame;
|
||||
uint16_t current_time = millis();
|
||||
|
||||
if (mcp2515.readMessage(&receive_frame) == MCP2515::ERROR_OK) {
|
||||
if (receive_frame.data[0] == OBUS_MSGTYPE_M_HELLO) {
|
||||
struct module new_module = get_module_info(receive_frame.can_id);
|
||||
Serial.print("Registered module ");
|
||||
Serial.println(new_module.id);
|
||||
connected_modules_ids[nr_connected_modules] = new_module;
|
||||
nr_connected_modules++;
|
||||
struct can_frame receive_frame;
|
||||
uint16_t current_time = millis();
|
||||
|
||||
if (new_module.type == OBUS_TYPE_PUZZLE) {
|
||||
add_module_to_bit_vector(new_module.id);
|
||||
}
|
||||
|
||||
send_ack();
|
||||
Serial.println("ACK");
|
||||
}
|
||||
} else if (current_time - hello_round_start > OBUS_DISC_DURATION * 1000) {
|
||||
state = STATE_GAME;
|
||||
Serial.println("End of discovery round");
|
||||
}
|
||||
if (mcp2515.readMessage(&receive_frame) == MCP2515::ERROR_OK) {
|
||||
if (receive_frame.data[0] == OBUS_MSGTYPE_M_HELLO) {
|
||||
struct module new_module = get_module_info(receive_frame.can_id);
|
||||
Serial.print("Registered module ");
|
||||
Serial.println(new_module.id);
|
||||
connected_modules_ids[nr_connected_modules] = new_module;
|
||||
nr_connected_modules++;
|
||||
|
||||
if (new_module.type == OBUS_TYPE_PUZZLE) {
|
||||
add_module_to_bit_vector(new_module.id);
|
||||
}
|
||||
|
||||
send_ack();
|
||||
Serial.println("ACK");
|
||||
}
|
||||
} else if (current_time - hello_round_start > OBUS_DISC_DURATION * 1000) {
|
||||
state = STATE_GAME;
|
||||
Serial.println("End of discovery round");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void initialize_game() {
|
||||
strikeouts = 0;
|
||||
strikeouts = 0;
|
||||
|
||||
uint16_t game_duration_millis = (uint16_t) OBUS_GAME_DURATION * 1000;
|
||||
uint16_t game_duration_millis = (uint16_t) OBUS_GAME_DURATION * 1000;
|
||||
|
||||
uint8_t message[OBUS_MSG_LENGTH];
|
||||
message[0] = OBUS_MSGTYPE_C_GAMESTART;
|
||||
message[1] = (uint8_t) ((game_duration_millis & 0xFF000000) >> 0x18);
|
||||
message[2] = (uint8_t) ((game_duration_millis & 0x00FF0000) >> 0x10);
|
||||
message[3] = (uint8_t) ((game_duration_millis & 0x0000FF00) >> 0x08);
|
||||
message[4] = (uint8_t) (game_duration_millis & 0x000000FF);
|
||||
message[5] = strikeouts;
|
||||
message[6] = OBUS_MAX_STRIKEOUTS;
|
||||
uint8_t message[OBUS_MSG_LENGTH];
|
||||
message[0] = OBUS_MSGTYPE_C_GAMESTART;
|
||||
message[1] = (uint8_t) ((game_duration_millis & 0xFF000000) >> 0x18);
|
||||
message[2] = (uint8_t) ((game_duration_millis & 0x00FF0000) >> 0x10);
|
||||
message[3] = (uint8_t) ((game_duration_millis & 0x0000FF00) >> 0x08);
|
||||
message[4] = (uint8_t) (game_duration_millis & 0x000000FF);
|
||||
message[5] = strikeouts;
|
||||
message[6] = OBUS_MAX_STRIKEOUTS;
|
||||
|
||||
send_message(message, 7);
|
||||
send_message(message, 7);
|
||||
|
||||
game_running = 1;
|
||||
game_start = millis();
|
||||
last_update = game_start;
|
||||
game_running = 1;
|
||||
game_start = millis();
|
||||
last_update = game_start;
|
||||
|
||||
Serial.println("Game started");
|
||||
Serial.println("Game started");
|
||||
}
|
||||
|
||||
|
||||
void receive_module_update() {
|
||||
struct can_frame receive_frame;
|
||||
|
||||
if (mcp2515.readMessage(&receive_frame) == MCP2515::ERROR_OK) {
|
||||
if (receive_frame.data[0] == OBUS_MSGTYPE_M_STRIKE) {
|
||||
strikeouts++;
|
||||
} else if (receive_frame.data[0] == OBUS_MSGTYPE_M_SOLVED) {
|
||||
struct module module_info = get_module_info(receive_frame.can_id);
|
||||
solve_module_in_bit_vector(module_info.id);
|
||||
}
|
||||
}
|
||||
struct can_frame receive_frame;
|
||||
|
||||
if (mcp2515.readMessage(&receive_frame) == MCP2515::ERROR_OK) {
|
||||
if (receive_frame.data[0] == OBUS_MSGTYPE_M_STRIKE) {
|
||||
strikeouts++;
|
||||
} else if (receive_frame.data[0] == OBUS_MSGTYPE_M_SOLVED) {
|
||||
struct module module_info = get_module_info(receive_frame.can_id);
|
||||
solve_module_in_bit_vector(module_info.id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void send_game_update(uint8_t status, uint16_t timestamp) {
|
||||
uint8_t message[OBUS_MSG_LENGTH];
|
||||
message[0] = status;
|
||||
message[1] = (uint8_t) ((timestamp & 0xFF000000) >> 0x18);
|
||||
message[2] = (uint8_t) ((timestamp & 0x00FF0000) >> 0x10);
|
||||
message[3] = (uint8_t) ((timestamp & 0x0000FF00) >> 0x08);
|
||||
message[4] = (uint8_t) (timestamp & 0x000000FF);
|
||||
message[5] = strikeouts;
|
||||
message[6] = OBUS_MAX_STRIKEOUTS;
|
||||
uint8_t message[OBUS_MSG_LENGTH];
|
||||
message[0] = status;
|
||||
message[1] = (uint8_t) ((timestamp & 0xFF000000) >> 0x18);
|
||||
message[2] = (uint8_t) ((timestamp & 0x00FF0000) >> 0x10);
|
||||
message[3] = (uint8_t) ((timestamp & 0x0000FF00) >> 0x08);
|
||||
message[4] = (uint8_t) (timestamp & 0x000000FF);
|
||||
message[5] = strikeouts;
|
||||
message[6] = OBUS_MAX_STRIKEOUTS;
|
||||
|
||||
send_message(message, 7);
|
||||
send_message(message, 7);
|
||||
}
|
||||
|
||||
|
||||
void game_loop() {
|
||||
uint16_t current_time = millis();
|
||||
uint16_t game_duration = current_time - game_start;
|
||||
|
||||
receive_module_update();
|
||||
uint16_t current_time = millis();
|
||||
uint16_t game_duration = current_time - game_start;
|
||||
|
||||
if (check_solved()) {
|
||||
Serial.println("Game solved");
|
||||
send_game_update(OBUS_MSGTYPE_C_SOLVED, game_duration);
|
||||
state = STATE_INACTIVE;
|
||||
return;
|
||||
} else if (game_duration >= (uint16_t) OBUS_GAME_DURATION * 1000) {
|
||||
Serial.println("Times up");
|
||||
send_game_update(OBUS_MSGTYPE_C_TIMEOUT, game_duration);
|
||||
state = STATE_INACTIVE;
|
||||
return;
|
||||
} else if (strikeouts >= OBUS_MAX_STRIKEOUTS) {
|
||||
Serial.println("Strikeout");
|
||||
send_game_update(OBUS_MSGTYPE_C_STRIKEOUT, game_duration);
|
||||
state = STATE_INACTIVE;
|
||||
return;
|
||||
}
|
||||
|
||||
uint16_t elapsed_time = current_time - last_update;
|
||||
if (elapsed_time > OBUS_UPDATE_INTERVAL) {
|
||||
Serial.print("Sending game update: ");
|
||||
Serial.println(game_duration);
|
||||
send_game_update(OBUS_MSGTYPE_C_STATE, (uint16_t) OBUS_GAME_DURATION * 1000 - game_duration);
|
||||
last_update = current_time;
|
||||
}
|
||||
receive_module_update();
|
||||
|
||||
if (check_solved()) {
|
||||
Serial.println("Game solved");
|
||||
send_game_update(OBUS_MSGTYPE_C_SOLVED, game_duration);
|
||||
state = STATE_INACTIVE;
|
||||
return;
|
||||
} else if (game_duration >= (uint16_t) OBUS_GAME_DURATION * 1000) {
|
||||
Serial.println("Times up");
|
||||
send_game_update(OBUS_MSGTYPE_C_TIMEOUT, game_duration);
|
||||
state = STATE_INACTIVE;
|
||||
return;
|
||||
} else if (strikeouts >= OBUS_MAX_STRIKEOUTS) {
|
||||
Serial.println("Strikeout");
|
||||
send_game_update(OBUS_MSGTYPE_C_STRIKEOUT, game_duration);
|
||||
state = STATE_INACTIVE;
|
||||
return;
|
||||
}
|
||||
|
||||
uint16_t elapsed_time = current_time - last_update;
|
||||
if (elapsed_time > OBUS_UPDATE_INTERVAL) {
|
||||
Serial.print("Sending game update: ");
|
||||
Serial.println(game_duration);
|
||||
send_game_update(OBUS_MSGTYPE_C_STATE, (uint16_t) OBUS_GAME_DURATION * 1000 - game_duration);
|
||||
last_update = current_time;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void loop() {
|
||||
if (state == STATE_INACTIVE) {
|
||||
start_hello();
|
||||
} else if (state == STATE_HELLO) {
|
||||
receive_hello();
|
||||
} else if (state == STATE_GAME) {
|
||||
if (game_running) {
|
||||
game_loop();
|
||||
} else {
|
||||
initialize_game();
|
||||
}
|
||||
}
|
||||
if (state == STATE_INACTIVE) {
|
||||
start_hello();
|
||||
} else if (state == STATE_HELLO) {
|
||||
receive_hello();
|
||||
} else if (state == STATE_GAME) {
|
||||
if (game_running) {
|
||||
game_loop();
|
||||
} else {
|
||||
initialize_game();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue