Skip to content

Commit

Permalink
Non-functional changes: some configuration warnings suppressed in Web…
Browse files Browse the repository at this point in the history
… Builder builds,

delta kinematics updated to not use deprecated functionality.
  • Loading branch information
terjeio committed Jan 10, 2025
1 parent 22a8a08 commit aed6f71
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 45 deletions.
18 changes: 17 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
## grblHAL changelog

<a name="20250110">20250110

Core:

* Non-functional changes: some configuration warnings suppressed in Web Builder builds, delta kinematics updated to not use deprecated functionality.

Drivers:

* ESP32: fixed typos and incorrect preprocessor code in some untested board maps.

Plugins:

* SD card, YModem protocol: changed to use local input buffer due to not working when Laserburn cluster plugin was enabled. Ref. [ioSender issue #443](https://github.com/terjeio/ioSender/issues/433).

---

<a name="20250109">Build 20250109

Core:
Expand All @@ -16,7 +32,7 @@ Drivers:

Plugins:

* Bluetooth, Embroidery and Keypad, macros: updated to use new core functionality for claiming auxiliary pins.
* Bluetooth, Embroidery, Spindle, PWM and Keypad, macros: updated to use new core functionality for claiming auxiliary pins.

---

Expand Down
6 changes: 5 additions & 1 deletion driver_opts2.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
// NOTE: do NOT change options here - edit the driver specific my_machine.h instead!
//

#ifndef WEB_BUILD

#if (DRIVER_SPINDLE_ENABLE & SPINDLE_ENA) && !defined(SPINDLE_ENABLE_PIN)
#warning "Selected spindle is not supported!"
#endif
Expand All @@ -41,14 +43,16 @@
#warning "Selected spindle 1 is not supported!"
#endif

#endif

#if MPG_ENABLE == 1 && !defined(MPG_MODE_PIN)
#error "MPG_MODE_PIN must be defined!"
#endif

#if KEYPAD_ENABLE == 1 && !defined(I2C_STROBE_PORT)
#error Keypad plugin not supported!
#elif I2C_STROBE_ENABLE && !defined(I2C_STROBE_PORT)
#error I2C strobe not supported!
#error "I2C strobe not supported!"
#endif

#if EEPROM_ENABLE == 0
Expand Down
67 changes: 24 additions & 43 deletions kinematics/delta.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ static delta_properties_t machine = {0};
static homing_mode_t homing_mode;
static on_report_options_ptr on_report_options;
static on_homing_completed_ptr on_homing_completed;
static on_report_command_help_ptr on_report_command_help;
static on_set_axis_setting_unit_ptr on_set_axis_setting_unit;
static on_setting_get_description_ptr on_setting_get_description;
static on_realtime_report_ptr on_realtime_report;
Expand Down Expand Up @@ -824,21 +823,6 @@ static void delta_settings_load (void)
}
}

static setting_details_t setting_details = {
.groups = kinematics_groups,
.n_groups = sizeof(kinematics_groups) / sizeof(setting_group_detail_t),
.settings = kinematics_settings,
.n_settings = sizeof(kinematics_settings) / sizeof(setting_detail_t),
#ifndef NO_SETTINGS_DESCRIPTIONS
.descriptions = kinematics_settings_descr,
.n_descriptions = sizeof(kinematics_settings_descr) / sizeof(setting_descr_t),
#endif
.load = delta_settings_load,
.restore = delta_settings_restore,
.save = delta_settings_save,
.on_changed = delta_settings_changed
};

static void report_options (bool newopt)
{
on_report_options(newopt);
Expand Down Expand Up @@ -895,31 +879,33 @@ static const char *delta_setting_get_description (setting_id_t id)
: (on_setting_get_description ? on_setting_get_description(id) : NULL);
}

static void delta_command_help (void)
// Initialize API pointers for Delta robot kinematics
void delta_robot_init (void)
{
hal.stream.write("$DELTA - show info about delta robot parameters" ASCII_EOL);

if(on_report_command_help)
on_report_command_help();
}

const sys_command_t delta_command_list[] = {
{"DELTA", delta_info, { .noargs = On } },
};
static setting_details_t setting_details = {
.groups = kinematics_groups,
.n_groups = sizeof(kinematics_groups) / sizeof(setting_group_detail_t),
.settings = kinematics_settings,
.n_settings = sizeof(kinematics_settings) / sizeof(setting_detail_t),
#ifndef NO_SETTINGS_DESCRIPTIONS
.descriptions = kinematics_settings_descr,
.n_descriptions = sizeof(kinematics_settings_descr) / sizeof(setting_descr_t),
#endif
.load = delta_settings_load,
.restore = delta_settings_restore,
.save = delta_settings_save,
.on_changed = delta_settings_changed
};

static sys_commands_t delta_commands = {
.n_commands = sizeof(delta_command_list) / sizeof(sys_command_t),
.commands = delta_command_list
};
static const sys_command_t delta_command_list[] = {
{"DELTA", delta_info, { .noargs = On }, { .str = "output info about delta robot parameters" } },
};

sys_commands_t *delta_get_commands()
{
return &delta_commands;
}
static sys_commands_t delta_commands = {
.n_commands = sizeof(delta_command_list) / sizeof(sys_command_t),
.commands = delta_command_list
};

// Initialize API pointers for Delta robot kinematics
void delta_robot_init (void)
{
if((nvs_address = nvs_alloc(sizeof(delta_settings_t)))) {

kinematics.limits_set_target_pos = delta_limits_set_target_pos;
Expand All @@ -945,12 +931,6 @@ void delta_robot_init (void)
on_report_options = grbl.on_report_options;
grbl.on_report_options = report_options;

delta_commands.on_get_commands = grbl.on_get_commands;
grbl.on_get_commands = delta_get_commands;

on_report_command_help = grbl.on_report_command_help;
grbl.on_report_command_help = delta_command_help;

on_realtime_report = grbl.on_realtime_report;
grbl.on_realtime_report = delta_real_time_report;

Expand All @@ -964,6 +944,7 @@ void delta_robot_init (void)
grbl.on_setting_get_description = delta_setting_get_description;

settings_register(&setting_details);
system_register_commands(&delta_commands);
}
}

Expand Down

0 comments on commit aed6f71

Please sign in to comment.