diff --git a/CHANGELOG.mkd b/CHANGELOG.mkd index 1761513..385e4b8 100644 --- a/CHANGELOG.mkd +++ b/CHANGELOG.mkd @@ -227,7 +227,7 @@ Fixed: - Fixed incorrect roll/pitch when smoothing was enabled -- Fixed nunchuk and classic controller flooding events when significant changes occured +- Fixed nunchuk and classic controller flooding events when significant changes occurred - Fixed bug where IR was not correct on roll if IR was enabled before handshake @@ -290,7 +290,7 @@ Fixed: - [Windows] Problem where a connection is made to a wiimote that does not exist. -- [Windows] Issue that occured while using multiple wiimotes. +- [Windows] Issue that occurred while using multiple wiimotes. v0.6 -- 16 Oct 2007 ------------------- diff --git a/example-sdl/sdl.c b/example-sdl/sdl.c index 1455fcd..e8162aa 100644 --- a/example-sdl/sdl.c +++ b/example-sdl/sdl.c @@ -434,7 +434,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine for (; i < MAX_WIIMOTES; ++i) { switch (wiimotes[i]->event) { case WIIUSE_EVENT: - /* a generic event occured */ + /* a generic event occurred */ handle_event(wiimotes[i]); break; diff --git a/example/example.c b/example/example.c index 80004ad..4eaeed6 100644 --- a/example/example.c +++ b/example/example.c @@ -370,7 +370,7 @@ int main(int argc, char** argv) { /* * Maybe I'm interested in the battery power of the 0th * wiimote. This should be WIIMOTE_ID_1 but to be sure - * you can get the wiimote assoicated with WIIMOTE_ID_1 + * you can get the wiimote associated with WIIMOTE_ID_1 * using the wiiuse_get_by_id() function. * * A status request will return other things too, like @@ -400,12 +400,12 @@ int main(int argc, char** argv) { for (; i < MAX_WIIMOTES; ++i) { switch (wiimotes[i]->event) { case WIIUSE_EVENT: - /* a generic event occured */ + /* a generic event occurred */ handle_event(wiimotes[i]); break; case WIIUSE_STATUS: - /* a status event occured */ + /* a status event occurred */ handle_ctrl_status(wiimotes[i]); break; diff --git a/src/dynamics.c b/src/dynamics.c index e7ace99..b7fdad3 100644 --- a/src/dynamics.c +++ b/src/dynamics.c @@ -147,7 +147,7 @@ void calc_joystick_state(struct joystick_t* js, float x, float y) { * Then the range from the min to the center and the center to the max * may be different. * Because of this, depending on if the current x or y value is greater - * or less than the assoicated axis center value, it needs to be interpolated + * or less than the associated axis center value, it needs to be interpolated * between the center and the minimum or maxmimum rather than between * the minimum and maximum. * diff --git a/src/events.c b/src/events.c index 5e1f803..071d8d6 100644 --- a/src/events.c +++ b/src/events.c @@ -73,7 +73,7 @@ static int state_changed(struct wiimote_t* wm); * @param wm An array of pointers to wiimote_t structures. * @param wiimotes The number of wiimote_t structures in the \a wm array. * - * @return Returns number of wiimotes that an event has occured on. + * @return Returns number of wiimotes that an event has occurred on. * * It is necessary to poll the wiimote devices for events * that occur. If an event occurs on a particular wiimote, @@ -296,10 +296,10 @@ static void clear_dirty_reads(struct wiimote_t* wm) { /** - * @brief Analyze the event that occured on a wiimote. + * @brief Analyze the event that occurred on a wiimote. * * @param wm An array of pointers to wiimote_t structures. - * @param event The event that occured. + * @param event The event that occurred. * @param msg The message specified in the event packet. * * Pass the event to the registered event callback. @@ -636,7 +636,7 @@ static void event_status(struct wiimote_t* wm, byte* msg) { return; /* - * An event occured. + * An event occurred. * This event can be overwritten by a more specific * event type during a handshake or expansion removal. */ @@ -855,7 +855,7 @@ void disable_expansion(struct wiimote_t* wm) { if (!WIIMOTE_IS_SET(wm, WIIMOTE_STATE_EXP)) return; - /* tell the assoicated module the expansion was removed */ + /* tell the associated module the expansion was removed */ switch (wm->exp.type) { case EXP_NUNCHUK: nunchuk_disconnected(&wm->exp.nunchuk); @@ -973,7 +973,7 @@ static void save_state(struct wiimote_t* wm) { /** * @brief Determine if the current state differs significantly from the previous. * @param wm A pointer to a wiimote_t structure. - * @return 1 if a significant change occured, 0 if not. + * @return 1 if a significant change occurred, 0 if not. */ static int state_changed(struct wiimote_t* wm) { #define STATE_CHANGED(a, b) if (a != b) return 1 diff --git a/src/io_win.c b/src/io_win.c index c56cc5e..0ad88e3 100644 --- a/src/io_win.c +++ b/src/io_win.c @@ -204,7 +204,7 @@ int wiiuse_io_read(struct wiimote_t* wm) { ResetEvent(wm->hid_overlap.hEvent); return 0; } else if (r == WAIT_FAILED) { - WIIUSE_WARNING("A wait error occured on reading from wiimote %i.", wm->unid); + WIIUSE_WARNING("A wait error occurred on reading from wiimote %i.", wm->unid); return 0; } diff --git a/src/wiiuse.c b/src/wiiuse.c index 0711cad..2b13d29 100644 --- a/src/wiiuse.c +++ b/src/wiiuse.c @@ -795,7 +795,7 @@ void wiiuse_set_bluetooth_stack(struct wiimote_t** wm, int wiimotes, enum win_bt * @param threshold The decimal place that should be considered a significant change. * * If threshold is 0.01, and any angle changes by 0.01 then a significant change - * has occured and the event callback will be invoked. If threshold is 1 then + * has occurred and the event callback will be invoked. If threshold is 1 then * the angle has to change by a full degree to generate an event. */ void wiiuse_set_orient_threshold(struct wiimote_t* wm, float threshold) { diff --git a/src/wiiuse.h b/src/wiiuse.h index 59c162d..3913951 100644 --- a/src/wiiuse.h +++ b/src/wiiuse.h @@ -767,7 +767,7 @@ typedef struct wiimote_t { WCONST struct wiimote_state_t lstate; /**< last saved state */ - WCONST WIIUSE_EVENT_TYPE event; /**< type of event that occured */ + WCONST WIIUSE_EVENT_TYPE event; /**< type of event that occurred */ WCONST byte event_buf[MAX_PAYLOAD]; /**< event buffer */ WCONST byte motion_plus_id[6]; } wiimote;