- <%= button_to "초기화", reset_schedules_path,
+ <%= button_to "초기화", reset_schedule_path(params[:id]),
method: :post,
data: { turbo_confirm: "정말 초기화하시겠습니까? 모든 스케줄 데이터가 삭제됩니다." },
class: "btn bg-danger" %>
- <%= button_to "추가하기", open_modals_path(type: "add_schedule"),
+ <%= button_to "추가하기", open_modals_path(type: "add_schedule", id: params[:id]),
class: "btn bg-default-slate",
data: {
turbo_method: :post,
diff --git a/app/views/schedules/view.html.erb b/app/views/schedules/view.html.erb
new file mode 100644
index 0000000..65675a8
--- /dev/null
+++ b/app/views/schedules/view.html.erb
@@ -0,0 +1,28 @@
+
+
+
<%= @controller.name %> 컨트롤러
+
+
+
+ | 시간 |
+ 분 |
+ 사용여부 |
+ 온도 |
+
+
+
+ <% @schedule.each do |s| %>
+
+ | <%= s.hour %>시 |
+ <%= s.minute %>분 |
+ <%= s.is_active %> |
+ <%= s.temperature %> °C |
+
+ <% end %>
+
+
+
+
+ <%= link_to "수정", schedule_edit_schedule_path(@controller.id), class: "btn bg-default-slate" %>
+
+
diff --git a/config/routes.rb b/config/routes.rb
index afeff1f..3fa9fc4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -14,17 +14,13 @@ Rails.application.routes.draw do
root "schedules#index"
resources :schedules do
- collection do
- post "reset"
+ member do
+ get "view"
get "schedule_edit"
- post "schedule_edit_update"
+ post "reset"
end
- end
-
- resources :modbus do
collection do
- post "start"
- post "stop"
+ post "schedule_edit_update"
end
end
diff --git a/db/migrate/20250423005211_create_controllers.rb b/db/migrate/20250416131430_create_controllers.rb
similarity index 73%
rename from db/migrate/20250423005211_create_controllers.rb
rename to db/migrate/20250416131430_create_controllers.rb
index c9909e1..fe8652a 100644
--- a/db/migrate/20250423005211_create_controllers.rb
+++ b/db/migrate/20250416131430_create_controllers.rb
@@ -1,6 +1,9 @@
class CreateControllers < ActiveRecord::Migration[8.0]
def change
create_table :controllers do |t|
+ t.string :name
+ t.integer :station_id
+
t.timestamps
end
end
diff --git a/db/migrate/20250416131440_create_schedules.rb b/db/migrate/20250416131440_create_schedules.rb
index 51df18e..9e4ba27 100644
--- a/db/migrate/20250416131440_create_schedules.rb
+++ b/db/migrate/20250416131440_create_schedules.rb
@@ -1,6 +1,7 @@
class CreateSchedules < ActiveRecord::Migration[8.0]
def change
create_table :schedules do |t|
+ t.references :controller, null: false, foreign_key: true
t.integer :hour
t.integer :minute
t.boolean :is_active
@@ -8,6 +9,6 @@ class CreateSchedules < ActiveRecord::Migration[8.0]
t.timestamps
end
- add_index :schedules, [ :hour, :minute ], unique: true
+ add_index :schedules, [:controller_id, :hour, :minute], unique: true
end
end
diff --git a/db/schema.rb b/db/schema.rb
index 0f651a4..4dba5a7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,5 +10,25 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[8.0].define(version: 0) do
+ActiveRecord::Schema[8.0].define(version: 2025_04_16_131440) do
+ create_table "controllers", force: :cascade do |t|
+ t.string "name"
+ t.integer "station_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
+ create_table "schedules", force: :cascade do |t|
+ t.integer "controller_id", null: false
+ t.integer "hour"
+ t.integer "minute"
+ t.boolean "is_active"
+ t.float "temperature"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["controller_id", "hour", "minute"], name: "index_schedules_on_controller_id_and_hour_and_minute", unique: true
+ t.index ["controller_id"], name: "index_schedules_on_controller_id"
+ end
+
+ add_foreign_key "schedules", "controllers"
end
diff --git a/db/seeds.rb b/db/seeds.rb
index 953e2e0..8927ab7 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -8,6 +8,10 @@
# MovieGenre.find_or_create_by!(name: genre_name)
# end
+Controller.create(name: "첫번째", station_id: 7)
+Controller.create(name: "두번째", station_id: 8)
+
(0..23).each do | h |
- Schedule.create!(hour: h, minute: 0, is_active: true, temperature: 15.0)
+ Schedule.create!(controller_id: 1, hour: h, minute: 0, is_active: true, temperature: 15.0)
+ Schedule.create!(controller_id: 2, hour: h, minute: 0, is_active: true, temperature: 15.0)
end
diff --git a/on_off.rb b/on_off.rb
index 9dcf8e8..9395907 100644
--- a/on_off.rb
+++ b/on_off.rb
@@ -1,10 +1,11 @@
require "rmodbus"
require "ccutrer-serialport"
+controller_id = ARGV[0]&.to_i
value = ARGV[0]&.to_i
ModBus::RTUClient.new("/dev/ttyUSB0", 9600) do |cl|
- cl.with_slave(7) do |slave|
+ cl.with_slave(controller_id) do |slave|
regs = slave.holding_registers
regs[22] = value
sleep 0.1
diff --git a/serial.rb b/serial.rb
index 5ea916a..dd9d4a9 100644
--- a/serial.rb
+++ b/serial.rb
@@ -1,10 +1,11 @@
require "rmodbus"
require "ccutrer-serialport"
-value = ARGV[0]&.to_i
+controller_id = ARGV[0]&.to_i
+value = ARGV[1]&.to_i
ModBus::RTUClient.new("/dev/ttyUSB0", 9600) do |cl|
- cl.with_slave(7) do |slave|
+ cl.with_slave(controller_id) do |slave|
regs = slave.holding_registers
regs[2] = value
sleep 0.1