Remove old code
This commit is contained in:
redfast00
parent
d4485350f6
commit
d8cb85d725
3 changed files with 0 additions and 370 deletions
|
|
@ -1,98 +0,0 @@
|
|||
#include <mcp2515.h>
|
||||
#include "pitches.h"
|
||||
|
||||
MCP2515 mcp2515(10);
|
||||
|
||||
uint16_t id = 0b01100000011;
|
||||
// type: 3 (other)
|
||||
// module-id: 3
|
||||
|
||||
int soundpin = 9;
|
||||
|
||||
|
||||
void setup() {
|
||||
// Serial.begin(9600);
|
||||
Serial.begin(115200);
|
||||
mcp2515.reset();
|
||||
mcp2515.setBitrate(CAN_50KBPS);
|
||||
mcp2515.setNormalMode();
|
||||
Serial.println("begin");
|
||||
|
||||
// play_sound();
|
||||
}
|
||||
|
||||
void loop() {
|
||||
char message[9];
|
||||
message[8] = '\0';
|
||||
|
||||
// Send text typed in the console over the can network
|
||||
struct can_frame send_frame;
|
||||
int read = Serial.readBytesUntil('\n', send_frame.data, 8);
|
||||
if (read > 0) {
|
||||
send_frame.can_id = id;
|
||||
send_frame.can_dlc = read;
|
||||
mcp2515.sendMessage(&send_frame);
|
||||
Serial.println("sent");
|
||||
}
|
||||
|
||||
// Read from the can bus
|
||||
struct can_frame receive_frame;
|
||||
if (mcp2515.readMessage(&receive_frame) == MCP2515::ERROR_OK) {
|
||||
Serial.print("[prio-bit: ");
|
||||
Serial.print(receive_frame.can_id >> 10 & 0b00000001);
|
||||
Serial.print("\tmodule-type: ");
|
||||
Serial.print(receive_frame.can_id >> 8 & 0b00000011);
|
||||
Serial.print("\tmodule-id: ");
|
||||
|
||||
Serial.print(receive_frame.can_id & 0b11111111);
|
||||
Serial.print("]\tLength: ");
|
||||
|
||||
Serial.print(receive_frame.can_dlc, HEX); // print DLC
|
||||
Serial.print("\t Body: ");
|
||||
|
||||
// First byte has the type of the message
|
||||
|
||||
// print per byte in hex
|
||||
for (int i = 0; i < receive_frame.can_dlc; i++) { // print the data
|
||||
Serial.print(receive_frame.data[i], HEX);
|
||||
Serial.print(" ");
|
||||
}
|
||||
Serial.println("");
|
||||
|
||||
// print all
|
||||
//memcpy(message, receive_frame.data, 8);
|
||||
//Serial.println(message);
|
||||
}
|
||||
}
|
||||
|
||||
// notes in the melody:
|
||||
int melody[] = {
|
||||
NOTE_C4, NOTE_G3, NOTE_G3, NOTE_A3, NOTE_G3, 0, NOTE_B3, NOTE_C4
|
||||
};
|
||||
|
||||
// note durations: 4 = quarter note, 8 = eighth note, etc.:
|
||||
int noteDurations[] = {
|
||||
4, 8, 8, 4, 4, 4, 4, 4
|
||||
};
|
||||
|
||||
void play_melody() {
|
||||
// iterate over the notes of the melody:
|
||||
for (int thisNote = 0; thisNote < 8; thisNote++) {
|
||||
|
||||
// to calculate the note duration, take one second divided by the note type.
|
||||
//e.g. quarter note = 1000 / 4, eighth note = 1000/8, etc.
|
||||
int noteDuration = 1000 / noteDurations[thisNote];
|
||||
tone(soundpin, melody[thisNote], noteDuration);
|
||||
|
||||
// to distinguish the notes, set a minimum time between them.
|
||||
// the note's duration + 30% seems to work well:
|
||||
int pauseBetweenNotes = noteDuration * 1.30;
|
||||
delay(pauseBetweenNotes);
|
||||
// stop the tone playing:
|
||||
noTone(soundpin);
|
||||
}
|
||||
}
|
||||
|
||||
void play_sound() {
|
||||
|
||||
}
|
||||
|
|
@ -1,93 +0,0 @@
|
|||
/*************************************************
|
||||
* Public Constants
|
||||
*************************************************/
|
||||
|
||||
#define NOTE_B0 31
|
||||
#define NOTE_C1 33
|
||||
#define NOTE_CS1 35
|
||||
#define NOTE_D1 37
|
||||
#define NOTE_DS1 39
|
||||
#define NOTE_E1 41
|
||||
#define NOTE_F1 44
|
||||
#define NOTE_FS1 46
|
||||
#define NOTE_G1 49
|
||||
#define NOTE_GS1 52
|
||||
#define NOTE_A1 55
|
||||
#define NOTE_AS1 58
|
||||
#define NOTE_B1 62
|
||||
#define NOTE_C2 65
|
||||
#define NOTE_CS2 69
|
||||
#define NOTE_D2 73
|
||||
#define NOTE_DS2 78
|
||||
#define NOTE_E2 82
|
||||
#define NOTE_F2 87
|
||||
#define NOTE_FS2 93
|
||||
#define NOTE_G2 98
|
||||
#define NOTE_GS2 104
|
||||
#define NOTE_A2 110
|
||||
#define NOTE_AS2 117
|
||||
#define NOTE_B2 123
|
||||
#define NOTE_C3 131
|
||||
#define NOTE_CS3 139
|
||||
#define NOTE_D3 147
|
||||
#define NOTE_DS3 156
|
||||
#define NOTE_E3 165
|
||||
#define NOTE_F3 175
|
||||
#define NOTE_FS3 185
|
||||
#define NOTE_G3 196
|
||||
#define NOTE_GS3 208
|
||||
#define NOTE_A3 220
|
||||
#define NOTE_AS3 233
|
||||
#define NOTE_B3 247
|
||||
#define NOTE_C4 262
|
||||
#define NOTE_CS4 277
|
||||
#define NOTE_D4 294
|
||||
#define NOTE_DS4 311
|
||||
#define NOTE_E4 330
|
||||
#define NOTE_F4 349
|
||||
#define NOTE_FS4 370
|
||||
#define NOTE_G4 392
|
||||
#define NOTE_GS4 415
|
||||
#define NOTE_A4 440
|
||||
#define NOTE_AS4 466
|
||||
#define NOTE_B4 494
|
||||
#define NOTE_C5 523
|
||||
#define NOTE_CS5 554
|
||||
#define NOTE_D5 587
|
||||
#define NOTE_DS5 622
|
||||
#define NOTE_E5 659
|
||||
#define NOTE_F5 698
|
||||
#define NOTE_FS5 740
|
||||
#define NOTE_G5 784
|
||||
#define NOTE_GS5 831
|
||||
#define NOTE_A5 880
|
||||
#define NOTE_AS5 932
|
||||
#define NOTE_B5 988
|
||||
#define NOTE_C6 1047
|
||||
#define NOTE_CS6 1109
|
||||
#define NOTE_D6 1175
|
||||
#define NOTE_DS6 1245
|
||||
#define NOTE_E6 1319
|
||||
#define NOTE_F6 1397
|
||||
#define NOTE_FS6 1480
|
||||
#define NOTE_G6 1568
|
||||
#define NOTE_GS6 1661
|
||||
#define NOTE_A6 1760
|
||||
#define NOTE_AS6 1865
|
||||
#define NOTE_B6 1976
|
||||
#define NOTE_C7 2093
|
||||
#define NOTE_CS7 2217
|
||||
#define NOTE_D7 2349
|
||||
#define NOTE_DS7 2489
|
||||
#define NOTE_E7 2637
|
||||
#define NOTE_F7 2794
|
||||
#define NOTE_FS7 2960
|
||||
#define NOTE_G7 3136
|
||||
#define NOTE_GS7 3322
|
||||
#define NOTE_A7 3520
|
||||
#define NOTE_AS7 3729
|
||||
#define NOTE_B7 3951
|
||||
#define NOTE_C8 4186
|
||||
#define NOTE_CS8 4435
|
||||
#define NOTE_D8 4699
|
||||
#define NOTE_DS8 4978
|
||||
|
|
@ -1,179 +0,0 @@
|
|||
#include <CAN.h>
|
||||
#include <ezButton.h>
|
||||
|
||||
#define HANDLE_MESSAGE(type) case type: handle_##type(); break;
|
||||
|
||||
#define PUZZLE_M_HANLO 0
|
||||
#define PUZZLE_M_STRIKE 1
|
||||
#define PUZZLE_M_SOLVED 2
|
||||
|
||||
|
||||
enum gamestate {
|
||||
PENDING, RUNNING, SOLVED, TIMEOUT, STRIKEOUT
|
||||
};
|
||||
|
||||
enum controller_m_type {
|
||||
ACK, HELLO, GAME_START, GAME_STATE, GAME_SOLVED, GAME_TIMEOUT, GAME_STRIKEOUT
|
||||
};
|
||||
|
||||
typedef struct state {
|
||||
gamestate game_state;
|
||||
uint32_t time;
|
||||
uint8_t cur_strikes;
|
||||
uint8_t max_strikes;
|
||||
} state_s;
|
||||
|
||||
state_s state = { .game_state = PENDING, .time = (uint32_t) -1 };
|
||||
|
||||
uint16_t id = 0b00100000010;
|
||||
|
||||
ezButton green_button(5); // create ezButton object that attach to pin 5;
|
||||
ezButton red_button(7); // create ezButton object that attach to pin 7;
|
||||
|
||||
/* Send Hanlo to controller */
|
||||
void hanlo() {
|
||||
Serial.println("-> HANLO");
|
||||
CAN.beginPacket(id);
|
||||
CAN.write(PUZZLE_M_HANLO); /* Message Type */
|
||||
CAN.endPacket();
|
||||
}
|
||||
|
||||
/* Send strike to controller */
|
||||
void strike() {
|
||||
Serial.println("-> STRIKE");
|
||||
CAN.beginPacket(id);
|
||||
CAN.write(PUZZLE_M_STRIKE); /* Message Type */
|
||||
CAN.endPacket();
|
||||
}
|
||||
|
||||
/* Send solve to controller */
|
||||
void solved() {
|
||||
Serial.println("-> SOLVED");
|
||||
CAN.beginPacket(id);
|
||||
CAN.write(PUZZLE_M_SOLVED); /* Message Type */
|
||||
CAN.endPacket();
|
||||
}
|
||||
|
||||
/* Handle Ack message from controller */
|
||||
void handle_ACK() {
|
||||
Serial.println("<- ACK");
|
||||
}
|
||||
|
||||
/* Handle Hello message from controller */
|
||||
void handle_HELLO() {
|
||||
Serial.println("<- HELLO");
|
||||
hanlo();
|
||||
}
|
||||
|
||||
/* Handle Game start message from controller */
|
||||
void handle_GAME_START() {
|
||||
Serial.println("<- GAME_START");
|
||||
state.game_state = RUNNING;
|
||||
handle_GAME_STATE();
|
||||
}
|
||||
|
||||
/* Handle State message from controller */
|
||||
void handle_GAME_STATE() {
|
||||
Serial.println("<- GAME_STATE");
|
||||
state.time =
|
||||
((uint32_t) CAN.read() << 24) |
|
||||
((uint32_t) CAN.read() << 16) |
|
||||
((uint32_t) CAN.read() << 8) |
|
||||
CAN.read();
|
||||
state.cur_strikes = CAN.read();
|
||||
state.max_strikes = CAN.read();
|
||||
|
||||
Serial.print("TIME: ");
|
||||
Serial.println(state.time);
|
||||
Serial.print("CUR_STRIKES: ");
|
||||
Serial.println(state.cur_strikes);
|
||||
Serial.print("MAX_STRIKES: ");
|
||||
Serial.println(state.max_strikes);
|
||||
}
|
||||
|
||||
/* Handle Solved message from controller */
|
||||
void handle_GAME_SOLVED() {
|
||||
Serial.println("<- GAME_SOLVED");
|
||||
state.game_state = SOLVED;
|
||||
}
|
||||
|
||||
/* Handle Timeout message from controller */
|
||||
void handle_GAME_TIMEOUT() {
|
||||
Serial.println("<- GAME_TIMEOUT");
|
||||
state.game_state = TIMEOUT;
|
||||
}
|
||||
|
||||
/* Handle Strikeout message from controller */
|
||||
void handle_GAME_STRIKEOUT() {
|
||||
Serial.println("<- GAME_STRIKEOUT");
|
||||
state.game_state = STRIKEOUT;
|
||||
}
|
||||
|
||||
void doCAN() {
|
||||
if (CAN.parsePacket()) {
|
||||
Serial.println("--- GOT_CAN ---");
|
||||
/* only react to messages from the controller */
|
||||
if (CAN.filter(0b00000000000, 0b01100000000)) {
|
||||
Serial.println("--- HANDLING ---");
|
||||
if (CAN.peek() != -1) {
|
||||
uint8_t message_type = CAN.read();
|
||||
Serial.print("MESSAGE_TYPE: ");
|
||||
Serial.println(message_type, HEX);
|
||||
switch(message_type) {
|
||||
HANDLE_MESSAGE(ACK)
|
||||
HANDLE_MESSAGE(HELLO)
|
||||
HANDLE_MESSAGE(GAME_START)
|
||||
HANDLE_MESSAGE(GAME_STATE)
|
||||
HANDLE_MESSAGE(GAME_SOLVED)
|
||||
HANDLE_MESSAGE(GAME_TIMEOUT)
|
||||
HANDLE_MESSAGE(GAME_STRIKEOUT)
|
||||
default:
|
||||
Serial.println("--- NO_HANDLER_FOUND ---");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
Serial.println("--- IGNORING ---");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void setup() {
|
||||
/* Init Serial */
|
||||
Serial.begin(9600);
|
||||
Serial.println("--- INITIATING ---");
|
||||
Serial.print("ID: ");
|
||||
Serial.println(id, HEX);
|
||||
|
||||
/* Init Can pins */
|
||||
// CAN.setPins(cs,irq);
|
||||
|
||||
/* Set SPI Frequency */
|
||||
// CAN.setSPIFrequency(frequency);
|
||||
|
||||
if (!CAN.begin(50E3)) {
|
||||
Serial.println("--- FAILED_TO_INIT_CAN ---");
|
||||
while(1) {};
|
||||
}
|
||||
|
||||
red_button.setDebounceTime(50);
|
||||
green_button.setDebounceTime(50);
|
||||
|
||||
Serial.println("--- INITIALIZED ---");
|
||||
}
|
||||
|
||||
void loop() {
|
||||
red_button.loop();
|
||||
green_button.loop();
|
||||
|
||||
/* Handle CAN messages */
|
||||
doCAN();
|
||||
|
||||
if (green_button.isPressed()) {
|
||||
solved();
|
||||
}
|
||||
|
||||
if (red_button.isPressed()) {
|
||||
strike();
|
||||
}
|
||||
// TODO
|
||||
}
|
||||
Loading…
Reference in a new issue