spacecruft
/
farmbot-arduino-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' of https://github.com/TimEvWw/farmbot-arduino-controller

pull/78/head
Tim Evers 2017-05-07 22:25:42 +02:00
parent 9ec8669894 abda61155d
commit 2c18fcf710
3 changed files with 96 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
README.md
View File

@ -119,8 +119,8 @@ LED_PIN | 13 | on board LED
FAN_PIN | 9 | RAMPS board fan pin
HEATER_0_PIN | 10 | RAMPS board heating pin 0
HEATER_1_PIN | 8 | RAMPS board heating pin 1
SERVO_0_PIN | 4 | Servo motor 0 signal pin
SERVO_1_PIN | 5 | Servo motor 1 signal pin
SERVO_0_PIN | 4 | Servo motor 0 signal pin
SERVO_1_PIN | 5 | Servo motor 1 signal pin
G-Codes
-------
@ -163,17 +163,18 @@ E | | |Emergency stop
### Codes received from the arduino
Code type|Number|Parameters|Function
---------|------|----------|--------
R | | |Report messages
R |01 | |Current command started
R |02 | |Current command finished successfully
R |03 | |Current command finished with error
R |04 | |Current command running
R |05 | |Report motor/axis state
R |06 | |Report calibration state during execution
R |21 |P V |Report parameter value
R |31 |P V |Report status value
R |41 |P V |Report pin value
---------|------|-----------------|--------
R | | |Report messages
R |01 | |Current command started
R |02 | |Current command finished successfully
R |03 | |Current command finished with error
R |04 | |Current command running
R |05 | |Report motor/axis state
R |06 | |Report calibration state during execution
R |20 | |Report all paramaters complete
R |21 |P V |Report parameter value
R |31 |P V |Report status value
R |41 |P V |Report pin value
R |81 |X1 X2 Y1 Y2 Z1 Z2|Reporting end stops - parameters: X1 (end stop x axis min) X2 (end stop x axis max) Y1 Y2 Z1 Z2
R |82 |X Y Z |Report current position
R |83 |C |Report software version
@ -234,69 +235,84 @@ ZB |End stop 2 on z axis |0/1
Arduino parameter numbers
------------------------
Parameter name |Parameter id
-----------------------------|------------
PARAM_CONFIG_OK |2
PARAM_USE_EEPROM |3
MOVEMENT_TIMEOUT_X |11
MOVEMENT_TIMEOUT_Y |12
MOVEMENT_TIMEOUT_Z |13
MOVEMENT_INVERT_ENDPOINTS_X |21
MOVEMENT_INVERT_ENDPOINTS_Y |22
MOVEMENT_INVERT_ENDPOINTS_Z |23
MOVEMENT_ENABLE_ENDPOINTS_X |25
MOVEMENT_ENABLE_ENDPOINTS_Y |26
MOVEMENT_ENABLE_ENDPOINTS_Z |27
MOVEMENT_INVERT_MOTOR_X |31
MOVEMENT_INVERT_MOTOR_Y |32
MOVEMENT_INVERT_MOTOR_Z |33
MOVEMENT_SECONDARY_MOTOR_X |36
MOVEMENT_SECONDARY_MOTOR_INVERT_X |37
MOVEMENT_STEPS_ACC_DEC_X |41
MOVEMENT_STEPS_ACC_DEC_Y |42
MOVEMENT_STEPS_ACC_DEC_Z |43
MOVEMENT_HOME_UP_X |51
MOVEMENT_HOME_UP_Y |52
MOVEMENT_HOME_UP_Z |53
MOVEMENT_MIN_SPD_X |61
MOVEMENT_MIN_SPD_Y |62
MOVEMENT_MIN_SPD_Z |63
MOVEMENT_MAX_SPD_X |71
MOVEMENT_MAX_SPD_Y |72
MOVEMENT_MAX_SPD_Z |73
ENCODER_ENABLED_X |101
ENCODER_ENABLED_Y |102
ENCODER_ENABLED_Z |103
ENCODER_TYPE_X |105
ENCODER_TYPE_Y |106
ENCODER_TYPE_Z |107
ENCODER_MISSED_STEPS_MAX_X |111
ENCODER_MISSED_STEPS_MAX_Y |112
ENCODER_MISSED_STEPS_MAX_Z |113
ENCODER_SCALING_X |115
ENCODER_SCALING_Y |116
ENCODER_SCALING_Z |117
ENCODER_MISSED_STEPS_DECAY_X |121
ENCODER_MISSED_STEPS_DECAY_Y |122
ENCODER_MISSED_STEPS_DECAY_Z |123
MOVEMENT_AXIS_NR_STEPS_X |141
MOVEMENT_AXIS_NR_STEPS_Y |142
MOVEMENT_AXIS_NR_STEPS_Z |143
PIN_GUARD_1_PIN_NR |201
PIN_GUARD_1_TIME_OUT |202
PIN_GUARD_1_ACTIVE_STATE |203
PIN_GUARD_2_PIN_NR |205
PIN_GUARD_2_TIME_OUT |206
PIN_GUARD_2_ACTIVE_STATE |207
PIN_GUARD_3_PIN_NR |211
PIN_GUARD_3_TIME_OUT |212
PIN_GUARD_3_ACTIVE_STATE |213
PIN_GUARD_4_PIN_NR |215
PIN_GUARD_4_TIME_OUT |216
PIN_GUARD_4_ACTIVE_STATE |217
PIN_GUARD_5_PIN_NR |221
PIN_GUARD_5_TIME_OUT |222
PIN_GUARD_5_ACTIVE_STATE |223
ID | Name
-----|----------------------------
2 | PARAM_CONFIG_OK
3 | PARAM_USE_EEPROM
11 | MOVEMENT_TIMEOUT_X
12 | MOVEMENT_TIMEOUT_Y
13 | MOVEMENT_TIMEOUT_Z
15 | MOVEMENT_KEEP_ACTIVE_X
16 | MOVEMENT_KEEP_ACTIVE_Y
17 | MOVEMENT_KEEP_ACTIVE_Z
18 | MOVEMENT_HOME_AT_BOOT_X
19 | MOVEMENT_HOME_AT_BOOT_Y
20 | MOVEMENT_HOME_AT_BOOT_Z
21 | MOVEMENT_INVERT_ENDPOINTS_X
22 | MOVEMENT_INVERT_ENDPOINTS_Y
23 | MOVEMENT_INVERT_ENDPOINTS_Z
25 | MOVEMENT_ENABLE_ENDPOINTS_X
26 | MOVEMENT_ENABLE_ENDPOINTS_Y
27 | MOVEMENT_ENABLE_ENDPOINTS_Z
31 | MOVEMENT_INVERT_MOTOR_X
32 | MOVEMENT_INVERT_MOTOR_Y
33 | MOVEMENT_INVERT_MOTOR_Z
36 | MOVEMENT_SECONDARY_MOTOR_X
37 | MOVEMENT_SECONDARY_MOTOR_INVERT_X
41 | MOVEMENT_STEPS_ACC_DEC_X
42 | MOVEMENT_STEPS_ACC_DEC_Y
43 | MOVEMENT_STEPS_ACC_DEC_Z
45 | MOVEMENT_STOP_AT_HOME_X
46 | MOVEMENT_STOP_AT_HOME_Y
47 | MOVEMENT_STOP_AT_HOME_Z
51 | MOVEMENT_HOME_UP_X
52 | MOVEMENT_HOME_UP_Y
53 | MOVEMENT_HOME_UP_Z
61 | MOVEMENT_MIN_SPD_X
62 | MOVEMENT_MIN_SPD_Y
63 | MOVEMENT_MIN_SPD_Z
71 | MOVEMENT_MAX_SPD_X
72 | MOVEMENT_MAX_SPD_Y
73 | MOVEMENT_MAX_SPD_Z
101 | ENCODER_ENABLED_X
102 | ENCODER_ENABLED_Y
103 | ENCODER_ENABLED_Z
105 | ENCODER_TYPE_X
106 | ENCODER_TYPE_Y
107 | ENCODER_TYPE_Z
111 | ENCODER_MISSED_STEPS_MAX_X
112 | ENCODER_MISSED_STEPS_MAX_Y
113 | ENCODER_MISSED_STEPS_MAX_Z
115 | ENCODER_SCALING_X
116 | ENCODER_SCALING_Y
117 | ENCODER_SCALING_Z
121 | ENCODER_MISSED_STEPS_DECAY_X
122 | ENCODER_MISSED_STEPS_DECAY_Y
123 | ENCODER_MISSED_STEPS_DECAY_Z
125 | ENCODER_USE_FOR_POS_X
126 | ENCODER_USE_FOR_POS_Y
127 | ENCODER_USE_FOR_POS_Z
131 | ENCODER_INVERT_X
132 | ENCODER_INVERT_Y
133 | ENCODER_INVERT_Z
141 | MOVEMENT_AXIS_NR_STEPS_X
142 | MOVEMENT_AXIS_NR_STEPS_Y
143 | MOVEMENT_AXIS_NR_STEPS_Z
201 | PIN_GUARD_1_PIN_NR
202 | PIN_GUARD_1_TIME_OUT
203 | PIN_GUARD_1_ACTIVE_STATE
205 | PIN_GUARD_2_PIN_NR
206 | PIN_GUARD_2_TIME_OUT
207 | PIN_GUARD_2_ACTIVE_STATE
211 | PIN_GUARD_3_PIN_NR
212 | PIN_GUARD_3_TIME_OUT
213 | PIN_GUARD_3_ACTIVE_STATE
215 | PIN_GUARD_4_PIN_NR
216 | PIN_GUARD_4_TIME_OUT
217 | PIN_GUARD_4_ACTIVE_STATE
221 | PIN_GUARD_5_PIN_NR
222 | PIN_GUARD_5_TIME_OUT
223 | PIN_GUARD_5_ACTIVE_STATE
IMPORTANT
=========

4
src/F20Handler.cpp
View File

@ -26,6 +26,8 @@ int F20Handler::execute(Command *command)
{
ParameterList::getInstance()->readAllValues();
Serial.print("R20");
CurrentState::getInstance()->printQAndNewLine();
return 1;
return 0;
}

2
src/farmbot_arduino_controller.cpp
View File

@ -160,7 +160,7 @@ void setup()
StepperControl::getInstance()->loadSettings();
// Dump all values to the serial interface
//ParameterList::getInstance()->readAllValues();
// ParameterList::getInstance()->readAllValues();
// Get the settings for the pin guard
PinGuard::getInstance()->loadConfig();