Skip to content

Commit baa8006

Browse files
committed
.DS_Store DEL and timer Commnet modify
1 parent 4e2c230 commit baa8006

File tree

12 files changed

+20
-22
lines changed

12 files changed

+20
-22
lines changed

.DS_Store

-12 KB
Binary file not shown.

pico_v2_STEP3_Buzzer/.DS_Store

-6 KB
Binary file not shown.

pico_v2_STEP4_Sensor/.DS_Store

-6 KB
Binary file not shown.

pico_v2_STEP4_Sensor/pico_v2_STEP4_Sensor.ino

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ void setup()
8181

8282
Serial.begin(115200);
8383

84-
g_timer1 = timerBegin(1000000); //1us
84+
g_timer1 = timerBegin(1000000); //1MHz(1us)
8585
timerAttachInterrupt(g_timer1, &onTimer1);
86-
timerAlarm(g_timer1, 500, true, 0); //2kHz
86+
timerAlarm(g_timer1, 500, true, 0); //500 * 1us = 500us(2kHz)
8787
timerStart(g_timer1);
8888
}
8989

pico_v2_STEP5_Straight/.DS_Store

-6 KB
Binary file not shown.

pico_v2_STEP5_Straight/pico_v2_STEP5_Straight.ino

+6-6
Original file line numberDiff line numberDiff line change
@@ -113,19 +113,19 @@ void setup()
113113
digitalWrite(PWM_R, LOW);
114114
digitalWrite(PWM_L, LOW);
115115

116-
g_timer0 = timerBegin(1000000); //1us
116+
g_timer0 = timerBegin(1000000); //1MHz(1us)
117117
timerAttachInterrupt(g_timer0, &onTimer0);
118-
timerAlarm(g_timer0, 1000, true, 0); //1kHz
118+
timerAlarm(g_timer0, 1000, true, 0); //1000 * 1us = 1000us(1kHz)
119119
timerStart(g_timer0);
120120

121-
g_timer2 = timerBegin(2000000); //0.5us
121+
g_timer2 = timerBegin(2000000); //2MHz(0.5us)
122122
timerAttachInterrupt(g_timer2, isrR);
123-
timerAlarm(g_timer2, 13333, true, 0); //150Hz
123+
timerAlarm(g_timer2, 13333, true, 0); //13333 * 0.5us = 6666us(150Hz)
124124
timerStart(g_timer2);
125125

126-
g_timer3 = timerBegin(2000000); //0.5us
126+
g_timer3 = timerBegin(2000000); //2MHz(0.5us)
127127
timerAttachInterrupt(g_timer3, &isrL);
128-
timerAlarm(g_timer3, 13333, true, 0); //150Hz
128+
timerAlarm(g_timer3, 13333, true, 0); //13333 * 0.5us = 6666us(150Hz)
129129
timerStart(g_timer3);
130130
}
131131

pico_v2_STEP6_rotate/.DS_Store

-6 KB
Binary file not shown.

pico_v2_STEP6_rotate/pico_v2_STEP6_rotate.ino

+6-6
Original file line numberDiff line numberDiff line change
@@ -122,19 +122,19 @@ void setup()
122122
digitalWrite(PWM_R, LOW);
123123
digitalWrite(PWM_L, LOW);
124124

125-
g_timer0 = timerBegin(1000000); //1us
125+
g_timer0 = timerBegin(1000000); //1MHz(1us)
126126
timerAttachInterrupt(g_timer0, &onTimer0);
127-
timerAlarm(g_timer0, 1000, true, 0); //1kHz
127+
timerAlarm(g_timer0, 1000, true, 0); //1000 * 1us = 1000us(1kHz)
128128
timerStart(g_timer0);
129129

130-
g_timer2 = timerBegin(2000000); //0.5us
130+
g_timer2 = timerBegin(2000000); //2MHz(0.5us)
131131
timerAttachInterrupt(g_timer2, &isrR);
132-
timerAlarm(g_timer2, 13333, true, 0); //150Hz
132+
timerAlarm(g_timer2, 13333, true, 0); //13333 * 0.5 = 6666us(150Hz)
133133
timerStart(g_timer2);
134134

135-
g_timer3 = timerBegin(2000000); //0.5us
135+
g_timer3 = timerBegin(2000000); //2MHz(0.5us)
136136
timerAttachInterrupt(g_timer3, &isrL);
137-
timerAlarm(g_timer3, 13333, true, 0); //150Hz
137+
timerAlarm(g_timer3, 13333, true, 0); //13333 * 0.5us = 6666us(150Hz)
138138
timerStart(g_timer3);
139139
}
140140

pico_v2_STEP7_P_control/.DS_Store

-6 KB
Binary file not shown.

pico_v2_STEP7_P_control/pico_v2_STEP7_P_control.ino

+6-6
Original file line numberDiff line numberDiff line change
@@ -182,24 +182,24 @@ void setup()
182182

183183
Serial.begin(115200);
184184

185-
g_timer0 = timerBegin(1000000); //1us
185+
g_timer0 = timerBegin(1000000); //1MHz(1us)
186186
timerAttachInterrupt(g_timer0, &onTimer0);
187-
timerAlarm(g_timer0, 1000, true, 0); //1kHz
187+
timerAlarm(g_timer0, 1000, true, 0); //1000 * 1us = 1000us(1kHz)
188188
timerStart(g_timer0);
189189

190190
g_timer1 = timerBegin(1000000);
191191
timerAttachInterrupt(g_timer1, &onTimer1);
192192
timerAlarm(g_timer1, 500, true, 0);
193193
timerStart(g_timer1);
194194

195-
g_timer2 = timerBegin(2000000); //0.5us
195+
g_timer2 = timerBegin(2000000); //2MHz(0.5us)
196196
timerAttachInterrupt(g_timer2, &isrR);
197-
timerAlarm(g_timer2, 13333, true, 0); //150Hz
197+
timerAlarm(g_timer2, 13333, true, 0); //13333 * 0.5us = 6666us(150Hz)
198198
timerStart(g_timer2);
199199

200-
g_timer3 = timerBegin(2000000); //0.5us
200+
g_timer3 = timerBegin(2000000); //2MHz(0.5us)
201201
timerAttachInterrupt(g_timer3, &isrL);
202-
timerAlarm(g_timer3, 13333, true, 0); //150Hz
202+
timerAlarm(g_timer3, 13333, true, 0); //13333 * 0.5us = 6666us(150Hz)
203203
timerStart(g_timer3);
204204

205205
g_sen_r.ref = REF_SEN_R;

pico_v2_STEP8_micromouse/.DS_Store

-6 KB
Binary file not shown.

pico_v2_STEP8_micromouse/device.h

-2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,4 @@
3333
//#define SW_CM 2
3434
#define SW_RM 4
3535

36-
37-
3836
#endif // DEVICE_H_

0 commit comments

Comments
 (0)