Updated for vfs.on_mount signature change.

Author: terjeio

linuxcnc.c

@@ -36,7 +36,7 @@
 
 static on_vfs_mount_ptr on_vfs_mount;
 
-static void load_tools (const char *path, const vfs_t *fs)
+static void load_tools (const char *path, const vfs_t *fs, vfs_st_mode_t mode)
 {
  // NOTE: must match layout of material_t
  static const char params[] = "PIERCE_HEIGHT,PIERCE_DELAY,CUT_SPEED,CUT_HEIGHT,CUT_VOLTS,PAUSE_AT_END,KERF_WIDTH,CUT_AMPS,GAS_PRESSURE,CUT_MODE,PUDDLE_JUMP_HEIGHT,PUDDLE_JUMP_DELAY,-,NAME,THC";
@@ -92,6 +92,10 @@ static void load_tools (const char *path, const vfs_t *fs)
 
  switch((p = strlookup(strtok(buf, " "), params, ','))) {
 
+ case -1:
+ status = Status_GcodeUnsupportedCommand;
+ break;
+
  case 13:
  strncpy(material.name, eq, sizeof(material.name) - 1);
  material.name[sizeof(material.name) - 1] = '\0';
@@ -122,7 +126,7 @@ static void load_tools (const char *path, const vfs_t *fs)
  }
 
  if(on_vfs_mount)
- on_vfs_mount(path, fs);
+ on_vfs_mount(path, fs, mode);
 }
 
 void linuxcnc_init (void)

sheetcam.c

@@ -36,7 +36,7 @@
 
 static on_vfs_mount_ptr on_vfs_mount;
 
-static void load_tools (const char *path, const vfs_t *fs)
+static void load_tools (const char *path, const vfs_t *fs, vfs_st_mode_t mode)
 {
  static const char params[] = "Pierce\\ height,Pierce\\ delay,Feed\\ rate,Cut\\ height,cv,Pause\\ at\\ end\\ of\\ cut,Kerf\\ width,ca,gp,cm,jh,jd,Tool\\ number,Name,th"; // NOTE: must match layout of material_t
 
@@ -59,6 +59,7 @@ static void load_tools (const char *path, const vfs_t *fs)
  if(status == Status_OK && plasma_material_is_valid(&material))
  plasma_material_add(&material, true);
 
+ material.id = -1;
  *material.name = '\0';
  status = Status_GcodeUnusedWords;
 
@@ -75,6 +76,9 @@ static void load_tools (const char *path, const vfs_t *fs)
 
  switch((p = strlookup(buf, params, ','))) {
 
+ case -1:
+ break;
+
  case 12:
  {
  uint32_t id;
@@ -113,7 +117,7 @@ static void load_tools (const char *path, const vfs_t *fs)
  }
 
  if(on_vfs_mount)
- on_vfs_mount(path, fs);
+ on_vfs_mount(path, fs, mode);
 }
 
 void sheetcam_init (void)