Mercurial repo for silny-kombat project
Revision | 48843f94196b7a3dcbc8503a137d1dc199d52af5 (tree) |
---|---|
Time | 2021-10-20 02:33:39 |
Author | Piotr Kozka <piotoor@gmai...> |
Commiter | Piotr Kozka |
Fixed compilation warnings
@@ -4,17 +4,17 @@ | ||
4 | 4 | derive(Debug) |
5 | 5 | pub CharacterFSM(StandIdle) |
6 | 6 | |
7 | - StandIdle(FrontPressed) => StandMoveFront[front], | |
8 | - StandIdle(BackPressed) => StandMoveBack[back], | |
9 | - StandIdle(Released) => StandIdle[idle], | |
7 | + StandIdle(FrontPressed) => StandMoveFront[Front], | |
8 | + StandIdle(BackPressed) => StandMoveBack[Back], | |
9 | + StandIdle(Released) => StandIdle[Idle], | |
10 | 10 | |
11 | - StandMoveFront(Released) => StandIdle[idle], | |
12 | - StandMoveFront(BackPressed) => StandMoveBack[back], | |
13 | - StandMoveFront(FrontPressed) => StandMoveFront[front], | |
11 | + StandMoveFront(Released) => StandIdle[Idle], | |
12 | + StandMoveFront(BackPressed) => StandMoveBack[Back], | |
13 | + StandMoveFront(FrontPressed) => StandMoveFront[Front], | |
14 | 14 | |
15 | - StandMoveBack(Released) => StandIdle[idle], | |
16 | - StandMoveBack(FrontPressed) => StandMoveFront[front], | |
17 | - StandMoveBack(BackPressed) => StandMoveBack[back] | |
15 | + StandMoveBack(Released) => StandIdle[Idle], | |
16 | + StandMoveBack(FrontPressed) => StandMoveFront[Front], | |
17 | + StandMoveBack(BackPressed) => StandMoveBack[Back] | |
18 | 18 | } |
19 | 19 | |
20 | 20 | pub struct StateMachineWrapper { |
@@ -38,15 +38,15 @@ | ||
38 | 38 | self.num_state |
39 | 39 | } |
40 | 40 | pub fn trigger(&mut self, signal: i32) -> i32 { |
41 | - let mut output: Result<Option<CharacterFSMOutput>, TransitionImpossibleError>; | |
41 | + let output: Result<Option<CharacterFSMOutput>, TransitionImpossibleError>; | |
42 | 42 | let mut ans = 1; |
43 | 43 | if signal == 1 { |
44 | 44 | output = self.machine.consume(&CharacterFSMInput::BackPressed); |
45 | 45 | match output { |
46 | 46 | Ok(v) => match v { |
47 | - Some(CharacterFSMOutput::back) => ans = 1, | |
48 | - Some(CharacterFSMOutput::front) => ans = 2, | |
49 | - Some(CharacterFSMOutput::idle) => ans = 0, | |
47 | + Some(CharacterFSMOutput::Back) => ans = 1, | |
48 | + Some(CharacterFSMOutput::Front) => ans = 2, | |
49 | + Some(CharacterFSMOutput::Idle) => ans = 0, | |
50 | 50 | None => println!("None"), |
51 | 51 | } |
52 | 52 | Err(e) => println!("State machine error back pressed {}", e), |
@@ -55,9 +55,9 @@ | ||
55 | 55 | output = self.machine.consume(&CharacterFSMInput::FrontPressed); |
56 | 56 | match output { |
57 | 57 | Ok(v) => match v { |
58 | - Some(CharacterFSMOutput::back) => ans = 1, | |
59 | - Some(CharacterFSMOutput::front) => ans = 2, | |
60 | - Some(CharacterFSMOutput::idle) => ans = 0, | |
58 | + Some(CharacterFSMOutput::Back) => ans = 1, | |
59 | + Some(CharacterFSMOutput::Front) => ans = 2, | |
60 | + Some(CharacterFSMOutput::Idle) => ans = 0, | |
61 | 61 | None => println!("None"), |
62 | 62 | } |
63 | 63 | Err(e) => println!("State machine error front pressed {}", e), |
@@ -66,9 +66,9 @@ | ||
66 | 66 | output = self.machine.consume(&CharacterFSMInput::Released); |
67 | 67 | match output { |
68 | 68 | Ok(v) => match v { |
69 | - Some(CharacterFSMOutput::back) => ans = 1, | |
70 | - Some(CharacterFSMOutput::front) => ans = 2, | |
71 | - Some(CharacterFSMOutput::idle) => ans = 0, | |
69 | + Some(CharacterFSMOutput::Back) => ans = 1, | |
70 | + Some(CharacterFSMOutput::Front) => ans = 2, | |
71 | + Some(CharacterFSMOutput::Idle) => ans = 0, | |
72 | 72 | None => println!("None"), |
73 | 73 | } |
74 | 74 | Err(e) => println!("State machine error released {}", e), |