Skip to content

Conversation

@RobotCaleb
Copy link

@RobotCaleb RobotCaleb commented Mar 20, 2022

noso_template is a not-quite-isometric (so, nosometric) template useful for drawing 3d-ish isometric-ish images. Quick outlining of basic woodworking projects is a good example usage.

This adds the default templates included at https://github.com/RobotCaleb/noso_template

I am the author of both this package and the templates.

I have only tested the templates (but not this package, I don't know how to do that) on RM2 but I understand the displays are the same.

image

@RobotCaleb RobotCaleb marked this pull request as ready for review March 20, 2022 18:54
@Eeems Eeems self-assigned this Mar 20, 2022
Copy link
Member

@Eeems Eeems left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When attempting to install on my rM1 I'm getting the following error:
image
Unfortunately, templatectl doesn't give us more information about which one is failing to install. When I run the commands manually, every single one fails. I'd guess that it's looking in the current directory for files with the name. The templatectl add --help output says that --filename is the path to the png file, so this is likely true.

Upon testing the installation of template-cartesian-graph package, it also throws the same error. It might be a good idea to update that package in this install as well.

@Eeems Eeems added the packages Add or improve packages of the repository label Mar 20, 2022
@Eeems Eeems assigned RobotCaleb and unassigned Eeems Mar 20, 2022
@RobotCaleb
Copy link
Author

Cool, thanks! Could you tell me how to point my instance to the testing repository so I can fiddle with this on my end?

@Eeems
Copy link
Member

Eeems commented Mar 20, 2022

Cool, thanks! Could you tell me how to point my instance to the testing repository so I can fiddle with this on my end?

Testing only contains things that have been merged, so you won't be able to fiddle that way. What you can do though is use toltecmk to test building packages locally. Then you can send the ipk file to your device and install it with opkg install /path/to/file.ipk

You can also get the built package from the pipeline run under the checks tab, but building locally will likely be quicker after you first get it working.

@Eeems
Copy link
Member

Eeems commented Mar 28, 2022

@RobotCaleb how are things going? Do you need help getting toltecmk to work?

@RobotCaleb
Copy link
Author

RobotCaleb commented Mar 28, 2022 via email

@Eeems
Copy link
Member

Eeems commented Mar 28, 2022

Are you not able to SSH in over USB?

@RobotCaleb
Copy link
Author

I ... didn't know that was a thing. I've always gone in over wifi. I appear to be in over USB. I'll see what went wrong. :(
Thanks!

@RobotCaleb
Copy link
Author

I'm up and running again. Thanks @Eeems, I really appreciate the tip and help.

I will get back to this as soon as the latest update is supported.

@Eeems
Copy link
Member

Eeems commented Sep 26, 2022

@RobotCaleb poke

@RobotCaleb
Copy link
Author

Thanks for the reminder. Unless there's a way to install the latest supported firmware on my device it looks like I'm back to waiting for the latest version to be supported. I guess I should stop allowing auto updates, but that doesn't seem like it'll necessarily help. As, whenever I do enable it again, it seems there's a good chance that whatever it gets won't be supported by toltec. Is there a way I can download 2.14.1.866 manually and install it to my device to revert to that?

@Eeems
Copy link
Member

Eeems commented Sep 26, 2022

Is there a way I can download 2.14.1.866 manually and install it to my device to revert to that?

https://github.com/ddvk/remarkable-update reach out to me on discord if you need help finding the file to install.

@RobotCaleb
Copy link
Author

RobotCaleb commented Sep 27, 2022

reMarkable: ~/ opkg install template-noso-grid_1.0.0_rmall.ipk 
Installing template-noso-grid (1.0.0) to root...
Configuring template-noso-grid.
Template file /usr/share/remarkable/templates/templates.json has changed.  You may need to restart xochitl for the changes to take effect.
Template file /usr/share/remarkable/templates/templates.json has changed.  You may need to restart xochitl for the changes to take effect.
Template file /usr/share/remarkable/templates/templates.json has changed.  You may need to restart xochitl for the changes to take effect.
Template file /usr/share/remarkable/templates/templates.json has changed.  You may need to restart xochitl for the changes to take effect.
Template file /usr/share/remarkable/templates/templates.json has changed.  You may need to restart xochitl for the changes to take effect.
Template file /usr/share/remarkable/templates/templates.json has changed.  You may need to restart xochitl for the changes to take effect.

I think this is now doing the right thing. I have the templates appearing in my UI.
I rebased it against testing branch from here.

@RobotCaleb
Copy link
Author

Okay, updated the template-cartesian-graph package as well

@RobotCaleb RobotCaleb requested a review from Eeems September 28, 2022 03:39
@RobotCaleb
Copy link
Author

RobotCaleb commented Sep 28, 2022 via email

@Eeems
Copy link
Member

Eeems commented Sep 28, 2022

You can find the templatectl source here: https://github.com/PeterGrace/templatectl
The templatectl package also manages doing a bind mount to make sure that templates don't fill up the root partition: https://github.com/toltec-dev/toltec/blob/stable/package/templatectl/package#L36-L37
This makes it so that templates can be stored in /opt/share/remarkable/templates, and the contents of that folder will be mounted to /usr/share/remarkable/templates.

@RobotCaleb
Copy link
Author

Oh, interesting. That definitely wasn't mounted for me.

reMarkable: ~/ which templatectl                                
/opt/bin/templatectl
reMarkable: ~/ opkg remove templatectl
No packages removed.
Collected errors:
 * print_dependents_warning: Package templatectl is depended upon by packages:
 * print_dependents_warning:    template-cartesian-graph
 * print_dependents_warning:    template-noso-grid
 * print_dependents_warning: These might cease to work if package templatectl is removed.

 * print_dependents_warning: Force removal of this package with --force-depends.
 * print_dependents_warning: Force removal of this package and its dependents
 * print_dependents_warning: with --force-removal-of-dependent-packages.
reMarkable: ~/ opkg remove templatectl --force-depends
Removing package templatectl from root...
No existing bind mount for '/usr/share/remarkable/templates'
No packages removed.
Collected errors:
 * pkg_run_script: package "templatectl" postrm script returned status 1.
reMarkable: ~/ opkg install templatectl
Installing templatectl (0.1.3-3) to root...
Downloading https://toltec-dev.org/stable/rmall/templatectl_0.1.3-3_rmall.ipk
Configuring templatectl.
Mounting '/home/root/.entware/share/remarkable/templates' over '/usr/share/remarkable/templates'
Created symlink /etc/systemd/system/local-fs.target.wants/usr-share-remarkable-templates.mount → /lib/systemd/system/usr-share-remarkable-templates.mount.
If you perform a system upgrade that adds new templates
Manual intervention may be required to handle adding the new templates

I have reverted and redone a small fix to categories for noso.
My testing log:

➜ toltecmk package/template-noso-grid/                                                                          
[    INFO] toltec.builder: Fetching source files                                                                
[    INFO] toltec.builder: Packaging build artifacts for template-noso-grid                                     
[    INFO] toltec.builder: Creating archive rmall/template-noso-grid_1.0.0_rmall.ipk                            
[    INFO] toltec.repo: Generating package index                                                                
                                                                                                                
➜ toltecmk package/template-cartesian-graph/                                                                    
The build directory '/home/caleb/dev/remarkable/toltec/build' already exists.                                   
Would you like to [c]ancel, [r]emove that directory, or [k]eep it (not recommended)? [C/r/k] r                  
[    INFO] toltec.builder: Fetching source files                                                                
[    INFO] toltec.builder: Packaging build artifacts for template-cartesian-graph                               
[    INFO] toltec.builder: Creating archive rmall/template-cartesian-graph_1.0.0-4_rmall.ipk                    
[    INFO] toltec.repo: Generating package index                                                                
                                                                                                                
➜ scp dist/rmall/template-* remarkable:                                                                         
template-cartesian-graph_1.0.0-4_rmall.ipk                                    100%   12KB 205.4KB/s   00:00     
template-noso-grid_1.0.0_rmall.ipk                                            100% 1438KB   1.5MB/s   00:00 

➜ ssh remarkable

reMarkable: ~/ ls *.ipk
template-cartesian-graph_1.0.0-4_rmall.ipk  template-noso-grid_1.0.0_rm
all.ipk
reMarkable: ~/ opkg install template-cartesian-graph_1.0.0-4_rmall.ipk 
Installing template-cartesian-graph (1.0.0-4) to root...
Installing templatectl (0.1.3-3) to root...
Downloading https://toltec-dev.org/stable/rmall/templatectl_0.1.3-3_rmall.ipk
Configuring templatectl.
Mounting '/home/root/.entware/share/remarkable/templates' over '/usr/share/remarkable/templates'
Created symlink /etc/systemd/system/local-fs.target.wants/usr-share-remarkable-templates.mount → /lib/systemd/system/usr-share-remarkable-templates.mount.
If you perform a system upgrade that adds new templates
Manual intervention may be required to handle adding the new templates
Configuring template-cartesian-graph.
Template file /usr/share/remarkable/templates/templates.json has changed.  You may need to restart xochitl for the changes to take effect.

reMarkable: ~/ opkg install template-noso-grid_1.0.0_rmall.ipk 
Installing template-noso-grid (1.0.0) to root...
Configuring template-noso-grid.
Template file /usr/share/remarkable/templates/templates.json has changed.  You may need to restart xochitl for the changes to take effect.
Template file /usr/share/remarkable/templates/templates.json has changed.  You may need to restart xochitl for the changes to take effect.
Template file /usr/share/remarkable/templates/templates.json has changed.  You may need to restart xochitl for the changes to take effect.
Template file /usr/share/remarkable/templates/templates.json has changed.  You may need to restart xochitl for the changes to take effect.
Template file /usr/share/remarkable/templates/templates.json has changed.  You may need to restart xochitl for the changes to take effect.
Template file /usr/share/remarkable/templates/templates.json has changed.  You may need to restart xochitl for the changes to
 take effect.
reMarkable: ~/

As far as I can tell this all works fine. I notice you originally said you were testing on rm1, maybe that's different and neither of these packages should target that device?

@Eeems
Copy link
Member

Eeems commented Sep 28, 2022

There should be no differences between rM1 and rM2 for these packages.

@RobotCaleb
Copy link
Author

Okay. Is there anything else that needs to be addressed here?

@Eeems
Copy link
Member

Eeems commented Sep 29, 2022

For some reason the bind mount was missing for me, even though templatectl was installed. We'll have to solve that in a different PR.

@Eeems Eeems merged commit 8c5a939 into toltec-dev:testing Sep 29, 2022
@RobotCaleb RobotCaleb deleted the noso_pkg branch September 29, 2022 15:58
Eeems pushed a commit that referenced this pull request Oct 1, 2022
* add package for noso_template
Eeems added a commit that referenced this pull request Oct 3, 2022
This update brings official support for OS 2.14.3.977 to toltec.

2.14.3.958 and 2.14.3.1005 will have partial support, but will not be listed as supported on the website due to lack of support in `ddvk-hacks`.

### New Packages

- `template-noso-grid` -  (#573)
  - Nosometric grid template
- `kernelctl` - 0.1-2 (#569)
  - Manage aftermarket kernels
- `linux-stracciatella` - 5.4.70-2 (#582 #630)
  - RemarkableAS's vanilla kernel with a few extra flakes

### Updated Packages

- `ddvk-hacks` - 36.01-1 (#627)
  - Add support for OS 2.14.3.977
- `display` `rm2fb-client` - 1:0.0.23-1 (#621 #628)
  - Add support for 2.14.3.1005
  - Add support for 2.14.3.977
  - Add support for 2.14.3.958
- `koreader` - 2022.08-1 (#622)
- `linux-mainline` - 5.19.0-1 (#610)
  - Use kernelctl for install/uninstall
  - Bump from the 5.18 to the 5.19 kernel
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

packages Add or improve packages of the repository

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants