Skip to content

Commit df1719c

Browse files
JohnKrueger0JohnKrueger0
committed
Idk, night before updates,
I'm too sleepy to type all this. It's a lot of new stuff with gui
1 parent 637dffd commit df1719c

13 files changed

+689
-34
lines changed

‎IREC_2024_Competition/IREC_2024_Competition.ino

+130-32
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ float launchTime = -1; //Time for keeping the launch sequence on for set t
2525
int cycleState = 0; //Cycles through the different
2626
#define cycleTime 5 //# of seconds to stay on each cycle state
2727
float lastCycleUpdate = 0; //# of seconds since last cycle change
28-
#define launchDuration 300 //# of seconds to stay in the launched mode
28+
#define launchDuration 450 //# of seconds to stay in the launched mode
2929
int ranCnt = 0;
3030

3131
//Code frequency in Hz
3232
#define PRE_LAUNCH_FREQUENCY 10
33-
#define LAUNCH_FREQUENCY 50
33+
#define LAUNCH_FREQUENCY 100
3434

3535

3636
//Other pins
@@ -53,29 +53,104 @@ bool coilVoltageDetected = false;
5353

5454
//Cycle Sequences
5555

56-
int preLaunchCycleSize = 80;
57-
bool preLaunchCycle[80][6] = {
56+
int preLaunchCycleSize = 149;
57+
bool preLaunchCycle[149][6] = {
5858
{0, 0, 0, 0, 0, 0},
59+
{1, 1, 1, 1, 1, 1},
60+
{0, 0, 0, 0, 0, 0},
61+
{1, 1, 0, 0, 0, 1},
62+
{0, 0, 0, 0, 0, 0},
63+
{1, 0, 1, 1, 1, 0},
64+
{0, 0, 0, 0, 0, 0},
65+
{1, 0, 1, 1, 0, 0},
66+
{0, 0, 0, 0, 0, 0},
67+
{1, 0, 1, 0, 0, 1},
68+
{0, 0, 0, 0, 0, 0},
69+
{1, 0, 0, 1, 1, 1},
70+
{0, 0, 0, 0, 0, 0},
71+
{1, 0, 0, 1, 0, 1},
72+
{0, 0, 0, 0, 0, 0},
73+
{1, 0, 0, 0, 0, 1},
74+
75+
{0, 0, 0, 0, 0, 0},
76+
{0, 0, 0, 0, 0, 0},
77+
{0, 0, 0, 0, 0, 0},
78+
{0, 0, 0, 0, 0, 0},
79+
{0, 0, 0, 0, 0, 0},
80+
{0, 0, 0, 0, 0, 0},
81+
{0, 0, 0, 0, 0, 0},
82+
{0, 0, 0, 0, 0, 0},
83+
{0, 0, 0, 0, 0, 0},
84+
{0, 0, 0, 0, 0, 0},
85+
{0, 0, 0, 0, 0, 0},
86+
{0, 0, 0, 0, 0, 0},
87+
88+
{0, 0, 0, 0, 0, 0},
89+
{0, 0, 0, 0, 0, 0},
90+
{0, 0, 0, 0, 0, 0},
91+
{0, 0, 0, 0, 0, 0},
92+
{0, 0, 0, 0, 0, 0},
93+
{0, 0, 0, 0, 0, 0},
94+
{0, 0, 0, 0, 0, 0},
95+
{0, 0, 0, 0, 0, 0},
96+
{0, 0, 0, 0, 0, 0},
97+
{0, 0, 0, 0, 0, 0},
98+
{0, 0, 0, 0, 0, 0},
99+
{0, 0, 0, 0, 0, 0},
100+
101+
{0, 0, 0, 0, 0, 0},
102+
{0, 0, 0, 0, 0, 0},
103+
{0, 0, 0, 0, 0, 0},
104+
{0, 0, 0, 0, 0, 0},
105+
{0, 0, 0, 0, 0, 0},
106+
{0, 0, 0, 0, 0, 0},
107+
{0, 0, 0, 0, 0, 0},
108+
{0, 0, 0, 0, 0, 0},
109+
{0, 0, 0, 0, 0, 0},
110+
{0, 0, 0, 0, 0, 0},
111+
{0, 0, 0, 0, 0, 0},
112+
{0, 0, 0, 0, 0, 0},
113+
59114
{0, 0, 0, 0, 0, 0},
60115
{0, 0, 0, 0, 0, 0},
61116
{0, 0, 0, 0, 0, 0},
62117
{0, 0, 0, 0, 0, 0},
63118
{0, 0, 0, 0, 0, 0},
64-
{1, 1, 1, 1, 1, 1},
65119
{0, 0, 0, 0, 0, 0},
66-
{1, 1, 0, 0, 0, 0},
67120
{0, 0, 0, 0, 0, 0},
68-
{1, 0, 1, 1, 1, 1},
69121
{0, 0, 0, 0, 0, 0},
70-
{1, 0, 1, 1, 0, 0},
122+
{0, 0, 0, 0, 0, 0},
123+
{0, 0, 0, 0, 0, 0},
124+
{0, 0, 0, 0, 0, 0},
125+
{0, 0, 0, 0, 0, 0},
126+
127+
{0, 0, 0, 0, 0, 0},
128+
{0, 0, 0, 0, 0, 0},
129+
{0, 0, 0, 0, 0, 0},
130+
{0, 0, 0, 0, 0, 0},
131+
{0, 0, 0, 0, 0, 0},
132+
{0, 0, 0, 0, 0, 0},
133+
{0, 0, 0, 0, 0, 0},
134+
{0, 0, 0, 0, 0, 0},
135+
{0, 0, 0, 0, 0, 0},
136+
{0, 0, 0, 0, 0, 0},
137+
{0, 0, 0, 0, 0, 0},
138+
{0, 0, 0, 0, 0, 0},
139+
140+
{1, 0, 0, 0, 1, 0},
141+
{0, 0, 0, 0, 0, 0},
142+
{1, 0, 0, 1, 1, 0},
71143
{0, 0, 0, 0, 0, 0},
72144
{1, 0, 1, 0, 0, 0},
73145
{0, 0, 0, 0, 0, 0},
74-
{1, 0, 0, 1, 0, 0},
146+
{1, 0, 1, 0, 1, 0},
75147
{0, 0, 0, 0, 0, 0},
76-
{1, 0, 0, 0, 0, 0},
148+
{1, 0, 1, 1, 0, 1},
77149
{0, 0, 0, 0, 0, 0},
150+
{1, 0, 1, 1, 1, 1},
78151
{0, 0, 0, 0, 0, 0},
152+
{1, 1, 0, 1, 1, 1},
153+
79154
{0, 0, 0, 0, 0, 0},
80155
{0, 0, 0, 0, 0, 0},
81156
{0, 0, 0, 0, 0, 0},
@@ -87,6 +162,8 @@ bool preLaunchCycle[80][6] = {
87162
{0, 0, 0, 0, 0, 0},
88163
{0, 0, 0, 0, 0, 0},
89164
{0, 0, 0, 0, 0, 0},
165+
{0, 0, 0, 0, 0, 0},
166+
90167
{0, 0, 0, 0, 0, 0},
91168
{0, 0, 0, 0, 0, 0},
92169
{0, 0, 0, 0, 0, 0},
@@ -99,6 +176,7 @@ bool preLaunchCycle[80][6] = {
99176
{0, 0, 0, 0, 0, 0},
100177
{0, 0, 0, 0, 0, 0},
101178
{0, 0, 0, 0, 0, 0},
179+
102180
{0, 0, 0, 0, 0, 0},
103181
{0, 0, 0, 0, 0, 0},
104182
{0, 0, 0, 0, 0, 0},
@@ -111,6 +189,7 @@ bool preLaunchCycle[80][6] = {
111189
{0, 0, 0, 0, 0, 0},
112190
{0, 0, 0, 0, 0, 0},
113191
{0, 0, 0, 0, 0, 0},
192+
114193
{0, 0, 0, 0, 0, 0},
115194
{0, 0, 0, 0, 0, 0},
116195
{0, 0, 0, 0, 0, 0},
@@ -123,6 +202,7 @@ bool preLaunchCycle[80][6] = {
123202
{0, 0, 0, 0, 0, 0},
124203
{0, 0, 0, 0, 0, 0},
125204
{0, 0, 0, 0, 0, 0},
205+
126206
{0, 0, 0, 0, 0, 0},
127207
{0, 0, 0, 0, 0, 0},
128208
{0, 0, 0, 0, 0, 0},
@@ -137,32 +217,45 @@ bool preLaunchCycle[80][6] = {
137217
{0, 0, 0, 0, 0, 0}
138218
};
139219

140-
//{1, 0, 0, 0, 0, 0}, -> 3.04A
141-
//{1, 1, 0, 0, 0, 0}, -> 1.08A
142-
//{1, 0, 1, 0, 0, 0}, -> 1.92A, 6.82V
143-
//{1, 0, 0, 1, 0, 0}, -> 2.93A, 11.95V
144-
//{1, 0, 0, 0, 1, 0}, -> 2.9A
145-
//{1, 0, 1, 1, 0, 0}, -> 1.47A, 5.06V
146-
//{1, 0, 1, 1, 1, 1}, -> 1.2A, 4.08V
147-
//{1, 1, 1, 1, 1, 1}, -> 0.77A, 2.55V
148-
149220

150-
int launchCycleSize = 14;
151-
bool launchCycle[14][6] = {
152-
{0, 0, 0, 0, 0, 0},
221+
int launchCycleSize = 34;
222+
bool launchCycle[34][6] = {
153223
{0, 0, 0, 0, 0, 0},
154224
{1, 1, 1, 1, 1, 1},
155-
{1, 0, 1, 1, 1, 1},
156225
{0, 0, 0, 0, 0, 0},
226+
{1, 1, 0, 0, 0, 1},
227+
{0, 0, 0, 0, 0, 0},
228+
{1, 0, 1, 1, 1, 0},
229+
{0, 0, 0, 0, 0, 0},
230+
{1, 0, 1, 1, 0, 0},
231+
{0, 0, 0, 0, 0, 0},
232+
{1, 0, 1, 0, 0, 1},
157233
{0, 0, 0, 0, 0, 0},
158234
{1, 0, 0, 1, 1, 1},
159-
{1, 0, 0, 0, 1, 1},
160235
{0, 0, 0, 0, 0, 0},
236+
{1, 0, 0, 1, 0, 1},
161237
{0, 0, 0, 0, 0, 0},
162238
{1, 0, 0, 0, 0, 1},
239+
240+
{0, 0, 0, 0, 0, 0},
241+
{0, 0, 0, 0, 0, 0},
242+
243+
{1, 0, 0, 0, 1, 0},
244+
{0, 0, 0, 0, 0, 0},
245+
{1, 0, 0, 1, 1, 0},
246+
{0, 0, 0, 0, 0, 0},
247+
{1, 0, 1, 0, 0, 0},
163248
{0, 0, 0, 0, 0, 0},
164-
{0, 0, 0, 0, 0, 0},
165-
{1, 0, 0, 0, 0, 0}
249+
{1, 0, 1, 0, 1, 0},
250+
{0, 0, 0, 0, 0, 0},
251+
{1, 0, 1, 1, 0, 1},
252+
{0, 0, 0, 0, 0, 0},
253+
{1, 0, 1, 1, 1, 1},
254+
{0, 0, 0, 0, 0, 0},
255+
{1, 1, 0, 1, 1, 1},
256+
257+
{0, 0, 0, 0, 0, 0},
258+
{0, 0, 0, 0, 0, 0}
166259
};
167260

168261
int cyclePins[6] = {2, 3, 4, 5, 6, 7};
@@ -178,6 +271,10 @@ void setup() {
178271
if(SD.begin(SD1CSPIN)){
179272
Serial.println("SD 1 Good");
180273
sd1Active = true;
274+
275+
File myFile = SD.open(filename1, FILE_WRITE);
276+
myFile.write("Time,State,MagX,MagY,MagZ,AccX,AccY,AccZ,LaunchTime,PD,Launched,RanCount,Temp,SD1,SD2,MainBat,CoilBat,Coil,,");
277+
181278
} else {
182279
Serial.println("SD 1 Bad");
183280
sd1Active = false;
@@ -186,6 +283,10 @@ void setup() {
186283
if(SD.begin(SD2CSPIN)){
187284
Serial.println("SD 2 Good");
188285
sd2Active = true;
286+
287+
File myFile = SD.open(filename2, FILE_WRITE);
288+
myFile.write("Time,State,MagX,MagY,MagZ,AccX,AccY,AccZ,LaunchTime,PD,Launched,RanCount,Temp,SD1,SD2,MainBat,CoilBat,Coil,,");
289+
189290
} else {
190291
Serial.println("SD 2 Bad");
191292
sd2Active = false;
@@ -211,9 +312,6 @@ void setup() {
211312
pinMode(imuLED, OUTPUT);
212313
pinMode(ranLED, OUTPUT);
213314

214-
//Write headers to SD card
215-
//TODO
216-
217315
}
218316

219317
void loop() {
@@ -279,15 +377,15 @@ void loop() {
279377
digitalWrite(sdLED, (sd1Active && sd2Active) ? HIGH : LOW);
280378
digitalWrite(coilLED, coilVoltageDetected ? HIGH : LOW);
281379
digitalWrite(photoDiodeLED, (newPhotoDiodeValue > 150 && newPhotoDiodeValue < 400) ? HIGH : LOW);
282-
digitalWrite(imuLED, (acc.x() != 0.0 || acc.y() != 0.0 || acc.z() != 0.0) ? HIGH : LOW);
380+
digitalWrite(imuLED, ((abs(acc.x()) > 0.5) || (abs(acc.y()) > 0.5) || (abs(acc.z()) > 0.5)) ? HIGH : LOW);
283381
digitalWrite(ranLED, ranCnt > 0);
284382

285383
//Setting this to true if we see some voltage over coil
286384
if(coilVoltage > 0.25){
287385
coilVoltageDetected = true;
288386
}
289387

290-
Serial.println(newPhotoDiodeValue);
388+
//Serial.println(acc.z());
291389
//Serial.print(",");
292390
//Serial.println(coilVoltage);
293391
//Serial.println(acc.z());
@@ -310,7 +408,7 @@ void loop() {
310408
dataOut[14] = sd2Active ? 1 : 0;
311409
dataOut[15] = mainBatVoltage;
312410
dataOut[16] = coilBatVoltage;
313-
dataOut[17] = coilVoltage;
411+
dataOut[17] = currentCombo[0] ? coilVoltage : 0;
314412

315413

316414
//Writing to SD

‎Images/BatteryOutline.png

2.03 KB
Loading

‎June_14th_Results_All.png

35.7 KB
Loading

‎June_14th_Results_Launch.png

30.3 KB
Loading

‎MultiPlotter.py

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
import pygame, sys
2+
import pygame_chart as pyc
3+
4+
class MultiPlotter:
5+
6+
def __init__(self, screen, name, ylab, x, y, width, height, margin):
7+
self.name = name
8+
self.datax = []
9+
self.datay = []
10+
self.x = x
11+
self.y = y
12+
self.width = width
13+
self.height = height
14+
self.ylab = ylab
15+
self.margin = margin
16+
17+
self.fig = pyc.Figure(screen, x, y, width, height, bg_color=(250, 250, 250))
18+
self.fig.add_gridlines()
19+
self.fig.add_title(self.name)
20+
self.fig.add_yaxis_label(self.ylab)
21+
22+
# def new_data(self, x, y):
23+
# self.datax.append(float(x))
24+
# self.datay.append(float(y))
25+
26+
# if len(self.datax) > 100:
27+
# self.datax.pop(0)
28+
# self.datay.pop(0)
29+
30+
def update(self):
31+
maxVal = 0
32+
minVal = 0
33+
for data in range(len(self.datax)):
34+
if len(self.datax[data]) > 2 and len(self.datay[data]) > 2:
35+
self.fig.line(self.name, self.datax[data], self.datay[data], color=(100, 100, 80 * (data+1)))
36+
37+
if data == 0 or (max(self.datay[data]) > maxVal):
38+
maxVal = max(self.datay[data])
39+
if data == 0 or (min(self.datay[data]) < minVal):
40+
minVal = min(self.datay[data])
41+
42+
else:
43+
self.fig.line(self.name, [0, 1], [0, 1])
44+
45+
46+
if(len(self.datax) > 0):
47+
if(len(self.datax[0]) > 0):
48+
self.fig.set_ylim((minVal-self.margin, maxVal+self.margin))
49+
self.fig.draw()
50+
51+
def set_data(self, datax, datay):
52+
self.datax = datax
53+
self.datay = datay
54+
55+
def clear(self):
56+
self.datax = []
57+
self.datay = []
58+

‎Plotter.py

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#import pygame, sys
2+
import pygame_chart as pyc
3+
4+
class Plotter:
5+
6+
def __init__(self, screen, name, ylab, x, y, width, height, margin, color, linewidth):
7+
self.name = name
8+
self.datax = []
9+
self.datay = []
10+
self.x = x
11+
self.y = y
12+
self.width = width
13+
self.height = height
14+
self.ylab = ylab
15+
self.margin = margin
16+
self.color = color
17+
self.linewidth = linewidth
18+
19+
self.fig = pyc.Figure(screen, x, y, width, height, bg_color=(255, 255, 255))
20+
self.fig.add_gridlines()
21+
self.fig.add_title(self.name)
22+
self.fig.add_yaxis_label(self.ylab)
23+
24+
def new_data(self, x, y):
25+
self.datax.append(float(x))
26+
self.datay.append(float(y))
27+
28+
if len(self.datax) > 100:
29+
self.datax.pop(0)
30+
self.datay.pop(0)
31+
32+
def update(self):
33+
if len(self.datax) > 4 and len(self.datay) > 4:
34+
self.fig.line(self.name, self.datax, self.datay, self.color, self.linewidth)
35+
self.fig.set_ylim((min(self.datay)-self.margin, max(self.datay)+self.margin))
36+
self.fig.draw()
37+
38+
else:
39+
self.fig.line(self.name, [0, 1], [0, 1])
40+
self.fig.draw()
41+
42+
def set_data(self, datax, datay):
43+
self.datax = datax
44+
self.datay = datay
45+
46+
def clear(self):
47+
self.datax = []
48+
self.datay = []
49+

‎Utility Scripts/Eraser/Eraser.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <SPI.h>
22
#include <SD.h>
33

4-
const int chipSelect = 49;
4+
const int chipSelect = 53;
55

66
void setup() {
77
// Open serial communications and wait for port to open:

0 commit comments

Comments
 (0)