Skip to content

Commit 1b48d74

Browse files
authored
Merge pull request #157 from DecaturMakers/transfer-to-decaturmakers
Re-point ownership references from jantman to Decaturmakers org
2 parents 371da7b + 1208b53 commit 1b48d74

17 files changed

Lines changed: 33 additions & 33 deletions

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
name: Release ${{ github.ref_name }}
6161
body: |
6262
Release ${{ github.ref_name }}.
63-
Docker images: https://github.com/users/jantman/packages/container/package/machine-access-control
63+
Docker images: https://github.com/orgs/Decaturmakers/packages/container/package/machine-access-control
6464
Python packages: https://pypi.org/project/machine_access_control/
6565
draft: false
6666
prerelease: false

README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Decatur Makers Machine Access Control (dm-mac)
44
.. image:: https://www.repostatus.org/badges/latest/concept.svg
55
:alt: Project Status: Concept – Minimal or no implementation has been done yet, or the repository is only intended to be a limited example, demo, or proof-of-concept.
66
:target: https://www.repostatus.org/#concept
7-
.. image:: https://github.com/jantman/machine-access-control/actions/workflows/tests.yml/badge.svg
8-
:target: https://github.com/jantman/machine-access-control/actions/workflows/tests.yml
7+
.. image:: https://github.com/Decaturmakers/machine-access-control/actions/workflows/tests.yml/badge.svg
8+
:target: https://github.com/Decaturmakers/machine-access-control/actions/workflows/tests.yml
99

1010
This is a software and hardware project for using RFID cards/fobs to
1111
control use of various power tools and equipment in the `Decatur
@@ -19,11 +19,11 @@ the `Neon CRM <https://www.neoncrm.com/>`__ as its source for user data,
1919
though that is completely optional and pluggable.
2020

2121
For full documentation, see:
22-
https://jantman.github.io/machine-access-control/
22+
https://decaturmakers.github.io/machine-access-control/
2323

2424
License
2525
-------
2626

2727
Distributed under the terms of the `MIT
28-
license <https://github.com/jantman/machine_access_control/blob/main/LICENSE>`__,
28+
license <https://github.com/Decaturmakers/machine-access-control/blob/main/LICENSE>`__,
2929
*Machine_Access_Control* (``dm_mac``) is free and open source software.

docs/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export GIT_COMMIT := $(shell git rev-parse --short HEAD)
1919
export GITURL := $(shell git config remote.origin.url)
2020
export BRANCH_NAME := $(shell git rev-parse --abbrev-ref HEAD)
2121
# TODO: update the proper git URL here:
22-
ifneq "$(GITURL)" "git@github.com:jantman/machine-access-control.git"
22+
ifneq "$(GITURL)" "git@github.com:Decaturmakers/machine-access-control.git"
2323
export GIT_COMMIT := ${GIT_COMMIT} (branch '${BRANCH_NAME}' from $(GITURL))
2424
endif
2525

docs/source/contributing.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ requests.
1111

1212
Here is a list of important resources for contributors:
1313

14-
- `Source Code <https://github.com/jantman/machine_access_control>`__
15-
- `Documentation <https://github.com/jantman/machine_access_control>`__
14+
- `Source Code <https://github.com/Decaturmakers/machine-access-control>`__
15+
- `Documentation <https://github.com/Decaturmakers/machine-access-control>`__
1616
- `Issue
17-
Tracker <https://github.com/jantman/machine_access_control/issues>`__
17+
Tracker <https://github.com/Decaturmakers/machine-access-control/issues>`__
1818

1919
Tooling in use
2020
--------------
@@ -111,7 +111,7 @@ How to submit changes
111111
---------------------
112112

113113
Open a `pull
114-
request <https://github.com/jantman/machine_access_control/pulls>`__ to
114+
request <https://github.com/Decaturmakers/machine-access-control/pulls>`__ to
115115
submit changes to this project.
116116

117117
Your pull request needs to meet the following guidelines for acceptance:
@@ -138,4 +138,4 @@ your approach.
138138
Release Process
139139
---------------
140140

141-
Use ``poetry version`` to increment the version number, commit push and merge that. Tag the repo and push the tag. `GitHub Actions <https://github.com/jantman/machine-access-control/actions>`__ will run a Docker build, push to GHCR (GitHub Container Registry), build to PyPI, and create a release on the repo.
141+
Use ``poetry version`` to increment the version number, commit push and merge that. Tag the repo and push the tag. `GitHub Actions <https://github.com/Decaturmakers/machine-access-control/actions>`__ will run a Docker build, push to GHCR (GitHub Container Registry), build to PyPI, and create a release on the repo.

docs/source/grafana-dashboard.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1817,7 +1817,7 @@
18171817
"timepicker": {},
18181818
"timezone": "browser",
18191819
"title": "Machine Access Control",
1820-
"description": "https://github.com/jantman/machine-access-control/blob/main/docs/source/grafana-dashboard.json",
1820+
"description": "https://github.com/Decaturmakers/machine-access-control/blob/main/docs/source/grafana-dashboard.json",
18211821
"uid": "dm-mac-dashboard",
18221822
"version": 1,
18231823
"weekStart": ""

docs/source/grafana-dashboard.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
This document provides comprehensive information about the Grafana dashboard for the Decatur Makers Machine Access Control (dm-mac) system. This dashboard visualizes metrics exposed by the `/metrics` Prometheus endpoint on the control server.
66

77
**Dashboard File**: `docs/source/grafana-dashboard.json`
8-
**GitHub URL**: https://github.com/jantman/machine-access-control/blob/main/docs/source/grafana-dashboard.json
8+
**GitHub URL**: https://github.com/Decaturmakers/machine-access-control/blob/main/docs/source/grafana-dashboard.json
99
**Documentation**: `docs/source/admin.rst` (includes embedded dashboard JSON)
1010

1111
## Purpose
@@ -500,5 +500,5 @@ When modifying the dashboard:
500500
- **Prometheus Querying**: https://prometheus.io/docs/prometheus/latest/querying/basics/
501501
- **PromQL Functions**: https://prometheus.io/docs/prometheus/latest/querying/functions/
502502
- **Grafana Panel Types**: https://grafana.com/docs/grafana/latest/panels-visualizations/
503-
- **Project Repository**: https://github.com/jantman/machine-access-control
503+
- **Project Repository**: https://github.com/Decaturmakers/machine-access-control
504504
- **Metrics Implementation**: `src/dm_mac/views/prometheus.py`

docs/source/hardware.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ The following table lists the components required for the Version 1 MCU hardware
125125
Wiring
126126
++++++
127127

128-
This is intended to work with `https://github.com/jantman/machine-access-control/blob/main/esphome-configs/2024.6.4/no-current-input.yaml </https://github.com/jantman/machine-access-control/blob/main/esphome-configs/2024.6.4/no-current-input.yaml>`__. Note that a standalone (non-networked) ESPHome configuration for verifying the operation of all hardware, along with instructions for using it, can be found in `https://github.com/jantman/machine-access-control/tree/main/esphome-configs/2025.11.2 <https://github.com/jantman/machine-access-control/tree/main/esphome-configs/2025.11.2>`__.
128+
This is intended to work with `https://github.com/Decaturmakers/machine-access-control/blob/main/esphome-configs/2024.6.4/no-current-input.yaml </https://github.com/Decaturmakers/machine-access-control/blob/main/esphome-configs/2024.6.4/no-current-input.yaml>`__. Note that a standalone (non-networked) ESPHome configuration for verifying the operation of all hardware, along with instructions for using it, can be found in `https://github.com/Decaturmakers/machine-access-control/tree/main/esphome-configs/2025.11.2 <https://github.com/Decaturmakers/machine-access-control/tree/main/esphome-configs/2025.11.2>`__.
129129

130130
.. image:: ../../hardware/v1_mcu/Hardware_v1.png
131131
:alt: Wiring diagram of system
@@ -192,14 +192,14 @@ This is intended to work with `https://github.com/jantman/machine-access-control
192192
Enclosure
193193
+++++++++
194194

195-
There is an example enclosure for the unit, 3D printed with a few laser cut parts, in `the hardware/v1_mcu directory of the GitHub repo <https://github.com/jantman/machine-access-control/tree/main/hardware/v1_mcu>`__. See that directory for information on fabrication and assembly.
195+
There is an example enclosure for the unit, 3D printed with a few laser cut parts, in `the hardware/v1_mcu directory of the GitHub repo <https://github.com/Decaturmakers/machine-access-control/tree/main/hardware/v1_mcu>`__. See that directory for information on fabrication and assembly.
196196

197197
.. _hardware.esphome-configs:
198198

199199
ESPHome Configurations
200200
----------------------
201201

202-
Example ESPHome configurations for various ESPHome versions and various hardware combinations can be found in the `esphome-configs/ directory of the git repo <https://github.com/jantman/machine-access-control/tree/main/esphome-configs>`__ broken down by ESPHome version. New installations should always use the newest supported ESPHome version, as bug fixes and features are not backported to earlier versions of these configs.
202+
Example ESPHome configurations for various ESPHome versions and various hardware combinations can be found in the `esphome-configs/ directory of the git repo <https://github.com/Decaturmakers/machine-access-control/tree/main/esphome-configs>`__ broken down by ESPHome version. New installations should always use the newest supported ESPHome version, as bug fixes and features are not backported to earlier versions of these configs.
203203

204204
All of the example ESPHome configurations begin with a ``substitutions`` key, which contains a ``machine_name`` substitution. This must be set to the same name as used in the :ref:`configuration.machines-json` config file. If desired, you can override the ``esphome`` ``name`` and ``friendly_name`` values (though this is not recommended).
205205

docs/source/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The only supported method of installing and running the Control Server is via Do
77

88
For actual use, you will need to ensure that the Docker container is always running and restarts automatically; it's assumed that you'll use systemd or some configuration management / automation tool for that, but that's outside the scope of this documentation.
99

10-
The `tests/fixtures directory of the source repository <https://github.com/jantman/machine-access-control/tree/main/tests/fixtures>`__ contains an example `docker-compose <https://docs.docker.com/compose/>`__ file that can be used as an example of how to run the container. By default, it will be accessible on port 5000 unless that file is changed.
10+
The `tests/fixtures directory of the source repository <https://github.com/Decaturmakers/machine-access-control/tree/main/tests/fixtures>`__ contains an example `docker-compose <https://docs.docker.com/compose/>`__ file that can be used as an example of how to run the container. By default, it will be accessible on port 5000 unless that file is changed.
1111

1212
**NOTE** that by default the container runs as root, and files written by it (i.e. the machine state directory) will be root-owned.
1313

hardware/v1_mcu/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# machine-access-control hardware/v1_mcu
22

3-
This directory holds information related to the Version 1 Machine Control Unit (MCU) hardware, mainly the designs for the 3D printed enclosure and laser-cut acrylic RFID card/fob holder, as well as the wiring diagram (such as it is). Full details of the electronic components and wiring can be seen in the documentation at https://jantman.github.io/machine-access-control/hardware.html#version-1-hardware
3+
This directory holds information related to the Version 1 Machine Control Unit (MCU) hardware, mainly the designs for the 3D printed enclosure and laser-cut acrylic RFID card/fob holder, as well as the wiring diagram (such as it is). Full details of the electronic components and wiring can be seen in the documentation at https://decaturmakers.github.io/machine-access-control/hardware.html#version-1-hardware
44

55
## RFID Card / Fob Holder
66

@@ -14,7 +14,7 @@ The enclosure is designed to be 3D printed; prototypes were printed on a (highly
1414

1515
I'm slicing with Cura. If the mounting nut catches are enabled, be sure to enable supports and also set your wall line width, initial layer height, and layer height in [config.scad](config.scad).
1616

17-
The connector used for power and control is a GX16-8 style round connector as specified in the [documentation](https://jantman.github.io/machine-access-control/hardware.html#version-1-hardware) and mounts using a single round through-hole of at least 0.615 inches (nominally 5/8" or 16mm). Due to the wide variety of mounting options, this hole is left out of the model and can be drilled after printing in whichever location is most suitable for the final mounting.
17+
The connector used for power and control is a GX16-8 style round connector as specified in the [documentation](https://decaturmakers.github.io/machine-access-control/hardware.html#version-1-hardware) and mounts using a single round through-hole of at least 0.615 inches (nominally 5/8" or 16mm). Due to the wide variety of mounting options, this hole is left out of the model and can be drilled after printing in whichever location is most suitable for the final mounting.
1818

1919
### Required Hardware
2020

@@ -51,4 +51,4 @@ See the hardware docs for details.
5151

5252
### Enclosure Notes
5353

54-
The enclosure itself is built using v3 of [Willem Aandewiel](https://willem.aandewiel.nl/)'s excellent [YAPP_Box](https://github.com/mrWheel/YAPP_Box) OpenSCAD enclosure generator, with a [patch](https://github.com/jantman/machine-access-control/commit/c860e23d8b0bcd43c924b47d14e1e0748aece98f) for custom cutouts.
54+
The enclosure itself is built using v3 of [Willem Aandewiel](https://willem.aandewiel.nl/)'s excellent [YAPP_Box](https://github.com/mrWheel/YAPP_Box) OpenSCAD enclosure generator, with a [patch](https://github.com/Decaturmakers/machine-access-control/commit/c860e23d8b0bcd43c924b47d14e1e0748aece98f) for custom cutouts.

hardware/v1_mcu/gx16-8.scad

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// FROM: https://github.com/jantman/machine-access-control ; MIT license
1+
// FROM: https://github.com/Decaturmakers/machine-access-control ; MIT license
22
// dimensioned in inches
33
$fn = 360;
44

0 commit comments

Comments
 (0)